Skip to content

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

Bank Reconciliation: rename "initial banking reconciliation" to something less confusing 

This action just associates all transactions that are not reconciled and there is no such thing as "initial banking reconciliation"
parent 5fd0ed6d
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/initial_reconciliation.xml → bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/select_non_reconcilied_transaction_list.xml
View file @ a252a4c2
......@@ -42,7 +42,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>initial_reconciliation</string> </value>
<value> <string>select_non_reconcilied_transaction_list</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Initial Bank Reconciliation</string> </value>
<value> <string>Select Non Reconciled Transactions</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -79,7 +79,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/BankReconciliation_viewInitialBankReconciliationDialog</string> </value>
<value> <string>string:${object_url}/BankReconciliation_viewSelectNonReconciledTransactionListDialog</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifyInitialReconciliationFinished.xml → bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifySelectNonReconciledFinished.xml
View file @ a252a4c2
......@@ -52,7 +52,7 @@
<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
context, \'edit_action\', comment=translateString(\'Select non reconciled transcations finished\'))\n
</string> </value>
</item>
<item>
......@@ -61,7 +61,7 @@ context.getPortalObject().portal_workflow.doActionFor(\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BankReconciliation_notifyInitialReconciliationFinished</string> </value>
<value> <string>BankReconciliation_notifySelectNonReconciledFinished</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliation.xml → bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionList.xml
View file @ a252a4c2
......@@ -57,14 +57,14 @@ tag = script.getId()\n
context.serialize()\n
if context.getPortalObject().portal_activities.countMessageWithTag(tag):\n
return context.Base_redirect(form_id,\n
keep_items={\'portal_status_message\': translateString("Initial bank reconciliation already in progress"),})\n
keep_items={\'portal_status_message\': translateString("Reconciliation already in progress"),})\n
\n
context.activate(tag=tag).BankReconciliation_initialReconciliationActive(tag=tag)\n
context.activate(tag=tag).BankReconciliation_selectNonReconciledTransactionListActive(tag=tag)\n
\n
context.activate(after_tag=tag, activity=\'SQLQueue\').BankReconciliation_notifyInitialReconciliationFinished()\n
context.activate(after_tag=tag, activity=\'SQLQueue\').BankReconciliation_notifySelectNonReconciledFinished()\n
\n
return context.Base_redirect(form_id,\n
keep_items={\'portal_status_message\': translateString("Initial bank reconciliation in progress"),})\n
keep_items={\'portal_status_message\': translateString("Reconciliation in progress"),})\n
</string> </value>
</item>
<item>
......@@ -73,7 +73,7 @@ return context.Base_redirect(form_id,\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BankReconciliation_initialReconciliation</string> </value>
<value> <string>BankReconciliation_selectNonReconciledTransactionList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliationActive.xml → bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionListActive.xml
View file @ a252a4c2
......@@ -58,7 +58,7 @@ context.getPortalObject().setPlacelessDefaultReindexParameters(activate_kw=dict(
# At the moment we cannot use searchAndActivate from Inventory API query\n
for line in context.BankReconciliation_getAccountingTransactionLineList():\n
line.AccountingTransactionLine_setBankReconciliation(context, \n
message=translateString("Initial Bank Reconciliation"))\n
message=translateString("Select Non Reconciled Transactions"))\n
</string> </value>
</item>
<item>
......@@ -67,7 +67,7 @@ for line in context.BankReconciliation_getAccountingTransactionLineList():\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BankReconciliation_initialReconciliationActive</string> </value>
<value> <string>BankReconciliation_selectNonReconciledTransactionListActive</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog.xml → bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog.xml
View file @ a252a4c2
......@@ -35,7 +35,7 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string>BankReconciliation_initialReconciliation</string> </value>
<value> <string>BankReconciliation_selectNonReconciledTransactionList</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -111,7 +111,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BankReconciliation_viewInitialBankReconciliationDialog</string> </value>
<value> <string>BankReconciliation_viewSelectNonReconciledTransactionListDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -135,7 +135,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Initial Bank Reconciliation</string> </value>
<value> <string>Select Non Reconciled Transactions</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
bt5/erp5_bank_reconciliation/bt/template_action_path_list
View file @ a252a4c2
......@@ -2,5 +2,5 @@ Bank Reconciliation Module | view
Bank Reconciliation | bank_reconciliation_export
Bank Reconciliation | bank_reconciliation_report
Bank Reconciliation | fast_input
Bank Reconciliation | initial_reconciliation
Bank Reconciliation | select_non_reconcilied_transaction_list
Bank Reconciliation | view
\ No newline at end of file
product/ERP5/tests/testBankReconciliation.py
View file @ a252a4c2
......@@ -464,7 +464,7 @@ class TestBankReconciliation(AccountingTestCase, ERP5ReportTestCase):
self.checkLineProperties(data_line_list[0],
debit=200, credit=0)
def test_BankReconciliation_initialReconciliation(self):
def test_BankReconciliation_selectNonReconciled(self):
account_module = self.account_module
payment1 = self._makeOne(
portal_type='Payment Transaction',
......@@ -496,8 +496,8 @@ class TestBankReconciliation(AccountingTestCase, ERP5ReportTestCase):
self.tic()
# we can display the dialog without error
bank_reconciliation.BankReconciliation_viewInitialBankReconciliationDialog()
bank_reconciliation.BankReconciliation_initialReconciliation()
bank_reconciliation.BankReconciliation_viewSelectNonReconciledTransactionListDialog()
bank_reconciliation.BankReconciliation_selectNonReconciledTransactionList()
self.tic()
# All lines with date < stop_date are reconciled
......
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