Merge lp:~openerp-dev/openobject-addons/trunk-bug-813329-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have added the company_id in product_id_change method in account_anglo_saxon module.

Thanks & Regards,
Devnani Bharat R.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Improve little code.

review: Approve

=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2011-01-14 00:11:01 +0000
+++ account_anglo_saxon/invoice.py	2011-09-15 13:36:46 +0000
@@ -134,14 +134,13 @@
                                         'taxes':line.get('taxes',[]),
                                         })
                         res += diff_res
-        return res   
-    
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+        return res
+
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
+        fiscal_pool = self.pool.get('account.fiscal.position')
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context, company_id)
         if not product:
-            return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
-        else:
-            res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
-
+            return res
         if type in ('in_invoice','in_refund'):
             product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
             if type == 'in_invoice':
@@ -153,11 +152,11 @@
                 if not oa:
                     oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
             if oa:
-                fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id, context=context) or False
-                a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
-                res['value'].update({'account_id':a})            
+                fpos = fposition_id and fiscal_pool.browse(cr, uid, fposition_id, context=context) or False
+                a = fiscal_pool.map_account(cr, uid, fpos, oa)
+                res['value'].update({'account_id':a})
         return res
-         
+
 account_invoice_line()
 
 class account_invoice(osv.osv):
@@ -180,6 +179,6 @@
                         line.update({'account_id': (account_data['id'],account_data['name'])})
         res = super(account_invoice,self)._refund_cleanup_lines(cr, uid, lines)
         return res
-    
+
 account_invoice()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: