From f5c2af0ce162c418f4807d22b410745b752d83f6 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 18 Dec 2012 13:09:04 +0100 Subject: [PATCH 1/3] [FIX] account.payment: typo in forward-ported code for payment.order report bzr revid: odo@openerp.com-20121218120904-fk5qhvyk9qil5fse --- addons/account_payment/report/order.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 71312521a9f..ca2315d81b1 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -278,7 +278,7 @@ [[ formatLang(get_amount_total(o), currency_obj=o.company_id.currency_id) or '' ]] - [[ formatLang(get_amount_total_in_currency(o), currency_obj=(o.order_lines and o.order_lines[0].currency or None)) or '' ]] + [[ formatLang(get_amount_total_in_currency(o), currency_obj=(o.line_ids and o.line_ids[0].currency or None)) or '' ]] From d2f4e02c361ab11cc1338270ca55e7f6131deca7 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 18 Dec 2012 14:37:25 +0100 Subject: [PATCH 2/3] [FIX] l10n_lu: in trunk the property_reserve_and_surplus_account field has been removed See rev 7783 revid:qdp-launchpad@openerp.com-20121015142729-0vlvv1mx54zr6p4f bzr revid: odo@openerp.com-20121218133725-5gxd2sb1o1h8eaou --- addons/l10n_lu/account.chart.template-2011.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_lu/account.chart.template-2011.csv b/addons/l10n_lu/account.chart.template-2011.csv index 681f52e2dd6..3a336fb619a 100644 --- a/addons/l10n_lu/account.chart.template-2011.csv +++ b/addons/l10n_lu/account.chart.template-2011.csv @@ -1,2 +1,2 @@ -id,name,account_root_id:id,bank_account_view_id:id,tax_code_root_id:id,property_account_receivable:id,property_account_payable:id,property_account_expense_categ:id,property_account_income_categ:id,property_reserve_and_surplus_account:id -lu_2011_chart_1,PCMN Luxembourg,lu_2011_account_0,lu_2011_account_5131,lu_tax_code_template_mensuel,lu_2011_account_4011,lu_2011_account_44111,lu_2011_account_6063,lu_2011_account_7051,lu_2011_account_141 +id,name,account_root_id:id,bank_account_view_id:id,tax_code_root_id:id,property_account_receivable:id,property_account_payable:id,property_account_expense_categ:id,property_account_income_categ:id +lu_2011_chart_1,PCMN Luxembourg,lu_2011_account_0,lu_2011_account_5131,lu_tax_code_template_mensuel,lu_2011_account_4011,lu_2011_account_44111,lu_2011_account_6063,lu_2011_account_7051 From 45de1864b56fe9202655b3d50caa37ee383ba516 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 18 Dec 2012 17:23:37 +0100 Subject: [PATCH 3/3] [FIX] l10n_ch: simpler/proper argument type for addons.get_module_resource bzr revid: odo@openerp.com-20121218162337-ou11i0ezddm1frf8 --- addons/l10n_ch/report/report_webkit_html.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index 851d92b16ee..864feead60a 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -157,8 +157,6 @@ def mako_template(text): class BVRWebKitParser(webkit_report.WebKitParser): - bvr_file_path = ('l10n_ch','report','bvr.mako') - def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None): """generate the PDF""" context = context or {} @@ -199,7 +197,7 @@ class BVRWebKitParser(webkit_report.WebKitParser): company = user.company_id body_mako_tpl = mako_template(template) #BVR specific - bvr_path = addons.get_module_resource(self.bvr_file_path) + bvr_path = addons.get_module_resource('l10n_ch','report','bvr.mako') body_bvr_tpl = mako_template(file(bvr_path).read()) helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context) ##BVR Specific