Merge lp:~yann-papouin/ocb-addons/6.1-bug-947838-sale-recreate-packing-duplicates into lp:ocb-addons/6.1

[Yann Papouin]

Change _create_pickings_and_procurements to avoid recreating procurement when they are still valid

[Holger Brunn (Therp) (hbrunn)]

#11 pass context (even though this function screws up then, but this may change)
#15 same here

Why don't you simply call this functions via the browse records you have in hand anyway?

review: Needs Fixing

[Yann Papouin (yann-papouin)]

Yes you're right, I always miss this context value

[Yann Papouin (yann-papouin)]

Do I need to pass context even when directly calling function via the browse records or does it automatically reuse the context initially passed in browse?

[Holger Brunn (Therp) (hbrunn)]

No, on browse records there's no need to pass the context. It's even harmful, does the code you submitted now run? I'd expect and exception about passing a duplicate keyword argument names 'context'

review: Needs Fixing (code review)

[lp:~yann-papouin/ocb-addons/6.1-bug-947838-sale-recreate-packing-duplicates]

6817. By Yann Papouin on 2014-01-22

Do not pass context in proxy functions

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

Unmerged revisions

6817. By Yann Papouin on 2014-01-22

Do not pass context in proxy functions

6816. By Yann Papouin on 2013-12-05

Readding code checking 'confirmed' lines to avoid duplicates

6815. By Yann Papouin on 2013-12-04

Pass context and use existing browse records

6814. By Yann Papouin on 2013-11-12

Removing useless code checking 'confirmed' lines

6813. By Yann Papouin on 2013-11-08

FIX: "Recreate Packing" button create duplicates

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-12-18 15:22:03 +0000
+++ sale/sale.py	2014-01-22 15:39:44 +0000
@@ -825,6 +825,19 @@
             date_planned = self._get_date_planned(cr, uid, order, line, order.date_confirm, context=context)
 
             if line.product_id:
+                if line.state == 'confirmed':
+                    # Ignore existing procurement and linked move if not canceled
+                    if line.procurement_id and line.procurement_id.state != 'cancel'\
+                    and line.procurement_id.move_id and line.procurement_id.move_id.state != 'cancel': 
+                        continue
+                elif line.state == 'exception':
+                    # Reset line state to confirmed state
+                    line.button_confirm() 
+                    # Cancel existing move if the canceled procurement exists 
+                    if line.procurement_id and line.procurement_id.state == 'cancel'\
+                    and line.procurement_id.move_id and line.procurement_id.move_id.state not in ('done', 'cancel'):
+                        line.procurement_id.move_id.action_cancel()
+                        
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     if not picking_id:
                         picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
@@ -1137,7 +1150,7 @@
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        default.update({'state': 'draft', 'move_ids': [], 'invoiced': False, 'invoice_lines': []})
+        default.update({'state': 'draft', 'move_ids': [], 'procurement_id': False, 'invoiced': False, 'invoice_lines': []})
         return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
 
     def product_packaging_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False,