[Erp5-report] r23222 - in /erp5/trunk/bt5/erp5_accounting_ui_test: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 28 13:22:13 CEST 2008
Author: jerome
Date: Thu Aug 28 13:22:06 2008
New Revision: 23222
URL: http://svn.erp5.org?rev=23222&view=rev
Log:
add an new parameter to keep automatically generated grouping reference, and set it to false for compatibility with previous behaviour
Modified:
erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml
erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml?rev=23222&r1=23221&r2=23222&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionList.xml Thu Aug 28 13:22:06 2008
@@ -258,9 +258,19 @@
if transaction_state == \'validated\':\n
payment.stop()\n
assert payment.getSimulationState() == \'stopped\'\n
+ if not keep_grouping_reference:\n
+ for line in payment.getMovementList(\n
+ portal_type=payment.getPortalAccountingMovementTypeList()):\n
+ if line.getGroupingReference():\n
+ line.activate(after_path_and_method_id=(\n
+ (payment.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),\n
+ (line.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),),\n
+ ).AccountingTransactionLine_resetGroupingReference()\n
+\n
else:\n
# other cases not supported for now\n
assert transaction_state == \'draft\'\n
+ \n
\n
amount=7000\n
default_date += 1\n
@@ -344,7 +354,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>month_count=1, add_draft_transactions=1, transaction_state=\'validated\', add_related_payments=0</string> </value>
+ <value> <string>month_count=1, add_draft_transactions=1, transaction_state=\'validated\', add_related_payments=0, keep_grouping_reference=0</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -364,7 +374,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>4</int> </value>
+ <value> <int>5</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -374,6 +384,7 @@
<string>add_draft_transactions</string>
<string>transaction_state</string>
<string>add_related_payments</string>
+ <string>keep_grouping_reference</string>
<string>DateTime</string>
<string>section_title</string>
<string>_getattr_</string>
@@ -430,6 +441,7 @@
<int>1</int>
<string>validated</string>
<int>0</int>
+ <int>0</int>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml?rev=23222&r1=23221&r2=23222&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml (original)
+++ erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_createAccountingTransactionListSalesAndPayments.xml Thu Aug 28 13:22:06 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PythonScripts.PythonScript</string>
- <string>PythonScript</string>
- </tuple>
- <none/>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -195,6 +192,16 @@
)\n
ptr.stop()\n
\n
+ if not keep_grouping_reference:\n
+ for line in ptr.getMovementList(\n
+ portal_type=ptr.getPortalAccountingMovementTypeList()):\n
+ if line.getGroupingReference():\n
+ line.activate(after_path_and_method_id=(\n
+ (ptr.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),\n
+ (line.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),),\n
+ ).AccountingTransactionLine_resetGroupingReference()\n
+\n
+\n
accounting_module.setProperty(\'current_content_script\',\n
current_script_data_id)\n
\n
@@ -225,7 +232,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>month_count=1, no_creation_need=0</string> </value>
+ <value> <string>month_count=1, no_creation_need=0, keep_grouping_reference=0</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -245,7 +252,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>2</int> </value>
+ <value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -253,6 +260,7 @@
<tuple>
<string>month_count</string>
<string>no_creation_need</string>
+ <string>keep_grouping_reference</string>
<string>DateTime</string>
<string>section_title</string>
<string>_getattr_</string>
@@ -282,7 +290,9 @@
<string>client_title</string>
<string>amount</string>
<string>receivable_qty</string>
+ <string>_inplacevar_</string>
<string>ptr</string>
+ <string>line</string>
</tuple>
</value>
</item>
@@ -297,6 +307,7 @@
<tuple>
<int>1</int>
<int>0</int>
+ <int>0</int>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision?rev=23222&r1=23221&r2=23222&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision Thu Aug 28 13:22:06 2008
@@ -1,1 +1,1 @@
-95
+96
More information about the Erp5-report
mailing list