Skip to content

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

make it possible to create reversal transaction at another date, and to create 

them in planned state directly


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38839 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4adf1a19
Hide whitespace changes
Inline Side-by-side
Showing with 573 additions and 33 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createReversalTransactionList.xml
View file @ 30ef4f17
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -84,15 +81,16 @@ tag = \'reversal_creation_%s\' % random.randint(0, 1000)\n ...@@ -84,15 +81,16 @@ tag = \'reversal_creation_%s\' % random.randint(0, 1000)\n
activated = 0\n activated = 0\n
for obj in object_list:\n for obj in object_list:\n
obj = obj.getObject()\n obj = obj.getObject()\n
if obj.getSimulationState() == \'delivered\':\n if countMessage(path=obj.getPath(),\n
if countMessage(path=obj.getPath(),\n method_id=\'AccountingTransaction_createReversalTransaction\'):\n
method_id=\'AccountingTransaction_createReversalTransaction\'):\n raise Redirect, "%s/view?portal_status_message=%s" % (\n
raise Redirect, "%s/view?portal_status_message=%s" % (\n context.absolute_url(), translateString(\n
context.absolute_url(), translateString(\n \'Reversal creation already in progress, abandon.\'))\n
\'Reversal creation already in progress, abandon.\'))\n obj.activate(tag=tag).AccountingTransaction_createReversalTransaction(\n
obj.activate(tag=tag).AccountingTransaction_createReversalTransaction(\n cancellation_amount=cancellation_amount,\n
cancellation_amount=cancellation_amount)\n date=date,\n
activated += 1\n plan=plan)\n
activated += 1\n
\n \n
if not activated:\n if not activated:\n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
...@@ -121,7 +119,7 @@ return context.Base_redirect(form_id,\n ...@@ -121,7 +119,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>cancellation_amount=False, uids=[], listbox_uid=[], selection_name=\'\', form_id=\'view\'</string> </value> <value> <string>cancellation_amount=False, date=None, plan=False, uids=[], listbox_uid=[], selection_name=\'\', form_id=\'view\'</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -141,13 +139,15 @@ return context.Base_redirect(form_id,\n ...@@ -141,13 +139,15 @@ return context.Base_redirect(form_id,\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>5</int> </value> <value> <int>7</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>cancellation_amount</string> <string>cancellation_amount</string>
<string>date</string>
<string>plan</string>
<string>uids</string> <string>uids</string>
<string>listbox_uid</string> <string>listbox_uid</string>
<string>selection_name</string> <string>selection_name</string>
...@@ -187,6 +187,8 @@ return context.Base_redirect(form_id,\n ...@@ -187,6 +187,8 @@ return context.Base_redirect(form_id,\n
<key> <string>func_defaults</string> </key> <key> <string>func_defaults</string> </key>
<value> <value>
<tuple> <tuple>
<int>0</int>
<none/>
<int>0</int> <int>0</int>
<list/> <list/>
<list/> <list/>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateReversalTransactionListDialog.xml
View file @ 30ef4f17
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="ERP5Form" module="Products.ERP5Form.Form"/>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -97,6 +94,8 @@ ...@@ -97,6 +94,8 @@
<value> <value>
<list> <list>
<string>your_cancellation_amount</string> <string>your_cancellation_amount</string>
<string>your_plan</string>
<string>your_date</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateReversalTransactionListDialog/your_date.xml 0 → 100644
View file @ 30ef4f17
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default_now</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default_now</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewCreateReversalTransactionListDialog/your_plan.xml 0 → 100644
View file @ 30ef4f17
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_plan</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Plan the newly created transactions</string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Plan Transactions</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml
View file @ 30ef4f17
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -92,14 +89,20 @@ reversal = accounting_module.newContent (\n ...@@ -92,14 +89,20 @@ reversal = accounting_module.newContent (\n
)\n )\n
\n \n
# copy dates\n # copy dates\n
if context.getStartDate():\n if date:\n
reversal.setStartDate(context.getStartDate())\n start_date = stop_date = date\n
else:\n
start_date = context.getStartDate()\n
stop_date = context.getStopDate()\n
\n
if start_date:\n
reversal.setStartDate(start_date)\n
\n \n
if context.getStopDate() != context.getStartDate():\n if context.getStopDate() != context.getStartDate():\n
# stop date is currently acquire from start date.\n # stop date is currently acquire from start date.\n
# we try not to set a stop date on the reversal if it wasn\'t set on the\n # we try not to set a stop date on the reversal if it wasn\'t set on the\n
# original\n # original\n
reversal.setStopDate(context.getStopDate())\n reversal.setStopDate(stop_date)\n
\n \n
if context.getProperty(\'payment_mode\'):\n if context.getProperty(\'payment_mode\'):\n
reversal.setProperty(\'payment_mode\', context.getProperty(\'payment_mode\'))\n reversal.setProperty(\'payment_mode\', context.getProperty(\'payment_mode\'))\n
...@@ -137,6 +140,9 @@ for line in line_list:\n ...@@ -137,6 +140,9 @@ for line in line_list:\n
if line.getProperty(prop) != context.getProperty(prop):\n if line.getProperty(prop) != context.getProperty(prop):\n
new_line.setProperty(prop, line.getProperty(prop))\n new_line.setProperty(prop, line.getProperty(prop))\n
\n \n
if plan:\n
reversal.plan()\n
\n
return reversal.Base_redirect(\'view\',\n return reversal.Base_redirect(\'view\',\n
keep_items=dict(portal_status_message=\n keep_items=dict(portal_status_message=\n
Base_translateString("Reversal Transaction for ${specific_reference} created.",\n Base_translateString("Reversal Transaction for ${specific_reference} created.",\n
...@@ -151,7 +157,7 @@ return reversal.Base_redirect(\'view\',\n ...@@ -151,7 +157,7 @@ return reversal.Base_redirect(\'view\',\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>cancellation_amount=False</string> </value> <value> <string>cancellation_amount=False, date=None, plan=False</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -171,13 +177,15 @@ return reversal.Base_redirect(\'view\',\n ...@@ -171,13 +177,15 @@ return reversal.Base_redirect(\'view\',\n
<dictionary> <dictionary>
<item> <item>
<key> <string>co_argcount</string> </key> <key> <string>co_argcount</string> </key>
<value> <int>1</int> </value> <value> <int>3</int> </value>
</item> </item>
<item> <item>
<key> <string>co_varnames</string> </key> <key> <string>co_varnames</string> </key>
<value> <value>
<tuple> <tuple>
<string>cancellation_amount</string> <string>cancellation_amount</string>
<string>date</string>
<string>plan</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>Base_translateString</string> <string>Base_translateString</string>
...@@ -187,6 +195,8 @@ return reversal.Base_redirect(\'view\',\n ...@@ -187,6 +195,8 @@ return reversal.Base_redirect(\'view\',\n
<string>causality_value_list</string> <string>causality_value_list</string>
<string>unicode</string> <string>unicode</string>
<string>reversal</string> <string>reversal</string>
<string>start_date</string>
<string>stop_date</string>
<string>line_list</string> <string>line_list</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>line_portal_type</string> <string>line_portal_type</string>
...@@ -208,6 +218,8 @@ return reversal.Base_redirect(\'view\',\n ...@@ -208,6 +218,8 @@ return reversal.Base_redirect(\'view\',\n
<value> <value>
<tuple> <tuple>
<int>0</int> <int>0</int>
<none/>
<int>0</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewCreateReversalTransactionDialog.xml
View file @ 30ef4f17
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <global name="ERP5Form" module="Products.ERP5Form.Form"/>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -97,6 +94,8 @@ ...@@ -97,6 +94,8 @@
<value> <value>
<list> <list>
<string>your_cancellation_amount</string> <string>your_cancellation_amount</string>
<string>your_plan</string>
<string>your_date</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewCreateReversalTransactionDialog/your_date.xml 0 → 100644
View file @ 30ef4f17
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>default_now</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_date</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default_now</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_date</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewCreateReversalTransactionDialog/your_plan.xml 0 → 100644
View file @ 30ef4f17
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_plan</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Plan the newly created transaction</string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Plan Transaction</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/bt/revision
View file @ 30ef4f17
1352 1353
\ 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