Merge lp:~openerp-dev/openobject-addons/trunk-bug-724131-ksa into lp:openobject-addons

[Kirti Savalia(OpenERP)]

[Rucha (Open ERP) (rpa-openerp)]

sorry but its not a right solution,
we already have code that loops all PO lines and calls a function to create invoice line,
you can directly link that invoice line and PO line near that function,
see upcoming merge proposal for this bug,
thanks

review: Disapprove

Unmerged revisions

5659. By Kirti Savalia(OpenERP) on 2011-11-14

[FIX]:Purchase lines without Invoice Lines Relationship

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-11-13 16:07:32 +0000
+++ purchase/purchase.py	2011-11-14 11:05:28 +0000
@@ -352,6 +352,8 @@
         res = False
 
         journal_obj = self.pool.get('account.journal')
+        account_invoice_obj = self.pool.get('account.invoice')
+        purchase_line_obj = self.pool.get('purchase.order.line')
         for o in self.browse(cr, uid, ids):
             il = []
             todo = []
@@ -390,9 +392,13 @@
                 'payment_term': o.partner_id.property_payment_term and o.partner_id.property_payment_term.id or False,
                 'company_id': o.company_id.id,
             }
-            inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
-            self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
-            self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True})
+            inv_id = account_invoice_obj.create(cr, uid, inv, {'type':'in_invoice'})
+            account_invoice_obj.button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
+            lines_data = account_invoice_obj.browse(cr, uid, inv_id)
+            for order_line in o.order_line:
+                for invoice_line_id in lines_data.invoice_line:
+                    if invoice_line_id.product_id.id  == order_line.product_id.id and  invoice_line_id.quantity == order_line.product_qty:
+                        purchase_line_obj.write(cr, uid, [order_line.id], {'invoiced':True, 'invoice_lines': [(4, invoice_line_id.id)]})
             self.write(cr, uid, [o.id], {'invoice_ids': [(4, inv_id)]})
             res = inv_id
         return res