Commit a252a4c2 authored by Jérome Perrin's avatar Jérome Perrin

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
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>initial_reconciliation</string> </value> <value> <string>select_non_reconcilied_transaction_list</string> </value>
</item> </item>
<item> <item>
<key> <string>permissions</string> </key> <key> <string>permissions</string> </key>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Initial Bank Reconciliation</string> </value> <value> <string>Select Non Reconciled Transactions</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/BankReconciliation_viewInitialBankReconciliationDialog</string> </value> <value> <string>string:${object_url}/BankReconciliation_viewSelectNonReconciledTransactionListDialog</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Message import translateString\n <value> <string>from Products.ERP5Type.Message import translateString\n
context.getPortalObject().portal_workflow.doActionFor(\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> </string> </value>
</item> </item>
<item> <item>
...@@ -61,7 +61,7 @@ context.getPortalObject().portal_workflow.doActionFor(\n ...@@ -61,7 +61,7 @@ context.getPortalObject().portal_workflow.doActionFor(\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>BankReconciliation_notifyInitialReconciliationFinished</string> </value> <value> <string>BankReconciliation_notifySelectNonReconciledFinished</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -57,14 +57,14 @@ tag = script.getId()\n ...@@ -57,14 +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 bank reconciliation already in progress"),})\n keep_items={\'portal_status_message\': translateString("Reconciliation already in progress"),})\n
\n \n
context.activate(tag=tag).BankReconciliation_initialReconciliationActive(tag=tag)\n context.activate(tag=tag).BankReconciliation_selectNonReconciledTransactionListActive(tag=tag)\n
\n \n
context.activate(after_tag=tag, activity=\'SQLQueue\').BankReconciliation_notifyInitialReconciliationFinished()\n context.activate(after_tag=tag, activity=\'SQLQueue\').BankReconciliation_notifySelectNonReconciledFinished()\n
\n \n
return context.Base_redirect(form_id,\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> </string> </value>
</item> </item>
<item> <item>
...@@ -73,7 +73,7 @@ return context.Base_redirect(form_id,\n ...@@ -73,7 +73,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>BankReconciliation_initialReconciliation</string> </value> <value> <string>BankReconciliation_selectNonReconciledTransactionList</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -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("Initial Bank Reconciliation"))\n message=translateString("Select Non Reconciled Transactions"))\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -67,7 +67,7 @@ for line in context.BankReconciliation_getAccountingTransactionLineList():\n ...@@ -67,7 +67,7 @@ for line in context.BankReconciliation_getAccountingTransactionLineList():\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>BankReconciliation_initialReconciliationActive</string> </value> <value> <string>BankReconciliation_selectNonReconciledTransactionListActive</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</item> </item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>BankReconciliation_initialReconciliation</string> </value> <value> <string>BankReconciliation_selectNonReconciledTransactionList</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>BankReconciliation_viewInitialBankReconciliationDialog</string> </value> <value> <string>BankReconciliation_viewSelectNonReconciledTransactionListDialog</string> </value>
</item> </item>
<item> <item>
<key> <string>method</string> </key> <key> <string>method</string> </key>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Initial Bank Reconciliation</string> </value> <value> <string>Select Non Reconciled Transactions</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode_mode</string> </key> <key> <string>unicode_mode</string> </key>
......
...@@ -2,5 +2,5 @@ Bank Reconciliation Module | view ...@@ -2,5 +2,5 @@ Bank Reconciliation Module | view
Bank Reconciliation | bank_reconciliation_export Bank Reconciliation | bank_reconciliation_export
Bank Reconciliation | bank_reconciliation_report Bank Reconciliation | bank_reconciliation_report
Bank Reconciliation | fast_input Bank Reconciliation | fast_input
Bank Reconciliation | initial_reconciliation Bank Reconciliation | select_non_reconcilied_transaction_list
Bank Reconciliation | view Bank Reconciliation | view
\ No newline at end of file
...@@ -464,7 +464,7 @@ class TestBankReconciliation(AccountingTestCase, ERP5ReportTestCase): ...@@ -464,7 +464,7 @@ class TestBankReconciliation(AccountingTestCase, ERP5ReportTestCase):
self.checkLineProperties(data_line_list[0], self.checkLineProperties(data_line_list[0],
debit=200, credit=0) debit=200, credit=0)
def test_BankReconciliation_initialReconciliation(self): def test_BankReconciliation_selectNonReconciled(self):
account_module = self.account_module account_module = self.account_module
payment1 = self._makeOne( payment1 = self._makeOne(
portal_type='Payment Transaction', portal_type='Payment Transaction',
...@@ -496,8 +496,8 @@ class TestBankReconciliation(AccountingTestCase, ERP5ReportTestCase): ...@@ -496,8 +496,8 @@ class TestBankReconciliation(AccountingTestCase, ERP5ReportTestCase):
self.tic() self.tic()
# we can display the dialog without error # we can display the dialog without error
bank_reconciliation.BankReconciliation_viewInitialBankReconciliationDialog() bank_reconciliation.BankReconciliation_viewSelectNonReconciledTransactionListDialog()
bank_reconciliation.BankReconciliation_initialReconciliation() bank_reconciliation.BankReconciliation_selectNonReconciledTransactionList()
self.tic() self.tic()
# All lines with date < stop_date are reconciled # 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