From a252a4c2644a44e2c73a74f8bb3fda86e084ebe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 6 Feb 2015 15:24:44 +0100
Subject: [PATCH] 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"
---
...xml => select_non_reconcilied_transaction_list.xml} | 6 +++---
...conciliation_notifySelectNonReconciledFinished.xml} | 4 ++--
...onciliation_selectNonReconciledTransactionList.xml} | 10 +++++-----
...ation_selectNonReconciledTransactionListActive.xml} | 4 ++--
...n_viewSelectNonReconciledTransactionListDialog.xml} | 6 +++---
.../my_quantity.xml | 0
.../my_stop_date.xml | 0
.../your_account_balance.xml | 0
.../bt/template_action_path_list | 2 +-
product/ERP5/tests/testBankReconciliation.py | 6 +++---
10 files changed, 19 insertions(+), 19 deletions(-)
rename bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/{initial_reconciliation.xml => select_non_reconcilied_transaction_list.xml} (92%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_notifyInitialReconciliationFinished.xml => BankReconciliation_notifySelectNonReconciledFinished.xml} (92%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_initialReconciliation.xml => BankReconciliation_selectNonReconciledTransactionList.xml} (89%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_initialReconciliationActive.xml => BankReconciliation_selectNonReconciledTransactionListActive.xml} (93%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_viewInitialBankReconciliationDialog.xml => BankReconciliation_viewSelectNonReconciledTransactionListDialog.xml} (94%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_viewInitialBankReconciliationDialog => BankReconciliation_viewSelectNonReconciledTransactionListDialog}/my_quantity.xml (100%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_viewInitialBankReconciliationDialog => BankReconciliation_viewSelectNonReconciledTransactionListDialog}/my_stop_date.xml (100%)
rename bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/{BankReconciliation_viewInitialBankReconciliationDialog => BankReconciliation_viewSelectNonReconciledTransactionListDialog}/your_account_balance.xml (100%)
diff --git a/bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/initial_reconciliation.xml b/bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/select_non_reconcilied_transaction_list.xml
similarity index 92%
rename from bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/initial_reconciliation.xml
rename to bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/select_non_reconcilied_transaction_list.xml
index 060d711d22..2eb8579117 100644
--- a/bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/initial_reconciliation.xml
+++ b/bt5/erp5_bank_reconciliation/ActionTemplateItem/portal_types/Bank%20Reconciliation/select_non_reconcilied_transaction_list.xml
@@ -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>
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifyInitialReconciliationFinished.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifySelectNonReconciledFinished.xml
similarity index 92%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifyInitialReconciliationFinished.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifySelectNonReconciledFinished.xml
index c4937bc8b7..59698eb51d 100644
--- a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifyInitialReconciliationFinished.xml
+++ b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_notifySelectNonReconciledFinished.xml
@@ -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>
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliation.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionList.xml
similarity index 89%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliation.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionList.xml
index 9b5865ae74..526614bcec 100644
--- a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliation.xml
+++ b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionList.xml
@@ -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>
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliationActive.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionListActive.xml
similarity index 93%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliationActive.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionListActive.xml
index e5a5e0bee1..eb3d33105a 100644
--- a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_initialReconciliationActive.xml
+++ b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_selectNonReconciledTransactionListActive.xml
@@ -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>
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog.xml
similarity index 94%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog.xml
index 4a5617dccb..d0d7606720 100644
--- a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog.xml
+++ b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog.xml
@@ -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>
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/my_quantity.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog/my_quantity.xml
similarity index 100%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/my_quantity.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog/my_quantity.xml
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/my_stop_date.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog/my_stop_date.xml
similarity index 100%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/my_stop_date.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog/my_stop_date.xml
diff --git a/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/your_account_balance.xml b/bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog/your_account_balance.xml
similarity index 100%
rename from bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewInitialBankReconciliationDialog/your_account_balance.xml
rename to bt5/erp5_bank_reconciliation/SkinTemplateItem/portal_skins/erp5_bank_reconciliation/BankReconciliation_viewSelectNonReconciledTransactionListDialog/your_account_balance.xml
diff --git a/bt5/erp5_bank_reconciliation/bt/template_action_path_list b/bt5/erp5_bank_reconciliation/bt/template_action_path_list
index adcf2d8d09..ea41576d16 100644
--- a/bt5/erp5_bank_reconciliation/bt/template_action_path_list
+++ b/bt5/erp5_bank_reconciliation/bt/template_action_path_list
@@ -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
diff --git a/product/ERP5/tests/testBankReconciliation.py b/product/ERP5/tests/testBankReconciliation.py
index 8ba29680de..ef0c5eae65 100644
--- a/product/ERP5/tests/testBankReconciliation.py
+++ b/product/ERP5/tests/testBankReconciliation.py
@@ -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
--
2.30.9