[Erp5-report] r33163 kazuhiko - in /erp5/trunk: bt5/erp5_accounting/PathTemplateItem/portal...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Mar 1 09:23:33 CET 2010
Author: kazuhiko
Date: Mon Mar 1 09:23:27 2010
New Revision: 33163
URL: http://svn.erp5.org?rev=33163&view=rev
Log:
* make more new naming simulation rules
* Invoice Simulation Rule
* Invoice Transaction Simulation Rule
* Trade Model Simulation Rule
* make new rule's test method support new rules only
* make old rule's test method support old rules only
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentSimulationRule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentRule.xml
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Simulation%20Rule/
- copied from r33063, erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoicing%20Rule/
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/
- copied from r33063, erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Rule/
erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Trade%20Model%20Simulation%20Rule/
- copied from r33063, erp5/trunk/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Trade%20Model%20Rule/
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_simulation_rule/
- copied from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule/
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_simulation_rule/
- copied from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_rule/
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_rule.xml
erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Simulation%20Rule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml
erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml
erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Simulation%20Rule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceSimulationRule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionSimulationRule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelSimulationRule.xml
- copied, changed from r33063, erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
erp5/trunk/products/ERP5/Document/InvoiceSimulationRule.py
erp5/trunk/products/ERP5/Document/InvoiceTransactionSimulationRule.py
erp5/trunk/products/ERP5/Document/TradeModelSimulationRule.py
Modified:
erp5/trunk/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoice_selectTradeModelMovementList.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoice_selectTradeModelMovementList.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
erp5/trunk/bt5/erp5_invoicing/bt/revision
erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list
erp5/trunk/bt5/erp5_invoicing/bt/template_path_list
erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list
erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
Modified: erp5/trunk/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/PathTemplateItem/portal_rules/default_payment_simulation_rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -112,7 +112,7 @@
<key> <string>test_method_id</string> </key>
<value>
<tuple>
- <string>SimulationMovement_testPaymentRule</string>
+ <string>SimulationMovement_testPaymentSimulationRule</string>
</tuple>
</value>
</item>
Copied: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentSimulationRule.xml (from r33063, erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentRule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentSimulationRule.xml?p2=erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentSimulationRule.xml&p1=erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentRule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentSimulationRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -60,9 +60,10 @@
return False\n
\n
parent_rule = parent.getSpecialiseValue()\n
-if parent_rule.getPortalType() not in (\'Invoice Transaction Rule\',):\n
+if parent_rule.getPortalType() not in (\'Invoice Transaction Simulation Rule\',):\n
return False\n
\n
+# XXX hardcoded\n
receivable_account_type_list = (\'asset/receivable\',)\n
payable_account_type_list = (\'liability/payable\',)\n
\n
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon Mar 1 09:23:27 2010
@@ -1,1 +1,1 @@
-1120
+1121
Modified: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_cell.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+ <global name="MirrorCategoryMovementGroup" module="Products.ERP5Type.Document.MirrorCategoryMovementGroup"/>
<tuple/>
</tuple>
</pickle>
@@ -34,7 +34,7 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Category Movement Group</string> </value>
+ <value> <string>Mirror Category Movement Group</string> </value>
</item>
<item>
<key> <string>tested_property</string> </key>
Modified: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_delivery.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+ <global name="MirrorCategoryMovementGroup" module="Products.ERP5Type.Document.MirrorCategoryMovementGroup"/>
<tuple/>
</tuple>
</pickle>
@@ -34,7 +34,7 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Category Movement Group</string> </value>
+ <value> <string>Mirror Category Movement Group</string> </value>
</item>
<item>
<key> <string>tested_property</string> </key>
Modified: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/category_movement_group_on_line.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+ <global name="MirrorCategoryMovementGroup" module="Products.ERP5Type.Document.MirrorCategoryMovementGroup"/>
<tuple/>
</tuple>
</pickle>
@@ -34,7 +34,7 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Category Movement Group</string> </value>
+ <value> <string>Mirror Category Movement Group</string> </value>
</item>
<item>
<key> <string>tested_property</string> </key>
Modified: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_deliveries/payment_transaction_builder/property_movement_group_on_delivery.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+ <global name="MirrorPropertyMovementGroup" module="Products.ERP5Type.Document.MirrorPropertyMovementGroup"/>
<tuple/>
</tuple>
</pickle>
@@ -34,7 +34,7 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Property Movement Group</string> </value>
+ <value> <string>Mirror Property Movement Group</string> </value>
</item>
<item>
<key> <string>tested_property</string> </key>
Copied: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_simulation_rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="InvoicingRule" module="Products.ERP5Type.Document.InvoicingRule"/>
+ <global name="InvoiceSimulationRule" module="Products.ERP5Type.Document.InvoiceSimulationRule"/>
<tuple/>
</tuple>
</pickle>
@@ -122,7 +122,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>default_invoicing_rule</string> </value>
+ <value> <string>default_invoice_simulation_rule</string> </value>
</item>
<item>
<key> <string>matching_property</string> </key>
@@ -136,23 +136,23 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Invoicing Rule</string> </value>
+ <value> <string>Invoice Simulation Rule</string> </value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple>
- <string>SimulationMovement_testInvoicingRule</string>
+ <string>SimulationMovement_testInvoiceSimulationRule</string>
</tuple>
</value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Default Invoicing Rule</string> </value>
+ <value> <string>Default Invoice Simulation Rule</string> </value>
</item>
<item>
<key> <string>version</string> </key>
- <value> <string>1</string> </value>
+ <value> <string>2</string> </value>
</item>
</dictionary>
</pickle>
Copied: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_simulation_rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="InvoiceTransactionRule" module="Products.ERP5Type.Document.InvoiceTransactionRule"/>
+ <global name="InvoiceTransactionSimulationRule" module="Products.ERP5Type.Document.InvoiceTransactionSimulationRule"/>
<tuple/>
</tuple>
</pickle>
@@ -95,7 +95,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>default_invoice_transaction_rule</string> </value>
+ <value> <string>default_invoice_transaction_simulation_rule</string> </value>
</item>
<item>
<key> <string>index</string> </key>
@@ -121,23 +121,23 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Invoice Transaction Rule</string> </value>
+ <value> <string>Invoice Transaction Simulation Rule</string> </value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple>
- <string>SimulationMovement_testInvoiceTransactionRule</string>
+ <string>SimulationMovement_testInvoiceTransactionSimulationRule</string>
</tuple>
</value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Default Invoice Transaction Rule</string> </value>
+ <value> <string>Default Invoice Transaction Simulation Rule</string> </value>
</item>
<item>
<key> <string>version</string> </key>
- <value> <string>1</string> </value>
+ <value> <string>2</string> </value>
</item>
</dictionary>
</pickle>
@@ -270,7 +270,7 @@
<value>
<dictionary>
<item>
- <key> <string>portal_rules/default_invoice_transaction_rule/4</string> </key>
+ <key> <string>portal_rules/default_invoice_transaction_simulation_rule/4</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
@@ -296,15 +296,15 @@
<value>
<dictionary>
<item>
- <key> <string>portal_rules/default_invoice_transaction_rule/10</string> </key>
+ <key> <string>portal_rules/default_invoice_transaction_simulation_rule/10</string> </key>
<value> <int>2</int> </value>
</item>
<item>
- <key> <string>portal_rules/default_invoice_transaction_rule/11</string> </key>
+ <key> <string>portal_rules/default_invoice_transaction_simulation_rule/11</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>portal_rules/default_invoice_transaction_rule/12</string> </key>
+ <key> <string>portal_rules/default_invoice_transaction_simulation_rule/12</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
Copied: erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml?p2=erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml&p1=erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_rule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_trade_model_simulation_rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="TradeModelRule" module="Products.ERP5Type.Document.TradeModelRule"/>
+ <global name="TradeModelSimulationRule" module="Products.ERP5Type.Document.TradeModelSimulationRule"/>
<tuple/>
</tuple>
</pickle>
@@ -128,7 +128,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>default_trade_model_rule</string> </value>
+ <value> <string>default_trade_model_simulation_rule</string> </value>
</item>
<item>
<key> <string>last_id</string> </key>
@@ -144,23 +144,23 @@
</item>
<item>
<key> <string>portal_type</string> </key>
- <value> <string>Trade Model Rule</string> </value>
+ <value> <string>Trade Model Simulation Rule</string> </value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple>
- <string>SimulationMovement_testTradeModelRule</string>
+ <string>SimulationMovement_testTradeModelSimulationRule</string>
</tuple>
</value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Default Trade Model Rule</string> </value>
+ <value> <string>Default Trade Model Simulation Rule</string> </value>
</item>
<item>
<key> <string>version</string> </key>
- <value> <string>1</string> </value>
+ <value> <string>2</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -3,7 +3,19 @@
<item>Invoice Cell</item>
<item>Invoice Line</item>
</portal_type>
+ <portal_type id="Invoice Simulation Rule">
+ <item>Category Divergence Tester</item>
+ <item>Property Divergence Tester</item>
+ <item>Quantity Divergence Tester</item>
+ </portal_type>
<portal_type id="Invoice Transaction Rule">
+ <item>Accounting Rule Cell</item>
+ <item>Category Divergence Tester</item>
+ <item>Predicate</item>
+ <item>Property Divergence Tester</item>
+ <item>Quantity Divergence Tester</item>
+ </portal_type>
+ <portal_type id="Invoice Transaction Simulation Rule">
<item>Accounting Rule Cell</item>
<item>Category Divergence Tester</item>
<item>Predicate</item>
@@ -16,13 +28,21 @@
<item>Quantity Divergence Tester</item>
</portal_type>
<portal_type id="Rule Tool">
+ <item>Invoice Simulation Rule</item>
<item>Invoice Transaction Rule</item>
+ <item>Invoice Transaction Simulation Rule</item>
<item>Invoicing Rule</item>
<item>Trade Model Rule</item>
+ <item>Trade Model Simulation Rule</item>
</portal_type>
<portal_type id="Trade Model Rule">
<item>Category Divergence Tester</item>
<item>Property Divergence Tester</item>
<item>Quantity Divergence Tester</item>
</portal_type>
+ <portal_type id="Trade Model Simulation Rule">
+ <item>Category Divergence Tester</item>
+ <item>Property Divergence Tester</item>
+ <item>Quantity Divergence Tester</item>
+ </portal_type>
</allowed_content_type_list>
Copied: erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Simulation%20Rule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoicing%2520Rule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoicing%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Simulation%20Rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -19,7 +19,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Invoicing Rule</string> </value>
+ <value> <string>ERP5 Invoice Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -29,7 +29,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addInvoicingRule</string> </value>
+ <value> <string>addInvoiceSimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -45,7 +45,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Invoicing Rule</string> </value>
+ <value> <string>Invoice Simulation Rule</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Copied: erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%2520Transaction%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%2520Transaction%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%2520Transaction%2520Rule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -19,11 +19,11 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Invoice Transaction Rule</string> </value>
+ <value> <string>ERP5 Invoice Transaction Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
- <value> <string> Invoice Transaction Rule object make sure an Invoice in the simulation\n
+ <value> <string> Invoice Transaction Simulation Rule object make sure an Invoice in the simulation\n
is consistent with the real invoice\n
\n
WARNING: what to do with movement split ?\n
@@ -31,7 +31,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addInvoiceTransactionRule</string> </value>
+ <value> <string>addInvoiceTransactionSimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -47,7 +47,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Invoice Transaction Rule</string> </value>
+ <value> <string>Invoice Transaction Simulation Rule</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Copied: erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Simulation%20Rule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%2520Model%2520Simulation%2520Rule.xml?p2=erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%2520Model%2520Simulation%2520Rule.xml&p1=erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%2520Model%2520Rule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Rule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeTemplateItem/portal_types/Trade%20Model%20Simulation%20Rule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -38,7 +38,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Trade Model Rule</string> </value>
+ <value> <string>ERP5 Trade Model Simulation Rule</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -46,7 +46,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addTradeModelRule</string> </value>
+ <value> <string>addTradeModelSimulationRule</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Trade Model Rule</string> </value>
+ <value> <string>Trade Model Simulation Rule</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Modified: erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -8,7 +8,15 @@
<workflow>delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow, edit_workflow, movement_base_contribution_interaction_workflow, pricing_interaction_workflow, trade_matrix_workflow</workflow>
</chain>
<chain>
+ <type>Invoice Simulation Rule</type>
+ <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
<type>Invoice Transaction Rule</type>
+ <workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
+ </chain>
+ <chain>
+ <type>Invoice Transaction Simulation Rule</type>
<workflow>edit_workflow, rule_interaction_workflow, rule_validation_workflow</workflow>
</chain>
<chain>
@@ -19,4 +27,8 @@
<type>Trade Model Rule</type>
<workflow>edit_workflow, rule_validation_workflow</workflow>
</chain>
+ <chain>
+ <type>Trade Model Simulation Rule</type>
+ <workflow>edit_workflow, rule_validation_workflow</workflow>
+ </chain>
</workflow_chain>
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectDelivery.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -65,7 +65,7 @@
line = None\n
\n
# case of tax movement \n
- if ar.getSpecialiseValue().getPortalType() == \'Tax Rule\':\n
+ if ar.getSpecialiseValue().getPortalType() in (\'Tax Rule\', \'Tax Simulation Rule\'):\n
for other_rule in ar.getParentValue().contentValues():\n
if other_rule == ar:\n
continue\n
@@ -73,7 +73,7 @@
line = sm.getDeliveryValue()\n
\n
# case of trade model movement\n
- if ar.getParentValue().getParentValue().getSpecialiseValue().getPortalType() == \'Trade Model Rule\':\n
+ if ar.getParentValue().getParentValue().getSpecialiseValue().getPortalType() in (\'Trade Model Rule\', \'Trade Model Simulation Rule\'):\n
line = ar.getParentValue().getParentValue().getParentValue().getDeliveryValue()\n
\n
# in case of invoice rule (ie. starting from Invoice)\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_selectInvoiceMovement.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -59,9 +59,9 @@
and same rule which is children of Trade Model Rule """\n
\n
# search for normal movements\n
-kw[\'parent_specialise_portal_type\'] = \'Invoice Transaction Rule\'\n
+kw[\'parent_specialise_portal_type\'] = [\'Invoice Transaction Rule\', \'Invoice Transaction Simulation Rule\']\n
kw[\'grand_grand_parent_specialise_portal_type\'] = [\n
- \'Invoicing Rule\', \'Invoice Rule\', \'Invoice Root Simulation Rule\', \'Tax Rule\']\n
+ \'Invoicing Rule\', \'Invoice Simulation Rule\', \'Invoice Rule\', \'Invoice Root Simulation Rule\', \'Tax Rule\']\n
if context.Invoice_isAdvanced():\n
kw[\'explanation_portal_type\'] = [\'%s Order\' % trade_type,\n
\'%s Invoice\' % trade_type,\n
@@ -80,7 +80,7 @@
\n
# update query to search for movements which are children of Trade Model Rule\n
kw.pop(\'grand_parent_simulation_state\')\n
-kw[\'grand_grand_parent_specialise_portal_type\'] = \'Trade Model Rule\'\n
+kw[\'grand_grand_parent_specialise_portal_type\'] = [\'Trade Model Rule\', \'Trade Model Simulation Rule\']\n
kw[\'grand_grand_grand_parent_simulation_state\'] = [\'started\']\n
\n
search_kw = kw.copy()\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoiceTransaction_selectPackingListMovement.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoicing Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = [\'Invoicing Rule\', \'Invoice Simulation Rule\']\n
kw[\'explanation_portal_type\'] = [\'Purchase Order\', \'Purchase Packing List\']\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\', \'stopped\',\'delivered\']\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoice_selectTradeModelMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoice_selectTradeModelMovementList.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoice_selectTradeModelMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/PurchaseInvoice_selectTradeModelMovementList.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>kw[\'parent_specialise_portal_type\'] = \'Trade Model Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = [\'Trade Model Rule\', \'Trade Model Simulation Rule\']\n
kw[\'explanation_portal_type\'] = [\'Purchase Order\', \'Purchase Packing List\', \'Purchase Invoice Transaction\', \'Purchase Invoice\']\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\', \'stopped\', \'delivered\', \'planned\', \'confirmed\']\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoiceTransaction_selectPackingListMovement.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>kw[\'parent_specialise_portal_type\'] = \'Invoicing Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = [\'Invoicing Rule\', \'Invoice Simulation Rule\']\n
kw[\'explanation_portal_type\'] = [\'Sale Order\', \'Sale Packing List\']\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\', \'stopped\',\'delivered\']\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoice_selectTradeModelMovementList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoice_selectTradeModelMovementList.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoice_selectTradeModelMovementList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SaleInvoice_selectTradeModelMovementList.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>kw[\'parent_specialise_portal_type\'] = \'Trade Model Rule\'\n
+ <value> <string>kw[\'parent_specialise_portal_type\'] = [\'Trade Model Rule\', \'Trade Model Simulation Rule\']\n
kw[\'explanation_portal_type\'] = [\'Sale Order\', \'Sale Packing List\', \'Sale Invoice Transaction\', \'Sale Invoice\']\n
kw[\'portal_type\'] = \'Simulation Movement\'\n
kw[\'grand_parent_simulation_state\'] = [\'started\', \'stopped\', \'delivered\', \'planned\', \'confirmed\']\n
Copied: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceSimulationRule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceSimulationRule.xml?p2=erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceSimulationRule.xml&p1=erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceSimulationRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -59,7 +59,7 @@
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\n
- if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n
+ if parent_rule_portal_type not in [\'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n
return False\n
# XXX can we create invoicing rule for Production Order?\n
if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -61,7 +61,6 @@
\n
parent_rule = parent.getSpecialiseValue()\n
if parent_rule.getPortalType() not in (\'Invoice Rule\',\n
- \'Invoice Root Simulation Rule\',\n
\'Invoicing Rule\',\n
\'Trade Model Rule\',\n
\'Tax Rule\'):\n
Copied: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionSimulationRule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionSimulationRule.xml?p2=erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionSimulationRule.xml&p1=erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoiceTransactionSimulationRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -60,11 +60,10 @@
return False\n
\n
parent_rule = parent.getSpecialiseValue()\n
-if parent_rule.getPortalType() not in (\'Invoice Rule\',\n
- \'Invoice Root Simulation Rule\',\n
- \'Invoicing Rule\',\n
- \'Trade Model Rule\',\n
- \'Tax Rule\'):\n
+if parent_rule.getPortalType() not in (\'Invoice Root Simulation Rule\',\n
+ \'Invoice Simulation Rule\',\n
+ \'Trade Model Simulation Rule\',\n
+ \'Tax Simulation Rule\'):\n
return False\n
\n
delivery_movement = movement.getDeliveryValue()\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testInvoicingRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -59,11 +59,7 @@
if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n
parent_rule_portal_type = parent_rule.getPortalType()\n
- if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\', \'Delivery Root Simulation Rule\', \'Delivery Simulation Rule\']:\n
- return False\n
- # XXX can we create invoicing rule for Production Order?\n
- if parent_rule_portal_type in [\'Delivery Simulation Rule\',] and \\\n
- parent.getParentValue().getParentValue().getSpecialiseValue().getPortalType() not in [\'Order Root Simulation Rule\']:\n
+ if parent_rule_portal_type not in [\'Order Rule\', \'Delivery Rule\']:\n
return False\n
\n
source_section = movement.getSourceSection()\n
Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -61,7 +61,6 @@
\n
parent_rule = parent.getSpecialiseValue()\n
if parent_rule.getPortalType() not in (\'Invoice Rule\',\n
- \'Invoice Root Simulation Rule\',\n
\'Invoicing Rule\'):\n
return False\n
\n
Copied: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelSimulationRule.xml (from r33063, erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelSimulationRule.xml?p2=erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelSimulationRule.xml&p1=erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml&r1=33063&r2=33163&rev=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelRule.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/SimulationMovement_testTradeModelSimulationRule.xml [utf8] Mon Mar 1 09:23:27 2010
@@ -60,9 +60,8 @@
return False\n
\n
parent_rule = parent.getSpecialiseValue()\n
-if parent_rule.getPortalType() not in (\'Invoice Rule\',\n
- \'Invoice Root Simulation Rule\',\n
- \'Invoicing Rule\'):\n
+if parent_rule.getPortalType() not in (\'Invoice Root Simulation Rule\',\n
+ \'Invoice Simulation Rule\'):\n
return False\n
\n
return True\n
Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Mon Mar 1 09:23:27 2010
@@ -1,1 +1,1 @@
-341
+342
Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_action_path_list [utf8] Mon Mar 1 09:23:27 2010
@@ -2,7 +2,11 @@
Invoice Line | quantity
Invoice Line | view
Invoice Line | view_trade_model
+Invoice Simulation Rule | view
Invoice Transaction Rule | divergence
Invoice Transaction Rule | view
+Invoice Transaction Simulation Rule | divergence
+Invoice Transaction Simulation Rule | view
Invoicing Rule | view
-Trade Model Rule | view
+Trade Model Rule | view
+Trade Model Simulation Rule | view
Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_path_list?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_path_list [utf8] Mon Mar 1 09:23:27 2010
@@ -1,8 +1,14 @@
portal_deliveries/payment_transaction_builder
portal_deliveries/payment_transaction_builder/**
+portal_rules/default_invoice_simulation_rule
+portal_rules/default_invoice_simulation_rule/**
portal_rules/default_invoice_transaction_rule
portal_rules/default_invoice_transaction_rule/**
+portal_rules/default_invoice_transaction_simulation_rule
+portal_rules/default_invoice_transaction_simulation_rule/**
portal_rules/default_invoicing_rule
portal_rules/default_invoicing_rule/**
portal_rules/default_trade_model_rule
-portal_rules/default_trade_model_rule/**
+portal_rules/default_trade_model_rule/**
+portal_rules/default_trade_model_simulation_rule
+portal_rules/default_trade_model_simulation_rule/**
Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_allowed_content_type_list [utf8] Mon Mar 1 09:23:27 2010
@@ -1,16 +1,30 @@
Invoice Line | Invoice Cell
Invoice Line | Invoice Line
+Invoice Simulation Rule | Category Divergence Tester
+Invoice Simulation Rule | Property Divergence Tester
+Invoice Simulation Rule | Quantity Divergence Tester
Invoice Transaction Rule | Accounting Rule Cell
Invoice Transaction Rule | Category Divergence Tester
Invoice Transaction Rule | Predicate
Invoice Transaction Rule | Property Divergence Tester
Invoice Transaction Rule | Quantity Divergence Tester
+Invoice Transaction Simulation Rule | Accounting Rule Cell
+Invoice Transaction Simulation Rule | Category Divergence Tester
+Invoice Transaction Simulation Rule | Predicate
+Invoice Transaction Simulation Rule | Property Divergence Tester
+Invoice Transaction Simulation Rule | Quantity Divergence Tester
Invoicing Rule | Category Divergence Tester
Invoicing Rule | Property Divergence Tester
Invoicing Rule | Quantity Divergence Tester
+Rule Tool | Invoice Simulation Rule
Rule Tool | Invoice Transaction Rule
+Rule Tool | Invoice Transaction Simulation Rule
Rule Tool | Invoicing Rule
Rule Tool | Trade Model Rule
+Rule Tool | Trade Model Simulation Rule
Trade Model Rule | Category Divergence Tester
Trade Model Rule | Property Divergence Tester
-Trade Model Rule | Quantity Divergence Tester
+Trade Model Rule | Quantity Divergence Tester
+Trade Model Simulation Rule | Category Divergence Tester
+Trade Model Simulation Rule | Property Divergence Tester
+Trade Model Simulation Rule | Quantity Divergence Tester
Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_id_list [utf8] Mon Mar 1 09:23:27 2010
@@ -1,5 +1,8 @@
Invoice Cell
Invoice Line
+Invoice Simulation Rule
Invoice Transaction Rule
+Invoice Transaction Simulation Rule
Invoicing Rule
-Trade Model Rule
+Trade Model Rule
+Trade Model Simulation Rule
Modified: erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list?rev=33163&r1=33162&r2=33163&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/template_portal_type_workflow_chain_list [utf8] Mon Mar 1 09:23:27 2010
@@ -8,10 +8,17 @@
Invoice Line | movement_base_contribution_interaction_workflow
Invoice Line | pricing_interaction_workflow
Invoice Line | trade_matrix_workflow
+Invoice Simulation Rule | edit_workflow
+Invoice Simulation Rule | rule_validation_workflow
Invoice Transaction Rule | edit_workflow
Invoice Transaction Rule | rule_interaction_workflow
Invoice Transaction Rule | rule_validation_workflow
+Invoice Transaction Simulation Rule | edit_workflow
+Invoice Transaction Simulation Rule | rule_interaction_workflow
+Invoice Transaction Simulation Rule | rule_validation_workflow
Invoicing Rule | edit_workflow
Invoicing Rule | rule_validation_workflow
Trade Model Rule | edit_workflow
-Trade Model Rule | rule_validation_workflow
+Trade Model Rule | rule_validation_workflow
+Trade Model Simulation Rule | edit_workflow
+Trade Model Simulation Rule | rule_validation_workflow
Added: erp5/trunk/products/ERP5/Document/InvoiceSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceSimulationRule.py?rev=33163&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceSimulationRule.py (added)
+++ erp5/trunk/products/ERP5/Document/InvoiceSimulationRule.py [utf8] Mon Mar 1 09:23:27 2010
@@ -1,0 +1,44 @@
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+from Products.ERP5Type import Permissions
+from Products.ERP5.Document.InvoicingRule import InvoicingRule
+
+class InvoiceSimulationRule(InvoicingRule):
+ """
+ Invoice Simulation Rule expand simulation created by a order or delivery rule.
+ """
+
+ # CMF Type Definition
+ meta_type = 'ERP5 Invoice Simulation Rule'
+ portal_type = 'Invoice Simulation Rule'
+ add_permission = Permissions.AddPortalContent
+
+ # Declarative security
+ security = ClassSecurityInfo()
+ security.declareObjectProtected(Permissions.AccessContentsInformation)
Added: erp5/trunk/products/ERP5/Document/InvoiceTransactionSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceTransactionSimulationRule.py?rev=33163&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceTransactionSimulationRule.py (added)
+++ erp5/trunk/products/ERP5/Document/InvoiceTransactionSimulationRule.py [utf8] Mon Mar 1 09:23:27 2010
@@ -1,0 +1,47 @@
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+from Products.ERP5Type import Permissions
+from Products.ERP5.Document.InvoiceTransactionRule import InvoiceTransactionRule
+
+class InvoiceTransactionSimulationRule(InvoiceTransactionRule):
+ """
+ Invoice Transaction Simulation Rule object generates accounting movements for
+ each invoice movement based on category membership and other
+ predicated. Template accounting movements are stored in cells inside
+ an instance of the InvoiceTransactionRule.
+ """
+
+ # CMF Type Definition
+ meta_type = 'ERP5 Invoice Transaction Simulation Rule'
+ portal_type = 'Invoice Transaction Simulation Rule'
+ add_permission = Permissions.AddPortalContent
+
+ # Declarative security
+ security = ClassSecurityInfo()
+ security.declareObjectProtected(Permissions.AccessContentsInformation)
Added: erp5/trunk/products/ERP5/Document/TradeModelSimulationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TradeModelSimulationRule.py?rev=33163&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/TradeModelSimulationRule.py (added)
+++ erp5/trunk/products/ERP5/Document/TradeModelSimulationRule.py [utf8] Mon Mar 1 09:23:27 2010
@@ -1,0 +1,43 @@
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+from Products.ERP5Type import Permissions
+from Products.ERP5.Document.TradeModelRule import TradeModelRule
+
+class TradeModelSimulationRule(TradeModelRule):
+ """
+ Rule for Trade Model
+ """
+ # CMF Type Definition
+ meta_type = 'ERP5 Trade Model Simulation Rule'
+ portal_type = 'Trade Model Simulation Rule'
+ add_permission = Permissions.AddPortalContent
+
+ # Declarative security
+ security = ClassSecurityInfo()
+ security.declareObjectProtected(Permissions.AccessContentsInformation)
More information about the Erp5-report
mailing list