Skip to content

erp5
erp5
Commit f4fdfab7 authored by Alexandre Boeglin's avatar Alexandre Boeglin
Browse files
Options

* as the default behaviour when no script is defined is to return False,... 

* as the default behaviour when no script is defined is to return False, InvoiceRule test script is no longer required
* other scripts were renamed to comply to naming conventions

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17661 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f5b130dc
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 169 deletions
bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoice_rule.xml
View file @ f4fdfab7
...@@ -66,9 +66,7 @@ ...@@ -66,9 +66,7 @@
<item> <item>
<key> <string>test_method_id</string> </key> <key> <string>test_method_id</string> </key>
<value> <value>
<tuple> <tuple/>
<string>InvoiceRule_testContextPortalType</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml
View file @ f4fdfab7
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<key> <string>test_method_id</string> </key> <key> <string>test_method_id</string> </key>
<value> <value>
<tuple> <tuple>
<string>InvoiceTransactionRule_test</string> <string>SimulationMovement_testInvoiceTransactionRule</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/PathTemplateItem/portal_rules/default_invoicing_rule.xml
View file @ f4fdfab7
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>_mt_index</string> </key> <key> <string>_mt_index</string> </key>
<value> <value>
...@@ -33,6 +39,12 @@ ...@@ -33,6 +39,12 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>_tree</string> </key> <key> <string>_tree</string> </key>
<value> <value>
...@@ -55,7 +67,7 @@ ...@@ -55,7 +67,7 @@
<key> <string>test_method_id</string> </key> <key> <string>test_method_id</string> </key>
<value> <value>
<tuple> <tuple>
<string>InvoicingRule_testParentRulePortalType</string> <string>SimulationMovement_testInvoicingRule</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/PathTemplateItem/portal_rules/default_payment_rule.xml
View file @ f4fdfab7
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<key> <string>test_method_id</string> </key> <key> <string>test_method_id</string> </key>
<value> <value>
<tuple> <tuple>
<string>PaymentRule_testMovementId</string> <string>SimulationMovement_testPaymentRule</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceRule_testContextPortalType.xml deleted 100644 → 0
View file @ f5b130dc
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return context.getPortalType() in [\'Sale Invoice Transaction\']\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>rule</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>rule</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>InvoiceRule_testContextPortalType</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionRule_test.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testInvoiceTransactionRule.xml
View file @ f4fdfab7
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>parent = context.getParentValue()\n <value> <string>movement = context\n
\n
parent = movement.getParentValue()\n
if parent.getPortalType() != \'Applied Rule\':\n if parent.getPortalType() != \'Applied Rule\':\n
return False\n return False\n
\n \n
...@@ -73,11 +75,11 @@ parent_rule = parent.getSpecialiseValue()\n ...@@ -73,11 +75,11 @@ parent_rule = parent.getSpecialiseValue()\n
if parent_rule.getPortalType() not in [\'Invoice Rule\', \'Invoicing Rule\']:\n if parent_rule.getPortalType() not in [\'Invoice Rule\', \'Invoicing Rule\']:\n
return False\n return False\n
\n \n
delivery_movement = context.getDeliveryValue()\n delivery_movement = movement.getDeliveryValue()\n
if delivery_movement is not None and delivery_movement.getPortalType() not in context.getPortalInvoiceMovementTypeList():\n if delivery_movement is not None and delivery_movement.getPortalType() not in movement.getPortalInvoiceMovementTypeList():\n
return False\n return False\n
\n \n
return rule.getMatchingCell(context) is not None\n return rule.getMatchingCell(movement) is not None\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -127,8 +129,9 @@ return rule.getMatchingCell(context) is not None\n ...@@ -127,8 +129,9 @@ return rule.getMatchingCell(context) is not None\n
<value> <value>
<tuple> <tuple>
<string>rule</string> <string>rule</string>
<string>_getattr_</string>
<string>context</string> <string>context</string>
<string>movement</string>
<string>_getattr_</string>
<string>parent</string> <string>parent</string>
<string>False</string> <string>False</string>
<string>parent_rule</string> <string>parent_rule</string>
...@@ -150,7 +153,7 @@ return rule.getMatchingCell(context) is not None\n ...@@ -150,7 +153,7 @@ return rule.getMatchingCell(context) is not None\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>InvoiceTransactionRule_test</string> </value> <value> <string>SimulationMovement_testInvoiceTransactionRule</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoicingRule_testParentRulePortalType.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testInvoicingRule.xml
View file @ f4fdfab7
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>parent = context.getParentValue()\n <value> <string>movement = context\n
\n
parent = movement.getParentValue()\n
if parent.getPortalType() == \'Applied Rule\':\n if parent.getPortalType() == \'Applied Rule\':\n
parent_rule = parent.getSpecialiseValue()\n parent_rule = parent.getSpecialiseValue()\n
if parent_rule.getPortalType() in [\'Order Rule\', \'Delivery Rule\']:\n if parent_rule.getPortalType() in [\'Order Rule\', \'Delivery Rule\']:\n
...@@ -120,8 +122,9 @@ return False\n ...@@ -120,8 +122,9 @@ return False\n
<value> <value>
<tuple> <tuple>
<string>rule</string> <string>rule</string>
<string>_getattr_</string>
<string>context</string> <string>context</string>
<string>movement</string>
<string>_getattr_</string>
<string>parent</string> <string>parent</string>
<string>parent_rule</string> <string>parent_rule</string>
<string>True</string> <string>True</string>
...@@ -142,7 +145,7 @@ return False\n ...@@ -142,7 +145,7 @@ return False\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>InvoicingRule_testParentRulePortalType</string> </value> <value> <string>SimulationMovement_testInvoicingRule</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentRule_testMovementId.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SimulationMovement_testPaymentRule.xml
View file @ f4fdfab7
...@@ -65,10 +65,12 @@ ...@@ -65,10 +65,12 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>if context.getId() not in (\'receivable\',):\n <value> <string>movement = context\n
\n
if movement.getId() not in (\'receivable\',):\n
return False\n return False\n
\n \n
parent = context.getParentValue()\n parent = movement.getParentValue()\n
if parent.getPortalType() != \'Applied Rule\':\n if parent.getPortalType() != \'Applied Rule\':\n
return False\n return False\n
\n \n
...@@ -76,8 +78,8 @@ parent_rule = parent.getSpecialiseValue()\n ...@@ -76,8 +78,8 @@ parent_rule = parent.getSpecialiseValue()\n
if parent_rule.getPortalType() not in [\'Invoice Transaction Rule\']:\n if parent_rule.getPortalType() not in [\'Invoice Transaction Rule\']:\n
return False\n return False\n
\n \n
delivery_movement = context.getDeliveryValue()\n delivery_movement = movement.getDeliveryValue()\n
return delivery_movement is None or delivery_movement.getPortalType() in context.getPortalAccountingMovementTypeList()\n return delivery_movement is None or delivery_movement.getPortalType() in movement.getPortalAccountingMovementTypeList()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -127,8 +129,9 @@ return delivery_movement is None or delivery_movement.getPortalType() in context ...@@ -127,8 +129,9 @@ return delivery_movement is None or delivery_movement.getPortalType() in context
<value> <value>
<tuple> <tuple>
<string>rule</string> <string>rule</string>
<string>_getattr_</string>
<string>context</string> <string>context</string>
<string>movement</string>
<string>_getattr_</string>
<string>False</string> <string>False</string>
<string>parent</string> <string>parent</string>
<string>parent_rule</string> <string>parent_rule</string>
...@@ -150,7 +153,7 @@ return delivery_movement is None or delivery_movement.getPortalType() in context ...@@ -150,7 +153,7 @@ return delivery_movement is None or delivery_movement.getPortalType() in context
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>PaymentRule_testMovementId</string> </value> <value> <string>SimulationMovement_testPaymentRule</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
bt5/erp5_accounting/bt/revision
View file @ f4fdfab7
497 498
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7