From 1ed1b957a0bb0616b41c52d489ddff3f99dbb87d Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Mon, 14 Jul 2014 16:39:58 -0400 Subject: [PATCH] [FIX] debit and credit where reversed --- .../report/detailed_reconciliation.mako | 8 ++++---- .../report/summary_reconciliation.mako | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/npg_bank_account_reconciliation/report/detailed_reconciliation.mako b/npg_bank_account_reconciliation/report/detailed_reconciliation.mako index cf221def4..4f2a4697e 100644 --- a/npg_bank_account_reconciliation/report/detailed_reconciliation.mako +++ b/npg_bank_account_reconciliation/report/detailed_reconciliation.mako @@ -118,7 +118,7 @@ - ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} + ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} ${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -152,7 +152,7 @@ - ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} + ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} ${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -221,7 +221,7 @@ - ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} + ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} ${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -255,7 +255,7 @@ - ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} + ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} ${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} diff --git a/npg_bank_account_reconciliation/report/summary_reconciliation.mako b/npg_bank_account_reconciliation/report/summary_reconciliation.mako index c588627c3..1ce92e403 100644 --- a/npg_bank_account_reconciliation/report/summary_reconciliation.mako +++ b/npg_bank_account_reconciliation/report/summary_reconciliation.mako @@ -84,7 +84,7 @@ - ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} + ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines)}${_("items")} ${formatLang(rec.sum_of_debits, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -92,7 +92,7 @@ - ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} + ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines)}${_("items")} ${formatLang(-rec.sum_of_credits, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -123,7 +123,7 @@ - ${_("Cheques and Payments")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} + ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_debits_lines_unclear)}${_("items")} ${formatLang(rec.sum_of_debits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)} @@ -131,7 +131,7 @@ - ${_("Deposits and Credits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} + ${_("Cheques and Debits")}${" - %s " % int(rec.sum_of_credits_lines_unclear)}${_("items")} ${formatLang(-rec.sum_of_credits_unclear, monetary=True, currency_obj=rec.company_id.currency_id)}