Merge lp:~openerp-dev/openobject-addons/6.1-opw-578237-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

Generated pdf does not translate the address in partner language and "Description" and "Ref" column's values in pdf are incorrect.

This fix fixes these issues. Kindly review the fix.

Thanks.

Unmerged revisions

6953. By Ravi Gohil (OpenERP) on 2012-08-20

[FIX] account_followup: address on pdf generated is not translated and wrong values in description and invoice columns of pdf: (Maintenance Case : 578237)

=== modified file 'account_followup/report/account_followup_print.py'
--- account_followup/report/account_followup_print.py	2011-12-19 16:54:40 +0000
+++ account_followup/report/account_followup_print.py	2012-08-20 07:36:25 +0000
@@ -34,6 +34,7 @@
             'getLines': self._lines_get,
             'get_text': self._get_text
         })
+        self.context = context
 
     def _ids_to_objects(self, ids):
         pool = pooler.get_pool(self.cr.dbname)
@@ -47,7 +48,7 @@
         res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
         res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
         adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
-        return adr and res_partner_address.read(self.cr, self.uid, [adr]) or [{}]
+        return adr and res_partner_address.read(self.cr, self.uid, [adr], context=self.context.copy()) or [{}]
 
     def _lines_get(self, stat_by_partner_line):
         pool = pooler.get_pool(self.cr.dbname)
@@ -68,8 +69,8 @@
                 line_cur[line.currency_id.id] = {'line': []}
             currency = line.currency_id or line.company_id.currency_id
             line_data = {
-                         'name': line.move_id.name,
-                         'ref': line.ref,
+                         'name': line.invoice.name,
+                         'ref': line.invoice.number,
                          'date':line.date,
                          'date_maturity': line.date_maturity,
                          'balance': currency.id <> line.company_id.currency_id.id and line.amount_currency or (line.debit - line.credit),