diff --git a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 71705d68c08080a372817411bde3b0b0bd98ae7e..581bab5e276e7eeb471d01c856c298e77da2e8ba 100644 --- a/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_trade/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -59,17 +59,6 @@ <portal_type id="Purchase Packing List Module"> <item>Purchase Packing List</item> </portal_type> - <portal_type id="Purchase Supply"> - <item>Purchase Supply Line</item> - <item>Supply Line</item> - </portal_type> - <portal_type id="Purchase Supply Line"> - <item>Purchase Supply Cell</item> - <item>Predicate</item> - </portal_type> - <portal_type id="Purchase Supply Module"> - <item>Purchase Supply</item> - </portal_type> <portal_type id="Purchase Trade Condition"> <item>Tax Model Line</item> <item>Discount</item> @@ -93,9 +82,9 @@ <item>Delivery Rule</item> </portal_type> <portal_type id="Sale Order"> - <item>Tax Line</item> <item>Discount</item> <item>Sale Order Line</item> + <item>Tax Line</item> <item>Payment Condition</item> </portal_type> <portal_type id="Sale Order Line"> @@ -118,29 +107,14 @@ <portal_type id="Sale Packing List Module"> <item>Sale Packing List</item> </portal_type> - <portal_type id="Sale Supply"> - <item>Sale Supply Line</item> - <item>Supply Line</item> - </portal_type> - <portal_type id="Sale Supply Line"> - <item>Predicate</item> - <item>Sale Supply Cell</item> - </portal_type> - <portal_type id="Sale Supply Module"> - <item>Sale Supply</item> - </portal_type> <portal_type id="Sale Trade Condition"> <item>Tax Model Line</item> - <item>Discount</item> <item>Payment Condition</item> + <item>Discount</item> </portal_type> <portal_type id="Sale Trade Condition Module"> <item>Sale Trade Condition</item> </portal_type> - <portal_type id="Supply Line"> - <item>Supply Cell</item> - <item>Predicate</item> - </portal_type> <portal_type id="Tax Module"> <item>Tax</item> </portal_type> diff --git a/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml b/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml index ccb556d875239c6949f59e5aa7d4ec576651d149..b802ddd283fe79116dcf9adcd09dc0c8e62e3f5a 100644 --- a/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml +++ b/bt5/erp5_trade/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml @@ -17,13 +17,6 @@ <portal_type id="Purchase Packing List Line"> <item>Purchase Packing List Cell</item> </portal_type> - <portal_type id="Purchase Supply"> - <item>Supply Line</item> - </portal_type> - <portal_type id="Purchase Supply Line"> - <item>Predicate</item> - <item>Purchase Supply Cell</item> - </portal_type> <portal_type id="Returned Sale Packing List Line"> <item>Returned Sale Packing List Cell</item> </portal_type> @@ -36,15 +29,4 @@ <portal_type id="Sale Packing List Line"> <item>Sale Packing List Cell</item> </portal_type> - <portal_type id="Sale Supply"> - <item>Supply Line</item> - </portal_type> - <portal_type id="Sale Supply Line"> - <item>Sale Supply Cell</item> - <item>Predicate</item> - </portal_type> - <portal_type id="Supply Line"> - <item>Predicate</item> - <item>Supply Cell</item> - </portal_type> </hidden_content_type_list> \ No newline at end of file diff --git a/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml index a23c05f9444fd57d6c7813013f8d057267ca884f..517435579d6f383215d2381be4b7625482b421c0 100644 --- a/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml +++ b/bt5/erp5_trade/PortalTypePropertySheetTemplateItem/property_sheet_list.xml @@ -6,7 +6,4 @@ <item>PaymentCondition</item> <item>Comment</item> </portal_type> - <portal_type id="Supply Cell"> - <item>Reference</item> - </portal_type> </property_sheet_list> \ No newline at end of file diff --git a/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 798bb92b4153cf43834e4b8206e2ab8e933b9d12..4f735e7701e6395875ffd5da328db98a3ad13291 100644 --- a/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -79,14 +79,6 @@ <type>Purchase Packing List Line</type> <workflow>edit_workflow, pricing_interaction_workflow, delivery_movement_causality_interaction_workflow, trade_matrix_workflow, delivery_movement_simulation_interaction_workflow</workflow> </chain> - <chain> - <type>Purchase Supply</type> - <workflow>edit_workflow</workflow> - </chain> - <chain> - <type>Purchase Supply Line</type> - <workflow>supply_line_interaction_workflow, edit_workflow</workflow> - </chain> <chain> <type>Purchase Trade Condition</type> <workflow>edit_workflow, validation_workflow</workflow> @@ -127,20 +119,8 @@ <type>Sale Packing List Line</type> <workflow>edit_workflow, pricing_interaction_workflow, container_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow> </chain> - <chain> - <type>Sale Supply</type> - <workflow>edit_workflow</workflow> - </chain> - <chain> - <type>Sale Supply Line</type> - <workflow>edit_workflow, supply_line_interaction_workflow</workflow> - </chain> <chain> <type>Sale Trade Condition</type> <workflow>edit_workflow, validation_workflow</workflow> </chain> - <chain> - <type>Supply Line</type> - <workflow>supply_line_interaction_workflow, edit_workflow</workflow> - </chain> </workflow_chain> \ No newline at end of file diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log index 96a6ab01104018ae57aaae3de03e3ea668ce7949..4f4658c662ba07904b12f66c9114d836c5698177 100644 --- a/bt5/erp5_trade/bt/change_log +++ b/bt5/erp5_trade/bt/change_log @@ -1,3 +1,7 @@ +2008-04-16 alex +* move Supplies to PDM +* push version to 1.0rc17 + 2008-04-14 jerome * Add new Tax system. diff --git a/bt5/erp5_trade/bt/comment b/bt5/erp5_trade/bt/comment index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d458698a93255890eeadc3809bb24db041d67b7f 100644 --- a/bt5/erp5_trade/bt/comment +++ b/bt5/erp5_trade/bt/comment @@ -0,0 +1 @@ +WARNING! When upgrading from version <=1.0rc16, make sure you do not uninstall (remove) supply module, or you will lose all your supplies (they will be put to trash). \ No newline at end of file diff --git a/bt5/erp5_trade/bt/dependency_list b/bt5/erp5_trade/bt/dependency_list index 087d966894ba3d2f97f9e5377d739f8db4e23ba5..8013335c7f70ef187edcfde4ed4c18c7b03177f6 100644 --- a/bt5/erp5_trade/bt/dependency_list +++ b/bt5/erp5_trade/bt/dependency_list @@ -1,2 +1,3 @@ erp5_core -erp5_base \ No newline at end of file +erp5_base +erp5_pdm \ No newline at end of file diff --git a/bt5/erp5_trade/bt/description b/bt5/erp5_trade/bt/description index b48205b748075460a90414f373dc38373d3a30e9..35d633da9ec9c001a558c4a60ef83b3a08543a52 100644 --- a/bt5/erp5_trade/bt/description +++ b/bt5/erp5_trade/bt/description @@ -1 +1 @@ -This business template is all about Sales, Purchase, Packing, Delivery, Shipping, Inventory, Supply... \ No newline at end of file +This business template is all about Sales, Purchase, Packing, Delivery, Shipping, Inventory... \ No newline at end of file diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 2d828461b6912dc00f044b46a61b4336403c56f4..2c136b29b5258dcc2e6f0574cf4950c5d0e2f5d7 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -289 \ No newline at end of file +302 \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_action_path_list b/bt5/erp5_trade/bt/template_action_path_list index a7931174b109705062d6d522486528b652b28a7c..c9b8096091de8bc7b21c0095971563bdb0139abc 100644 --- a/bt5/erp5_trade/bt/template_action_path_list +++ b/bt5/erp5_trade/bt/template_action_path_list @@ -57,16 +57,6 @@ Purchase Packing List | jump_related_purchase_order Purchase Packing List | packing_list_print Purchase Packing List | profile_view Purchase Packing List | view -Purchase Supply Line | additional_price -Purchase Supply Line | base_price -Purchase Supply Line | discount_ratio -Purchase Supply Line | exclusive_discount_ratio -Purchase Supply Line | non_discountable__additional_price -Purchase Supply Line | surcharge_ratio -Purchase Supply Line | variable_additional_price -Purchase Supply Line | view -Purchase Supply Module | view -Purchase Supply | view Purchase Trade Condition Module | view Purchase Trade Condition | view Purchase Trade Condition | view_discount @@ -113,30 +103,12 @@ Sale Packing List | jump_related_sale_invoice Sale Packing List | packing_list_print Sale Packing List | view Sale Packing List | view_container_list -Sale Supply Line | additional_price -Sale Supply Line | base_price -Sale Supply Line | discount_ratio -Sale Supply Line | exclusive_discount_ratio -Sale Supply Line | non_discountable__additional_price -Sale Supply Line | surcharge_ratio -Sale Supply Line | variable_additional_price -Sale Supply Line | view -Sale Supply Module | view -Sale Supply | view Sale Trade Condition Module | view Sale Trade Condition | view Sale Trade Condition | view_discount Sale Trade Condition | view_payment Sale Trade Condition | view_profile Sale Trade Condition | view_tax -Supply Line | additional_price -Supply Line | base_price -Supply Line | discount_ratio -Supply Line | exclusive_discount_ratio -Supply Line | non_discountable__additional_price -Supply Line | surcharge_ratio -Supply Line | variable_additional_price -Supply Line | view Tax Line | view Tax Model Line | view Tax Module | view diff --git a/bt5/erp5_trade/bt/template_module_id_list b/bt5/erp5_trade/bt/template_module_id_list index b9ff7b5f8e38d2d8e48d682a0280f4a4ceb53920..9559b2686f813a368f2d31da7dbec7daf61b30ce 100644 --- a/bt5/erp5_trade/bt/template_module_id_list +++ b/bt5/erp5_trade/bt/template_module_id_list @@ -2,11 +2,9 @@ internal_packing_list_module inventory_module purchase_order_module purchase_packing_list_module -purchase_supply_module purchase_trade_condition_module returned_sale_packing_list_module sale_order_module sale_packing_list_module -sale_supply_module sale_trade_condition_module tax_module \ 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 650367003f80c42d593fdf42443f7253cd4f4653..e2a1a09caba4ea4a5a4eb2613253e09449655842 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 @@ -26,11 +26,6 @@ Purchase Packing List | Discount Purchase Packing List | Payment Condition Purchase Packing List | Purchase Packing List Line Purchase Packing List | Tax Line -Purchase Supply Line | Predicate -Purchase Supply Line | Purchase Supply Cell -Purchase Supply Module | Purchase Supply -Purchase Supply | Purchase Supply Line -Purchase Supply | Supply Line Purchase Trade Condition Module | Purchase Trade Condition Purchase Trade Condition | Discount Purchase Trade Condition | Payment Condition @@ -55,15 +50,8 @@ Sale Packing List | Discount Sale Packing List | Payment Condition Sale Packing List | Sale Packing List Line Sale Packing List | Tax Line -Sale Supply Line | Predicate -Sale Supply Line | Sale Supply Cell -Sale Supply Module | Sale Supply -Sale Supply | Sale Supply Line -Sale Supply | Supply Line Sale Trade Condition Module | Sale Trade Condition Sale Trade Condition | Discount Sale Trade Condition | Payment Condition Sale Trade Condition | Tax Model Line -Supply Line | Predicate -Supply Line | Supply Cell Tax Module | Tax \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list b/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list index 446184b39561f611be008aa2cc653c0c18edca7a..bb144d53d506899771086d563673e8bf32becad6 100644 --- a/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list +++ b/bt5/erp5_trade/bt/template_portal_type_hidden_content_type_list @@ -4,15 +4,7 @@ Inventory Line | Inventory Cell Purchase Order Line | Purchase Order Cell Purchase Order | Tax Line Purchase Packing List Line | Purchase Packing List Cell -Purchase Supply Line | Predicate -Purchase Supply Line | Purchase Supply Cell -Purchase Supply | Supply Line Returned Sale Packing List Line | Returned Sale Packing List Cell Sale Order Line | Sale Order Cell Sale Order | Tax Line -Sale Packing List Line | Sale Packing List Cell -Sale Supply Line | Predicate -Sale Supply Line | Sale Supply Cell -Sale Supply | Supply Line -Supply Line | Predicate -Supply Line | Supply Cell \ No newline at end of file +Sale Packing List Line | Sale Packing List Cell \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_portal_type_id_list b/bt5/erp5_trade/bt/template_portal_type_id_list index 68fdaebcbf0a40bb8fb297e567fa9bea725fc1e5..76cf2a3939866383c7001478b5d1e196b7dc535c 100644 --- a/bt5/erp5_trade/bt/template_portal_type_id_list +++ b/bt5/erp5_trade/bt/template_portal_type_id_list @@ -22,10 +22,6 @@ Purchase Packing List Purchase Packing List Cell Purchase Packing List Line Purchase Packing List Module -Purchase Supply -Purchase Supply Cell -Purchase Supply Line -Purchase Supply Module Purchase Trade Condition Purchase Trade Condition Module Returned Sale Packing List @@ -40,14 +36,8 @@ Sale Packing List Sale Packing List Cell Sale Packing List Line Sale Packing List Module -Sale Supply -Sale Supply Cell -Sale Supply Line -Sale Supply Module Sale Trade Condition Sale Trade Condition Module -Supply Cell -Supply Line Tax Tax Line Tax Model Line diff --git a/bt5/erp5_trade/bt/template_portal_type_property_sheet_list b/bt5/erp5_trade/bt/template_portal_type_property_sheet_list index aeb11ef341c7cd9097899c8a2e4b1966a7a3a50a..50908a1bcc76225dff2a6adab0338324bb6830b2 100644 --- a/bt5/erp5_trade/bt/template_portal_type_property_sheet_list +++ b/bt5/erp5_trade/bt/template_portal_type_property_sheet_list @@ -1,4 +1,3 @@ Sale Order | PaymentCondition Sale Trade Condition | Comment -Sale Trade Condition | PaymentCondition -Supply Cell | Reference \ No newline at end of file +Sale Trade Condition | PaymentCondition \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list b/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list index 6fa8ff06c5643285cb7c90327aad4fa6cfb1e4d9..62ff8297b190f515055d29436cf848b1da88184e 100644 --- a/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list @@ -52,9 +52,6 @@ Purchase Packing List | delivery_simulation_interaction_workflow Purchase Packing List | edit_workflow Purchase Packing List | packing_list_causality_workflow Purchase Packing List | packing_list_workflow -Purchase Supply Line | edit_workflow -Purchase Supply Line | supply_line_interaction_workflow -Purchase Supply | edit_workflow Purchase Trade Condition | edit_workflow Purchase Trade Condition | validation_workflow Returned Sale Packing List Cell | pricing_interaction_workflow @@ -89,10 +86,5 @@ Sale Packing List | edit_workflow Sale Packing List | packing_list_causality_workflow Sale Packing List | packing_list_container_workflow Sale Packing List | packing_list_workflow -Sale Supply Line | edit_workflow -Sale Supply Line | supply_line_interaction_workflow -Sale Supply | edit_workflow Sale Trade Condition | edit_workflow -Sale Trade Condition | validation_workflow -Supply Line | edit_workflow -Supply Line | supply_line_interaction_workflow \ No newline at end of file +Sale Trade Condition | validation_workflow \ No newline at end of file diff --git a/bt5/erp5_trade/bt/template_workflow_id_list b/bt5/erp5_trade/bt/template_workflow_id_list index 113b5b76c400346c13690310a8dd11dcdf637862..15b38af993b699e927a1d6f106c2036ac165f54c 100644 --- a/bt5/erp5_trade/bt/template_workflow_id_list +++ b/bt5/erp5_trade/bt/template_workflow_id_list @@ -5,6 +5,5 @@ order_workflow packing_list_causality_workflow packing_list_container_workflow packing_list_workflow -supply_line_interaction_workflow tax_interaction_workflow trade_matrix_workflow \ No newline at end of file diff --git a/bt5/erp5_trade/bt/version b/bt5/erp5_trade/bt/version index 476411c0fb4d994b704fc49505ad726ea48e3723..0d5d4bc79772e02437e52e4437f65fbf446e9fe2 100644 --- a/bt5/erp5_trade/bt/version +++ b/bt5/erp5_trade/bt/version @@ -1 +1 @@ -1.0rc16 \ No newline at end of file +1.0rc17 \ No newline at end of file