From bf7315decfe01f15b06435a0058c1b3cf1f19bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Wed, 20 Jun 2012 16:10:01 +0200 Subject: [PATCH] [MRG] Add all the bank statement improvements that we made. This is mostly based on : account_statement_ext -> provide profile per bank statement, remove period, choose to use balance check or not,... account_statement_base_completion -> provide a completion rule system to fullfill the bank statement (partner, account,...) account_statement_base_import -> provide a base to create your own file parser for each bank/office and link it to a profile account_statement_transactionid_completion and account_statement_transactionid_import to use the transaction ID recorded in th SO account_advanced_reconcile -> An advanced way to setup reconciliation rules on every account account_financial_report_webkit -> some little fixes (lp:c2c-addons/6.1 rev 63) --- .../report/common_partner_reports.py | 2 +- .../templates/account_report_general_ledger.mako | 8 +++++++- .../templates/account_report_partner_balance.mako | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/account_financial_report_webkit/report/common_partner_reports.py b/account_financial_report_webkit/report/common_partner_reports.py index 5ebd36c3..a6c2d8d8 100644 --- a/account_financial_report_webkit/report/common_partner_reports.py +++ b/account_financial_report_webkit/report/common_partner_reports.py @@ -238,7 +238,7 @@ class CommonPartnersReportHeaderWebkit(CommonReportHeaderWebkit): if existing_partner_ids: # We may use orm here as the performance optimization is not that big sql = ("SELECT name|| ' ' ||CASE WHEN ref IS NOT NULL THEN '('||ref||')' ELSE '' END, id, ref, name" - " FROM res_partner WHERE id IN %s ORDER BY name, ref") + " FROM res_partner WHERE id IN %s ORDER BY LOWER(name), ref") self.cursor.execute(sql, (tuple(set(existing_partner_ids)),)) res = self.cursor.fetchall() diff --git a/account_financial_report_webkit/report/templates/account_report_general_ledger.mako b/account_financial_report_webkit/report/templates/account_report_general_ledger.mako index df819cb4..6ed7b4a5 100644 --- a/account_financial_report_webkit/report/templates/account_report_general_ledger.mako +++ b/account_financial_report_webkit/report/templates/account_report_general_ledger.mako @@ -95,10 +95,12 @@
${_('Entry')}
## journal
${_('Journal')}
+ ## account code +
${_('Account')}
## partner
${_('Partner')}
## label -
${_('Label')}
+
${_('Label')}
## counterpart
${_('Counter part')}
## debit @@ -133,6 +135,8 @@
## journal
+ ## account code +
## partner
## label @@ -175,6 +179,8 @@
${line.get('move_name') or ''}
## journal
${line.get('jcode') or ''}
+ ## account code +
${account.code}
## partner
${line.get('partner_name') or ''}
## label diff --git a/account_financial_report_webkit/report/templates/account_report_partner_balance.mako b/account_financial_report_webkit/report/templates/account_report_partner_balance.mako index 31b18fca..89112c34 100644 --- a/account_financial_report_webkit/report/templates/account_report_partner_balance.mako +++ b/account_financial_report_webkit/report/templates/account_report_partner_balance.mako @@ -132,10 +132,10 @@
- ## code -
${_('Code / Ref')}
## account name
${_('Account / Partner Name')}
+ ## code +
${_('Code / Ref')}
%if comparison_mode == 'no_comparison': %if initial_balance_mode: ## initial balance @@ -188,8 +188,8 @@ total_balance += partner.get('balance', 0.0) %>
-
${partner_ref if partner_ref else ''}
${partner_name if partner_name else _('Unallocated') }
+
${partner_ref if partner_ref else ''}
%if comparison_mode == 'no_comparison': %if initial_balance_mode:
${formatLang(partner.get('init_balance', 0.0)) | amount}
@@ -229,10 +229,10 @@
- ## code -
${current_account.code}
## account name
${current_account.name}
+ ## code +
${current_account.code}
%if comparison_mode == 'no_comparison': %if initial_balance_mode: ## opening balance