Skip to content

erp5
erp5
Commit abe90294 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

grouping reference is now guessed automatically when passing stop transition 

it's removed unconditionnally when passing stopped -> started transition

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23071 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c5bf9fe9
Show whitespace changes
Inline Side-by-side
Showing with 475 additions and 41 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getCausalityGroupedAccountingTransactionList.xml 0 → 100644
View file @ abe90294
<?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>"""Returns the group of accounting transaction related by causality\n
"""\n
portal = context.getPortalObject()\n
accounting_transaction_type_list = \\\n
portal.getPortalAccountingTransactionTypeList()\n
accounting_transaction_set = {}\n
accounting_transaction_set[context] = 1\n
\n
# Add all causality transactions\n
for accounting_transaction in [context] + context.getCausalityValueList(\n
portal_type=accounting_transaction_type_list):\n
accounting_transaction_set[accounting_transaction] = 1\n
for related_causality in accounting_transaction.getCausalityRelatedValueList(\n
portal_type=accounting_transaction_type_list):\n
if related_causality.getSimulationState() not in (\'cancelled\', \'deleted\'):\n
accounting_transaction_set[related_causality] = 1\n
\n
return accounting_transaction_set.keys()\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></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>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
<string>accounting_transaction_type_list</string>
<string>accounting_transaction_set</string>
<string>_write_</string>
<string>_getiter_</string>
<string>accounting_transaction</string>
<string>related_causality</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>AccountingTransaction_getCausalityGroupedAccountingTransactionList</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/guessGroupingReference.xml 0 → 100644
View file @ abe90294
<?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>portal = sci.getPortal()\n
\n
# if we allow grouping with different quantities, we cannot group here\n
# (because the script will group everything)\n
if portal.portal_preferences.getPreference(\n
\'preferred_grouping_with_different_quantities\', 0):\n
return\n
\n
sci[\'object\'].AccountingTransaction_guessGroupedLines()\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>_params</string> </key>
<value> <string>sci</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>sci</string>
<string>_getattr_</string>
<string>portal</string>
<string>_getitem_</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>guessGroupingReference</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/resetGroupingReference.xml
View file @ abe90294
...@@ -65,8 +65,7 @@ ...@@ -65,8 +65,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>"""When transaction is restarted, we\'ll check if we have to break existing\n <value> <string>"""When transaction is restarted, we\'ll break existing grouping references on lines.\n
grouping references on lines.\n
"""\n """\n
transaction = sci[\'object\']\n transaction = sci[\'object\']\n
for line in transaction.getMovementList(\n for line in transaction.getMovementList(\n
...@@ -75,7 +74,7 @@ for line in transaction.getMovementList(\n ...@@ -75,7 +74,7 @@ for line in transaction.getMovementList(\n
line.activate(after_path_and_method_id=(\n line.activate(after_path_and_method_id=(\n
(transaction.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),\n (transaction.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),\n
(line.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),),\n (line.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\')),),\n
).AccountingTransactionLine_resetGroupingReference(keep_if_valid_group=1)\n ).AccountingTransactionLine_resetGroupingReference()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/states/stopped.xml
View file @ abe90294
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
<string>cancel_accounting_action</string> <string>cancel_accounting_action</string>
<string>deliver</string> <string>deliver</string>
<string>deliver_action</string> <string>deliver_action</string>
<string>restart</string>
<string>restart_action</string> <string>restart_action</string>
<string>start</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/restart.xml 0 → 100644
View file @ abe90294
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value> <string>resetGroupingReference</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Go back to started state, and remove existing grouping references on this transaction and other related.</string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>restart</string> </value>
</item>
<item>
<key> <string>new_state_id</string> </key>
<value> <string>started</string> </value>
</item>
<item>
<key> <string>script_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/restart_action.xml
View file @ abe90294
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</item> </item>
<item> <item>
<key> <string>after_script_name</string> </key> <key> <string>after_script_name</string> </key>
<value> <string>start</string> </value> <value> <string>restart</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/stop.xml
View file @ abe90294
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</item> </item>
<item> <item>
<key> <string>after_script_name</string> </key> <key> <string>after_script_name</string> </key>
<value> <string>resetGroupingReference</string> </value> <value> <string>guessGroupingReference</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
......
bt5/erp5_accounting/bt/revision
View file @ abe90294
734 735
\ No newline at end of file \ No newline at end of file
product/ERP5/tests/testAccounting.py
View file @ abe90294
...@@ -2068,8 +2068,7 @@ class TestTransactions(AccountingTestCase): ...@@ -2068,8 +2068,7 @@ class TestTransactions(AccountingTestCase):
self.failUnless(other_section_line.getGroupingReference()) self.failUnless(other_section_line.getGroupingReference())
self.failUnless(other_letter_line.getGroupingReference()) self.failUnless(other_letter_line.getGroupingReference())
def test_automatically_setting_grouping_reference(self):
def test_ResetGroupingReferenceAfterRestart(self):
invoice = self._makeOne( invoice = self._makeOne(
title='First Invoice', title='First Invoice',
destination_section_value=self.organisation_module.client_1, destination_section_value=self.organisation_module.client_1,
...@@ -2077,60 +2076,109 @@ class TestTransactions(AccountingTestCase): ...@@ -2077,60 +2076,109 @@ class TestTransactions(AccountingTestCase):
source_debit=100), source_debit=100),
dict(source_value=self.account_module.receivable, dict(source_value=self.account_module.receivable,
source_credit=100, source_credit=100,
id='line_with_grouping_reference', id='line_for_grouping_reference',)))
grouping_reference='A'),)) invoice_line = invoice.line_for_grouping_reference
invoice_line = invoice.line_with_grouping_reference
payment = self._makeOne( payment = self._makeOne(
title='First Invoice Payment', title='First Invoice Payment',
portal_type='Payment Transaction', portal_type='Payment Transaction',
simulation_state='delivered', simulation_state='delivered',
causality_value=invoice,
source_payment_value=self.section.newContent( source_payment_value=self.section.newContent(
portal_type='Bank Account'), portal_type='Bank Account'),
destination_section_value=self.organisation_module.client_1, destination_section_value=self.organisation_module.client_1,
lines=(dict(source_value=self.account_module.receivable, lines=(dict(source_value=self.account_module.receivable,
id='line_with_grouping_reference', id='line_for_grouping_reference',
grouping_reference='A',
source_debit=100), source_debit=100),
dict(source_value=self.account_module.bank, dict(source_value=self.account_module.bank,
source_credit=100,))) source_credit=100,)))
payment_line = payment.line_with_grouping_reference payment_line = payment.line_for_grouping_reference
invoice.stop()
self.portal.portal_workflow.doActionFor(invoice, 'restart_action') self.failIf(invoice_line.getGroupingReference())
get_transaction().commit() self.failIf(payment_line.getGroupingReference())
self.tic()
self.portal.portal_workflow.doActionFor(invoice, 'stop_action') # lines match, they are automatically grouped
get_transaction().commit() invoice.stop()
self.tic()
# we still have a grouping reference at this point, because the line was
# not modified, so the group is still valid
self.failUnless(invoice_line.getGroupingReference()) self.failUnless(invoice_line.getGroupingReference())
self.failUnless(payment_line.getGroupingReference()) self.failUnless(payment_line.getGroupingReference())
self.portal.portal_workflow.doActionFor(invoice, 'restart_action') # when restarting, grouping is removed
invoice.restart()
get_transaction().commit() get_transaction().commit()
self.tic() self.tic()
# try again, after modifying lines. self.failIf(invoice_line.getGroupingReference())
for line in invoice.getMovementList(): self.failIf(payment_line.getGroupingReference())
line.setQuantity(line.getQuantity() * 1.5) invoice.stop()
# Now the group is no longer valid, so passing stop transaction again will
# ungroup lines.
self.portal.portal_workflow.doActionFor(invoice, 'stop_action')
# this is done with activities, because we need an up to date catalog to
# check if the group is still valid, so we do this in an activity after
# this document indexing.
self.failUnless(invoice_line.getGroupingReference()) self.failUnless(invoice_line.getGroupingReference())
self.failUnless(payment_line.getGroupingReference()) self.failUnless(payment_line.getGroupingReference())
# after activities invocation, grouping references have been removed def test_automatically_setting_grouping_reference_only_related(self):
get_transaction().commit() invoice = self._makeOne(
self.tic() title='First Invoice',
destination_section_value=self.organisation_module.client_1,
lines=(dict(source_value=self.account_module.goods_purchase,
source_debit=100),
dict(source_value=self.account_module.receivable,
source_credit=100,
id='line_for_grouping_reference',)))
invoice_line = invoice.line_for_grouping_reference
payment = self._makeOne(
title='First Invoice Payment',
portal_type='Payment Transaction',
simulation_state='delivered',
# payment is not related with invoice, so no automatic grouping
# will occur
source_payment_value=self.section.newContent(
portal_type='Bank Account'),
destination_section_value=self.organisation_module.client_1,
lines=(dict(source_value=self.account_module.receivable,
id='line_for_grouping_reference',
source_debit=100),
dict(source_value=self.account_module.bank,
source_credit=100,)))
payment_line = payment.line_for_grouping_reference
self.failIf(invoice_line.getGroupingReference())
self.failIf(payment_line.getGroupingReference())
invoice.stop()
self.failIf(invoice_line.getGroupingReference()) self.failIf(invoice_line.getGroupingReference())
self.failIf(payment_line.getGroupingReference()) self.failIf(payment_line.getGroupingReference())
def test_automatically_setting_grouping_reference_same_section(self):
invoice = self._makeOne(
title='First Invoice',
destination_section_value=self.organisation_module.client_1,
lines=(dict(source_value=self.account_module.goods_purchase,
source_debit=100),
dict(source_value=self.account_module.receivable,
source_credit=100,
id='line_for_grouping_reference',)))
invoice_line = invoice.line_for_grouping_reference
payment = self._makeOne(
title='First Invoice Payment',
portal_type='Payment Transaction',
simulation_state='delivered',
causality_value=invoice,
source_payment_value=self.section.newContent(
portal_type='Bank Account'),
destination_section_value=self.organisation_module.client_2,
lines=(dict(source_value=self.account_module.receivable,
id='line_for_grouping_reference',
source_debit=100),
dict(source_value=self.account_module.bank,
source_credit=100,)))
payment_line = payment.line_for_grouping_reference
self.failIf(invoice_line.getGroupingReference())
self.failIf(payment_line.getGroupingReference())
# different sections, no grouping
invoice.stop()
self.failIf(invoice_line.getGroupingReference())
self.failIf(payment_line.getGroupingReference())
class TestAccountingWithSequences(ERP5TypeTestCase): class TestAccountingWithSequences(ERP5TypeTestCase):
......
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