Merge lp:~xmo-deactivatedaccount/openobject-addons/fix-tax-code-report into lp:openobject-addons/5.0

[Xavier (Open ERP)]

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Fixe un bug dans account/report/account_tax_code.py et clarifie un peu le code.

[Husen Daudi (husendaudi)]

Merged in revision : 2448 <email address hidden>
Thanks for contribution.

review: Approve

[Fabien (Open ERP) (fp-tinyerp)]

Welcome home Xavier :)

Xavier Morel wrote:
> Xavier Morel has proposed merging lp:~xmo/openobject-addons/fix-tax-code-report into lp:openobject-addons/5.0.
>
> Requested reviews:
> OpenERP Quality Team (openerp)
>
>
> Fixe un bug dans account/report/account_tax_code.py et clarifie un peu le code.
>

--
Fabien Pinckaers
CEO Tiny - OpenERP Editor
Chaussée de Namur 40
B-1367 Grand-Rosière
Belgium
Phone: [phone]
Fax: [phone]
Web: http://openerp.com

Great Achievements Start With Tiny Investments
  -- Marty, 2005

=== modified file 'account/report/account_tax_code.py'
--- account/report/account_tax_code.py	2009-10-09 11:49:00 +0000
+++ account/report/account_tax_code.py	2009-11-18 13:35:28 +0000
@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution    
@@ -26,6 +27,25 @@
 from report import report_sxw
 import re
 
+def _get_country(record):
+    if record.partner_id \
+            and record.partner_id.address \
+            and record.partner_id.address[0].country_id:
+        return record.partner_id.address[0].country_id.code
+    else:
+        return ''
+
+def _record_to_report_line(record):
+    return {'date': record.date,
+            'ref': record.ref,
+            'acode': record.account_id.code,
+            'name': record.name,
+            'debit': record.debit,
+            'credit': record.credit,
+            'pname': record.partner_id and record.partner_id.name or '',
+            'country': _get_country(record)
+            }
+
 class account_tax_code_report(rml_parse.rml_parse):
     #_name = 'report.account.tax.code.entries'
     
@@ -36,30 +56,14 @@
             'get_line':self.get_line,
         })
         
-    def get_line(self,obj):
-        res = {}
-        result = []
-        line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
-        if line_ids:
-            move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
-            for line in move_line_objs:
-               res['date'] = line.date
-               res['ref'] = line.ref
-               res['acode'] = line.account_id.code
-               res['pname'] = ''
-               res['country'] = ''
-
-               if line.partner_id:
-                   res['pname'] = line.partner_id.name
-                   if line.partner_id.address and line.partner_id.address[0].country_id:
-                           res['country'] = line.partner_id.address[0].country_id.code
-               res['name'] = line.name
-               res['debit'] = line.debit
-               res['credit'] = line.credit
-               result.append(res)
-
-        return result
-        
+    def get_line(self, obj):
+        line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
+        if not line_ids: return []
+
+        return map(_record_to_report_line,
+                   self.pool.get('account.move.line')\
+                       .browse(self.cr, self.uid, line_ids))
+
 report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
     'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)