Merge lp:~vauxoo/openobject-addons/6.0-bug-896462-moylop260 into lp:openobject-addons/6.0

[Moisés López - http://www.vauxoo.com]

Unmerged revisions

4935. By Moisés López - http://www.vauxoo.com on 2011-11-26

[FIX] [account] Remove Hard-Code in refund invoice function

4934. By Launchpad Translations on behalf of openerp on 2011-11-25

Launchpad automatic translations update.

=== modified file 'account/invoice.py'
--- account/invoice.py	2011-11-24 08:32:27 +0000
+++ account/invoice.py	2011-11-26 00:49:24 +0000
@@ -1065,14 +1065,31 @@
         return self.name_get(cr, user, ids, context)
 
     def _refund_cleanup_lines(self, cr, uid, lines):
+        #TODO: Make a generic function transform read to values of create in tools
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        columns = invoice_line_obj._columns
+        fieldnames_relation = {
+            'many2one': [],
+            'many2many': [],
+            'one2many': [],
+        }
+        for column in columns:
+            if columns[column]._type == 'many2many':
+                fieldnames_relation['many2many'].append( column )
+            elif columns[column]._type == 'one2many':
+                fieldnames_relation['one2many'].append( column )
+            elif columns[column]._type == 'many2one':
+                fieldnames_relation['many2one'].append( column )
         for line in lines:
             del line['id']
             del line['invoice_id']
-            for field in ('company_id', 'partner_id', 'account_id', 'product_id',
-                          'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
+            for field in fieldnames_relation['many2one']:
                 line[field] = line.get(field, False) and line[field][0]
-            if 'invoice_line_tax_id' in line:
-                line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
+            for field in fieldnames_relation['many2many']:
+                line[field] = [(6,0, line.get(field, [])) ]
+            for field in fieldnames_relation['one2many']:
+                #TDOO: Test with one2mnay fields
+                line[field] = line.get(field, False) 
         return map(lambda x: (0,0,x), lines)
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):