Skip to content

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

Bank Reconciliation: use consistent terms 

Also improve notification for initial bank reconciliation and remove a field that should never have been used
parent 63ecfaf7
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 126 deletions
bt5/erp5_bank_reconciliation/PropertySheetTemplateItem/portal_property_sheets/BankReconciliationConstraint/date_coherency_constraint.xml
View file @ 3e2c0eb8
...@@ -69,7 +69,7 @@ python: object.getStopDate() >= object.getStartDate() ...@@ -69,7 +69,7 @@ python: object.getStopDate() >= object.getStartDate()
</item> </item>
<item> <item>
<key> <string>message_expression_false</string> </key> <key> <string>message_expression_false</string> </key>
<value> <string>Bank statement start date must be after previous bank statement date</string> </value> <value> <string>Bank statement date must be after previous bank statement date</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
......
bt5/erp5_bank_reconciliation/PropertySheetTemplateItem/portal_property_sheets/BankReconciliationConstraint/quantity_range_max_constraint.xml
View file @ 3e2c0eb8
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</item> </item>
<item> <item>
<key> <string>message_no_such_property</string> </key> <key> <string>message_no_such_property</string> </key>
<value> <string>Bank Statement balance must be defined</string> </value> <value> <string>Bank statement balance must be defined</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
......
bt5/erp5_bank_reconciliation/PropertySheetTemplateItem/portal_property_sheets/BankReconciliationConstraint/stop_date_constraint.xml
View file @ 3e2c0eb8
...@@ -12,6 +12,23 @@ ...@@ -12,6 +12,23 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>message_property_not_set</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item> <item>
<key> <string>_range_criterion</string> </key> <key> <string>_range_criterion</string> </key>
<value> <value>
...@@ -36,7 +53,11 @@ ...@@ -36,7 +53,11 @@
</item> </item>
<item> <item>
<key> <string>message_no_such_property</string> </key> <key> <string>message_no_such_property</string> </key>
<value> <string>Bank Statement date must be defined</string> </value> <value> <string>Bank statement date must be defined</string> </value>
</item>
<item>
<key> <string>message_property_not_set</string> </key>
<value> <string>Bank statement date must be defined</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliation.xml
View file @ 3e2c0eb8
...@@ -57,15 +57,14 @@ tag = script.getId()\n ...@@ -57,15 +57,14 @@ tag = script.getId()\n
context.serialize()\n context.serialize()\n
if context.getPortalObject().portal_activities.countMessageWithTag(tag):\n if context.getPortalObject().portal_activities.countMessageWithTag(tag):\n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
keep_items={\'portal_status_message\': translateString("Initial Reconciliation already in progress"),})\n keep_items={\'portal_status_message\': translateString("Initial reconciliation already in progress"),})\n
\n \n
context.activate(tag=tag).BankReconciliation_initialReconciliationActive(tag=tag)\n context.activate(tag=tag).BankReconciliation_initialReconciliationActive(tag=tag)\n
\n \n
# Activate a dummy activity so that the user see something is still going on for this bank reconciliation\n context.activate(after_tag=tag, activity=\'SQLQueue\').BankReconciliation_notifyInitialReconciliationFinished()\n
context.activate(after_tag=tag, activity=\'SQLQueue\').getId()\n
\n \n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
keep_items={\'portal_status_message\': translateString("Initial Reconciliation in progress"),})\n keep_items={\'portal_status_message\': translateString("Initial reconciliation in progress"),})\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliationActive.xml
View file @ 3e2c0eb8
...@@ -58,7 +58,7 @@ context.getPortalObject().setPlacelessDefaultReindexParameters(activate_kw=dict( ...@@ -58,7 +58,7 @@ context.getPortalObject().setPlacelessDefaultReindexParameters(activate_kw=dict(
# At the moment we cannot use searchAndActivate from Inventory API query\n # At the moment we cannot use searchAndActivate from Inventory API query\n
for line in context.BankReconciliation_getAccountingTransactionLineList():\n for line in context.BankReconciliation_getAccountingTransactionLineList():\n
line.AccountingTransactionLine_setBankReconciliation(context, \n line.AccountingTransactionLine_setBankReconciliation(context, \n
message=translateString("Initila Reconciliation"))\n message=translateString("Initial Bank Reconciliation"))\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifyInitialReconciliationFinished.xml 0 → 100644
View file @ 3e2c0eb8
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </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>from Products.ERP5Type.Message import translateString\n
context.getPortalObject().portal_workflow.doActionFor(\n
context, \'edit_action\', comment=translateString(\'Initial bank reconciliation finished\'))\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BankReconciliation_notifyInitialReconciliationFinished</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewBankReconciliationFastInputDialog.xml
View file @ 3e2c0eb8
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
<value> <value>
<list> <list>
<string>your_account_balance</string> <string>your_account_balance</string>
<string>your_reconciling</string>
<string>your_reconciled_balance</string> <string>your_reconciled_balance</string>
<string>my_quantity_range_max</string> <string>my_quantity_range_max</string>
</list> </list>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewBankReconciliationFastInputDialog/my_stop_date.xml
View file @ 3e2c0eb8
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Statement Date</string> </value> <value> <string>Bank Statement Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewBankReconciliationFastInputDialog/your_mode.xml
View file @ 3e2c0eb8
...@@ -58,14 +58,28 @@ ...@@ -58,14 +58,28 @@
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -114,4 +128,17 @@ ...@@ -114,4 +128,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(context.Base_translateString(x[0]), x[1]) for x in field.get_orig_value(\'items\')]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewBankReconciliationFastInputDialog/your_reconciling.xml deleted 100644 → 0
View file @ 63ecfaf7
<?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</string>
<string>editable</string>
<string>enabled</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_reconciling</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</string> </key>
<value> <string>0</string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_money_quantity</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>
<item>
<key> <string>title</string> </key>
<value> <string>Amount Beeing Reconciled</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/my_start_date.xml
View file @ 3e2c0eb8
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Statement Date</string> </value> <value> <string>Bank Statement Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_bank_reconciliation/WorkflowTemplateItem/portal_workflow/bank_reconciliation_validation_workflow/transitions/close.xml
View file @ 3e2c0eb8
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Close</string> </value> <value> <string>Close Bank Reconciliation</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_bank_reconciliation/WorkflowTemplateItem/portal_workflow/bank_reconciliation_validation_workflow/transitions/close_action.xml
View file @ 3e2c0eb8
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Close</string> </value> <value> <string>Close Bank Reconciliation</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
bt5/erp5_bank_reconciliation/WorkflowTemplateItem/portal_workflow/bank_reconciliation_validation_workflow/transitions/open.xml
View file @ 3e2c0eb8
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Open</string> </value> <value> <string>Open Bank Reconciliation</string> </value>
</item> </item>
<item> <item>
<key> <string>trigger_type</string> </key> <key> <string>trigger_type</string> </key>
......
bt5/erp5_bank_reconciliation/WorkflowTemplateItem/portal_workflow/bank_reconciliation_validation_workflow/transitions/open_action.xml
View file @ 3e2c0eb8
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Open</string> </value> <value> <string>Open Bank Reconciliation</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
......
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