From 2ef5bd3c1c9e73fb5828f1b698eaf62bc6f52958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 17 Apr 2008 13:43:10 +0000 Subject: [PATCH] Packing List only contain Packing List Line and Container Line, but no Discount or Payment Conditions git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20615 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../allowed_content_types.xml | 8 +------- bt5/erp5_trade/bt/revision | 2 +- .../bt/template_portal_type_allowed_content_type_list | 6 ------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 581bab5e27..45e5e1c7d2 100644 --- a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -48,10 +48,7 @@ <item>Purchase Order</item> </portal_type> <portal_type id="Purchase Packing List"> - <item>Payment Condition</item> <item>Purchase Packing List Line</item> - <item>Discount</item> - <item>Tax Line</item> </portal_type> <portal_type id="Purchase Packing List Line"> <item>Purchase Packing List Cell</item> @@ -82,9 +79,9 @@ <item>Delivery Rule</item> </portal_type> <portal_type id="Sale Order"> - <item>Discount</item> <item>Sale Order Line</item> <item>Tax Line</item> + <item>Discount</item> <item>Payment Condition</item> </portal_type> <portal_type id="Sale Order Line"> @@ -95,9 +92,6 @@ <item>Sale Order</item> </portal_type> <portal_type id="Sale Packing List"> - <item>Discount</item> - <item>Payment Condition</item> - <item>Tax Line</item> <item>Sale Packing List Line</item> <item>Container</item> </portal_type> diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index e26ed8de06..0e92c3c0fc 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -305 \ No newline at end of file +306 \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list index e2a1a09cab..cfc1d50d61 100644 --- a/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_trade/bt/template_portal_type_allowed_content_type_list @@ -22,10 +22,7 @@ Purchase Order | Purchase Order Line Purchase Order | Tax Line Purchase Packing List Line | Purchase Packing List Cell Purchase Packing List Module | Purchase Packing List -Purchase Packing List | Discount -Purchase Packing List | Payment Condition Purchase Packing List | Purchase Packing List Line -Purchase Packing List | Tax Line Purchase Trade Condition Module | Purchase Trade Condition Purchase Trade Condition | Discount Purchase Trade Condition | Payment Condition @@ -46,10 +43,7 @@ Sale Order | Tax Line Sale Packing List Line | Sale Packing List Cell Sale Packing List Module | Sale Packing List Sale Packing List | Container -Sale Packing List | Discount -Sale Packing List | Payment Condition Sale Packing List | Sale Packing List Line -Sale Packing List | Tax Line Sale Trade Condition Module | Sale Trade Condition Sale Trade Condition | Discount Sale Trade Condition | Payment Condition -- 2.30.9