Merge lp:~openerp-dev/openobject-addons/6.0-opw-574284-skh into lp:openobject-addons/6.0

[Somesh Khare]

Hello Sir,

[Fix]: Create invoice from picking error.

This branch fixes the issue.

Thanks & Regards,
OpenERP Support

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Nhomar - Vauxoo (nhomar)]

When this merge will be done?

Regards.

review: Approve

Unmerged revisions

5218. By Somesh Khare on 2012-05-02

[FIX] Stock.py : Create invoice from picking error (Case: ref 574284)

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-04-30 14:27:39 +0000
+++ stock/stock.py	2012-05-02 11:35:27 +0000
@@ -985,7 +985,11 @@
             if picking.invoice_state != '2binvoiced':
                 continue
             payment_term_id = False
-            partner =  picking.address_id and picking.address_id.partner_id
+            address_contact_id, address_invoice_id = \
+                    self._get_address_invoice(cr, uid, picking).values()
+            address = address_obj.browse(cr, uid, address_contact_id, context=context)
+            
+            partner =  address.partner_id
             if not partner:
                 raise osv.except_osv(_('Error, no partner !'),
                     _('Please put a partner on the picking list if you want to generate invoice.'))
@@ -998,11 +1002,6 @@
                 payment_term_id = self._get_payment_term(cr, uid, picking)
             else:
                 account_id = partner.property_account_payable.id
-
-            address_contact_id, address_invoice_id = \
-                    self._get_address_invoice(cr, uid, picking).values()
-            address = address_obj.browse(cr, uid, address_contact_id, context=context)
-
             comment = self._get_comment_invoice(cr, uid, picking)
             if group and partner.id in invoices_group:
                 invoice_id = invoices_group[partner.id]