From 1c687c8d4ac491da21b9f36acd0c6998ee6ddfe2 Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Wed, 9 Apr 2014 10:47:47 +0200 Subject: [PATCH 1/2] [IMP] correct/add reference field in financial reports --- .../account_report_general_ledger.mako | 18 +++++++++++------ .../account_report_partners_ledger.mako | 20 +++++++++++++------ ..._by_curr_open_invoices_inclusion.mako.html | 20 ++++++++++--------- .../open_invoices_inclusion.mako.html | 20 ++++++++++--------- 4 files changed, 48 insertions(+), 30 deletions(-) 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 9f4ed253..4dcacbd5 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 @@ -82,7 +82,7 @@ cumul_balance_curr = 0.0 %>
- + @@ -93,15 +93,17 @@ ## period
${_('Period')}
## move -
${_('Entry')}
+
${_('Entry')}
## journal
${_('Journal')}
## account code
${_('Account')}
## partner -
${_('Partner')}
+
${_('Partner')}
+ ## move reference +
${_('Reference')}
## label -
${_('Label')}
+
${_('Label')}
## counterpart
${_('Counter part')}
## debit @@ -140,6 +142,8 @@
## partner
+ ## move reference +
## label
${_('Initial Balance')}
## counterpart @@ -184,6 +188,8 @@
${account.code}
## partner
${line.get('partner_name') or ''}
+ ## move reference +
${line.get('lref') or ''}
## label
${label}
## counterpart @@ -206,8 +212,8 @@
## date -
${account.code} - ${account.name}
-
${_("Cumulated Balance on Account")}
+
${account.code} - ${account.name}
+
${_("Cumulated Balance on Account")}
## debit
${ formatLang(cumul_debit) | amount }
## credit diff --git a/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako b/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako index 3ffac978..122964a9 100644 --- a/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako +++ b/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako @@ -67,7 +67,7 @@
${ initial_balance_text[initial_balance_mode] }
- + %for account in objects: %if account.ledger_lines or account.init_balance: <% @@ -102,13 +102,15 @@ ## period
${_('Period')}
## move -
${_('Entry')}
+
${_('Entry')}
## journal
${_('Journal')}
## partner -
${_('Partner')}
+
${_('Partner')}
+ ## move reference +
${_('Reference')}
## label -
${_('Label')}
+
${_('Label')}
## reconcile
${_('Rec.')}
## debit @@ -150,6 +152,8 @@
## partner
+ ## move reference +
## label
${_('Initial Balance')}
## reconcile @@ -191,6 +195,8 @@
${line.get('jcode') or ''}
## partner
${line.get('partner_name') or ''}
+ ## move reference +
${line.get('lref') or ''}
## label
${label}
## reconcile @@ -221,6 +227,8 @@
## partner
+ ## move reference +
## label
${_('Cumulated Balance on Partner')}
## reconcile @@ -254,9 +262,9 @@
-
${account.code} - ${account.name}
+
${account.code} - ${account.name}
## label -
${_("Cumulated Balance on Account")}
+
${_("Cumulated Balance on Account")}
## debit
${ formatLang(account_total_debit) | amount }
## credit diff --git a/account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html b/account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html index 06610acf..91c49e47 100644 --- a/account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html +++ b/account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html @@ -10,8 +10,8 @@ %for partner_name, p_id, p_ref, p_name in account.partners_order: - - + + %for curr, grouped_lines in account.grouped_ledger_lines.get(p_id, []): <% @@ -21,7 +21,7 @@ cumul_balance_curr = 0.0 part_cumul_balance = 0.0 - part_cumul_balance_curr = 0.0 + part_cumul_balance_curr = 0.0 %>