Commit eb04b957 authored by Alexandre Boeglin's avatar Alexandre Boeglin

2008-04-16 alex

* invert dependancy between Trade and PDM
* move Supplies to PDM
* push version to 1.0rc17

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20580 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d54decfe
...@@ -59,17 +59,6 @@ ...@@ -59,17 +59,6 @@
<portal_type id="Purchase Packing List Module"> <portal_type id="Purchase Packing List Module">
<item>Purchase Packing List</item> <item>Purchase Packing List</item>
</portal_type> </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"> <portal_type id="Purchase Trade Condition">
<item>Tax Model Line</item> <item>Tax Model Line</item>
<item>Discount</item> <item>Discount</item>
...@@ -93,9 +82,9 @@ ...@@ -93,9 +82,9 @@
<item>Delivery Rule</item> <item>Delivery Rule</item>
</portal_type> </portal_type>
<portal_type id="Sale Order"> <portal_type id="Sale Order">
<item>Tax Line</item>
<item>Discount</item> <item>Discount</item>
<item>Sale Order Line</item> <item>Sale Order Line</item>
<item>Tax Line</item>
<item>Payment Condition</item> <item>Payment Condition</item>
</portal_type> </portal_type>
<portal_type id="Sale Order Line"> <portal_type id="Sale Order Line">
...@@ -118,29 +107,14 @@ ...@@ -118,29 +107,14 @@
<portal_type id="Sale Packing List Module"> <portal_type id="Sale Packing List Module">
<item>Sale Packing List</item> <item>Sale Packing List</item>
</portal_type> </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"> <portal_type id="Sale Trade Condition">
<item>Tax Model Line</item> <item>Tax Model Line</item>
<item>Discount</item>
<item>Payment Condition</item> <item>Payment Condition</item>
<item>Discount</item>
</portal_type> </portal_type>
<portal_type id="Sale Trade Condition Module"> <portal_type id="Sale Trade Condition Module">
<item>Sale Trade Condition</item> <item>Sale Trade Condition</item>
</portal_type> </portal_type>
<portal_type id="Supply Line">
<item>Supply Cell</item>
<item>Predicate</item>
</portal_type>
<portal_type id="Tax Module"> <portal_type id="Tax Module">
<item>Tax</item> <item>Tax</item>
</portal_type> </portal_type>
......
...@@ -17,13 +17,6 @@ ...@@ -17,13 +17,6 @@
<portal_type id="Purchase Packing List Line"> <portal_type id="Purchase Packing List Line">
<item>Purchase Packing List Cell</item> <item>Purchase Packing List Cell</item>
</portal_type> </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"> <portal_type id="Returned Sale Packing List Line">
<item>Returned Sale Packing List Cell</item> <item>Returned Sale Packing List Cell</item>
</portal_type> </portal_type>
...@@ -36,15 +29,4 @@ ...@@ -36,15 +29,4 @@
<portal_type id="Sale Packing List Line"> <portal_type id="Sale Packing List Line">
<item>Sale Packing List Cell</item> <item>Sale Packing List Cell</item>
</portal_type> </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> </hidden_content_type_list>
\ No newline at end of file
...@@ -6,7 +6,4 @@ ...@@ -6,7 +6,4 @@
<item>PaymentCondition</item> <item>PaymentCondition</item>
<item>Comment</item> <item>Comment</item>
</portal_type> </portal_type>
<portal_type id="Supply Cell">
<item>Reference</item>
</portal_type>
</property_sheet_list> </property_sheet_list>
\ No newline at end of file
...@@ -79,14 +79,6 @@ ...@@ -79,14 +79,6 @@
<type>Purchase Packing List Line</type> <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> <workflow>edit_workflow, pricing_interaction_workflow, delivery_movement_causality_interaction_workflow, trade_matrix_workflow, delivery_movement_simulation_interaction_workflow</workflow>
</chain> </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> <chain>
<type>Purchase Trade Condition</type> <type>Purchase Trade Condition</type>
<workflow>edit_workflow, validation_workflow</workflow> <workflow>edit_workflow, validation_workflow</workflow>
...@@ -127,20 +119,8 @@ ...@@ -127,20 +119,8 @@
<type>Sale Packing List Line</type> <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> <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>
<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> <chain>
<type>Sale Trade Condition</type> <type>Sale Trade Condition</type>
<workflow>edit_workflow, validation_workflow</workflow> <workflow>edit_workflow, validation_workflow</workflow>
</chain> </chain>
<chain>
<type>Supply Line</type>
<workflow>supply_line_interaction_workflow, edit_workflow</workflow>
</chain>
</workflow_chain> </workflow_chain>
\ No newline at end of file
2008-04-16 alex
* move Supplies to PDM
* push version to 1.0rc17
2008-04-14 jerome 2008-04-14 jerome
* Add new Tax system. * Add new Tax system.
......
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
erp5_core erp5_core
erp5_base erp5_base
erp5_pdm
\ No newline at end of file
This business template is all about Sales, Purchase, Packing, Delivery, Shipping, Inventory, Supply... This business template is all about Sales, Purchase, Packing, Delivery, Shipping, Inventory...
\ No newline at end of file \ No newline at end of file
289 302
\ No newline at end of file \ No newline at end of file
...@@ -57,16 +57,6 @@ Purchase Packing List | jump_related_purchase_order ...@@ -57,16 +57,6 @@ Purchase Packing List | jump_related_purchase_order
Purchase Packing List | packing_list_print Purchase Packing List | packing_list_print
Purchase Packing List | profile_view Purchase Packing List | profile_view
Purchase Packing List | 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 Module | view
Purchase Trade Condition | view Purchase Trade Condition | view
Purchase Trade Condition | view_discount Purchase Trade Condition | view_discount
...@@ -113,30 +103,12 @@ Sale Packing List | jump_related_sale_invoice ...@@ -113,30 +103,12 @@ Sale Packing List | jump_related_sale_invoice
Sale Packing List | packing_list_print Sale Packing List | packing_list_print
Sale Packing List | view Sale Packing List | view
Sale Packing List | view_container_list 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 Module | view
Sale Trade Condition | view Sale Trade Condition | view
Sale Trade Condition | view_discount Sale Trade Condition | view_discount
Sale Trade Condition | view_payment Sale Trade Condition | view_payment
Sale Trade Condition | view_profile Sale Trade Condition | view_profile
Sale Trade Condition | view_tax 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 Line | view
Tax Model Line | view Tax Model Line | view
Tax Module | view Tax Module | view
......
...@@ -2,11 +2,9 @@ internal_packing_list_module ...@@ -2,11 +2,9 @@ internal_packing_list_module
inventory_module inventory_module
purchase_order_module purchase_order_module
purchase_packing_list_module purchase_packing_list_module
purchase_supply_module
purchase_trade_condition_module purchase_trade_condition_module
returned_sale_packing_list_module returned_sale_packing_list_module
sale_order_module sale_order_module
sale_packing_list_module sale_packing_list_module
sale_supply_module
sale_trade_condition_module sale_trade_condition_module
tax_module tax_module
\ No newline at end of file
...@@ -26,11 +26,6 @@ Purchase Packing List | Discount ...@@ -26,11 +26,6 @@ Purchase Packing List | Discount
Purchase Packing List | Payment Condition Purchase Packing List | Payment Condition
Purchase Packing List | Purchase Packing List Line Purchase Packing List | Purchase Packing List Line
Purchase Packing List | Tax 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 Module | Purchase Trade Condition
Purchase Trade Condition | Discount Purchase Trade Condition | Discount
Purchase Trade Condition | Payment Condition Purchase Trade Condition | Payment Condition
...@@ -55,15 +50,8 @@ Sale Packing List | Discount ...@@ -55,15 +50,8 @@ Sale Packing List | Discount
Sale Packing List | Payment Condition Sale Packing List | Payment Condition
Sale Packing List | Sale Packing List Line Sale Packing List | Sale Packing List Line
Sale Packing List | Tax 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 Module | Sale Trade Condition
Sale Trade Condition | Discount Sale Trade Condition | Discount
Sale Trade Condition | Payment Condition Sale Trade Condition | Payment Condition
Sale Trade Condition | Tax Model Line Sale Trade Condition | Tax Model Line
Supply Line | Predicate
Supply Line | Supply Cell
Tax Module | Tax Tax Module | Tax
\ No newline at end of file
...@@ -4,15 +4,7 @@ Inventory Line | Inventory Cell ...@@ -4,15 +4,7 @@ Inventory Line | Inventory Cell
Purchase Order Line | Purchase Order Cell Purchase Order Line | Purchase Order Cell
Purchase Order | Tax Line Purchase Order | Tax Line
Purchase Packing List Line | Purchase Packing List Cell 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 Returned Sale Packing List Line | Returned Sale Packing List Cell
Sale Order Line | Sale Order Cell Sale Order Line | Sale Order Cell
Sale Order | Tax Line Sale Order | Tax Line
Sale Packing List Line | Sale Packing List Cell Sale Packing List Line | Sale Packing List Cell
\ No newline at end of file
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
...@@ -22,10 +22,6 @@ Purchase Packing List ...@@ -22,10 +22,6 @@ Purchase Packing List
Purchase Packing List Cell Purchase Packing List Cell
Purchase Packing List Line Purchase Packing List Line
Purchase Packing List Module Purchase Packing List Module
Purchase Supply
Purchase Supply Cell
Purchase Supply Line
Purchase Supply Module
Purchase Trade Condition Purchase Trade Condition
Purchase Trade Condition Module Purchase Trade Condition Module
Returned Sale Packing List Returned Sale Packing List
...@@ -40,14 +36,8 @@ Sale Packing List ...@@ -40,14 +36,8 @@ Sale Packing List
Sale Packing List Cell Sale Packing List Cell
Sale Packing List Line Sale Packing List Line
Sale Packing List Module Sale Packing List Module
Sale Supply
Sale Supply Cell
Sale Supply Line
Sale Supply Module
Sale Trade Condition Sale Trade Condition
Sale Trade Condition Module Sale Trade Condition Module
Supply Cell
Supply Line
Tax Tax
Tax Line Tax Line
Tax Model Line Tax Model Line
......
Sale Order | PaymentCondition Sale Order | PaymentCondition
Sale Trade Condition | Comment Sale Trade Condition | Comment
Sale Trade Condition | PaymentCondition Sale Trade Condition | PaymentCondition
Supply Cell | Reference
\ No newline at end of file
...@@ -52,9 +52,6 @@ Purchase Packing List | delivery_simulation_interaction_workflow ...@@ -52,9 +52,6 @@ Purchase Packing List | delivery_simulation_interaction_workflow
Purchase Packing List | edit_workflow Purchase Packing List | edit_workflow
Purchase Packing List | packing_list_causality_workflow Purchase Packing List | packing_list_causality_workflow
Purchase Packing List | packing_list_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 | edit_workflow
Purchase Trade Condition | validation_workflow Purchase Trade Condition | validation_workflow
Returned Sale Packing List Cell | pricing_interaction_workflow Returned Sale Packing List Cell | pricing_interaction_workflow
...@@ -89,10 +86,5 @@ Sale Packing List | edit_workflow ...@@ -89,10 +86,5 @@ Sale Packing List | edit_workflow
Sale Packing List | packing_list_causality_workflow Sale Packing List | packing_list_causality_workflow
Sale Packing List | packing_list_container_workflow Sale Packing List | packing_list_container_workflow
Sale Packing List | packing_list_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 | edit_workflow
Sale Trade Condition | validation_workflow Sale Trade Condition | validation_workflow
\ No newline at end of file
Supply Line | edit_workflow
Supply Line | supply_line_interaction_workflow
\ No newline at end of file
...@@ -5,6 +5,5 @@ order_workflow ...@@ -5,6 +5,5 @@ order_workflow
packing_list_causality_workflow packing_list_causality_workflow
packing_list_container_workflow packing_list_container_workflow
packing_list_workflow packing_list_workflow
supply_line_interaction_workflow
tax_interaction_workflow tax_interaction_workflow
trade_matrix_workflow trade_matrix_workflow
\ No newline at end of file
1.0rc16 1.0rc17
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment