From 0a3491bd400d7a88930467f7a5e539b15aba793b Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 9 Sep 2010 12:34:34 +0530 Subject: [PATCH] =?UTF-8?q?Sales/Address=20Book/Customers/=20Print=20Overd?= =?UTF-8?q?ue=20Payment=20=20*=20Display=20currency=20symbol=20(=E2=82=AC)?= =?UTF-8?q?=20instead=20of=20currency=20name=20(EUR)=20=20*=20wrong=20addr?= =?UTF-8?q?ess=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: apa@tinyerp.com-20100909070434-9neov41afugbnejm --- addons/account/report/overdue.py | 17 ++++++----- addons/account/report/overdue.rml | 47 ++++++++++++++++--------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/addons/account/report/overdue.py b/addons/account/report/overdue.py index b7ffaf8816f..ebf50224a50 100644 --- a/addons/account/report/overdue.py +++ b/addons/account/report/overdue.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -46,15 +46,18 @@ class Overdue(report_sxw.rml_parse): result = { 'name': False, 'street': False, + 'street2': False, 'city' : False, 'zip' : False, + 'state_id':False, 'country_id' : False, } if adr_id: result = res_partner_address.read(self.cr, self.uid, [adr_id], context=self.context.copy()) result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False - return result - + result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False + return result + res.append(result) return res @@ -80,12 +83,12 @@ class Overdue(report_sxw.rml_parse): ('state', '<>', 'draft'), ('reconcile_id', '=', False)]) movelines = moveline_obj.browse(self.cr, self.uid, movelines) return movelines - + def _message(self, obj, company): company_pool = pooler.get_pool(self.cr.dbname).get('res.company') - message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg + message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg return message - + report_sxw.report_sxw('report.account.overdue', 'res.partner', 'addons/account/report/overdue.rml', parser=Overdue) diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml index 197831c318b..5da8879fa0f 100644 --- a/addons/account/report/overdue.rml +++ b/addons/account/report/overdue.rml @@ -1,6 +1,6 @@ -