[FIX] _get_account_analytic_invoice shouldn t take sale_line as parameter=> avoid...

bzr revid: nel@tinyerp.com-20120118151720-3ezotkpz3km21eca

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index f595a3e..7a8ad50 100644 (file)
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -101,7 +101,7 @@ class stock_picking(osv.osv):
         return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
 
     def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
-        if move_line.purchase_line_id:
+        if move_line and move_line.purchase_line_id:
             return move_line.purchase_line_id.account_analytic_id.id
         return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index f7c5d81..dbd731c 100644 (file)
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -164,7 +164,7 @@ class stock_picking(osv.osv):
                     tax_ids = map(lambda x: x.id, tax_ids)
 
                     account_analytic_id = self._get_account_analytic_invoice(cursor,
-                            user, picking, sale_line)
+                            user, picking, False)
 
                     account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, picking.sale_id.partner_id.property_account_position, account_id)
                     invoice = invoices[result[picking.id]]