Merge lp:~openerp-dev/openobject-addons/trunk-opw-576212-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

Steps to Reproduce the issue:-

=>. Install stock_invoice_directly module.

=>. Create a Purchase Order with a product: say for example "Product1" or else with quantity=10.
    Invoice Policy: Based on receptions
    So shipment is created.

=>. Go Incoming Shipments, Receive 3 product and create invoice.
    Invoice will be created with quantity 7 ( which is unreceived quantity ).

=>. Expected:= Invoice will be created with 3 quantity ( which is received )

=> Code is forward port from 6.1

Thanks,
Mayur

[lp:~openerp-dev/openobject-addons/trunk-opw-576212-port-mma]

8158. By Mayur Maheshwari(OpenERP) on 2012-12-03

[IMP]stock_invoice_directly: optimize some code

Unmerged revisions

8158. By Mayur Maheshwari(OpenERP) on 2012-12-03

[IMP]stock_invoice_directly: optimize some code

8157. By Jagdish Panchal (Open ERP) on 2012-11-30

[FIX]stock_invoice_directly: Fix the issue wrong quantity when invoice created from incoming shipment

=== modified file 'stock_invoice_directly/wizard/stock_invoice.py'
--- stock_invoice_directly/wizard/stock_invoice.py	2012-03-05 18:40:03 +0000
+++ stock_invoice_directly/wizard/stock_invoice.py	2012-12-03 06:39:21 +0000
@@ -29,10 +29,15 @@
            after processing the partial picking.
         """
         if context is None: context = {}
-        result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
+        result = super(invoice_directly, self).do_partial(cr, uid, ids, context=context)
         partial = self.browse(cr, uid, ids[0], context)
-        context.update(active_model='stock.picking',
-                       active_ids=[partial.picking_id.id])
+        context.update(active_model='stock.picking',active_ids=[partial.picking_id.id],active_id=partial.picking_id.id)
+
+        if partial.picking_id.backorder_id.id:
+            if partial.picking_id.backorder_id.invoice_state != 'done' and partial.picking_id.state !='done':
+                context.update(active_model='stock.picking',
+                    active_ids=[partial.picking_id.backorder_id.id], active_id=partial.picking_id.backorder_id.id)
+ 
         if partial.picking_id.invoice_state == '2binvoiced':
             return {
                 'name': 'Create Invoice',