Merge lp:~unifield-team/unifield-server/us-2041 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2017-02-16 13:27:33 +0000
+++ bin/addons/purchase_override/purchase.py	2017-03-22 09:52:36 +0000
@@ -2035,6 +2035,9 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        if context is None:
+            context = {}
+
         # duplicated code with wkf_confirm_wait_order because of backward compatibility issue with yml tests for dates,
         # which doesnt execute wkf_confirm_wait_order (null value in column "date_expected" violates not-null constraint for stock.move otherwise)
         # msf_order_date checks
@@ -2063,6 +2066,7 @@
             todo2 = []
             todo3 = []
             todo4 = {}
+            to_invoice = set()
             if order.partner_id.partner_type in ('internal', 'esc') and order.order_type == 'regular' or \
                     order.order_type in ['donation_exp', 'donation_st', 'loan']:
                 self.write(cr, uid, [order.id], {'invoice_method': 'manual'})
@@ -2107,6 +2111,10 @@
                                                             'date': strftime('%Y-%m-%d %H:%M:%S')}, context=context)
                         wf_service.trg_trigger(uid, 'stock.move', move.id, cr)
                         if move.picking_id:
+                            if move.picking_id.sale_id:
+                                sale = move.picking_id.sale_id
+                                if sale.partner_id.partner_type in ('section', 'intermission') and sale.invoice_quantity == 'procurement':
+                                    to_invoice.add(move.picking_id.id)
                             all_move_closed = True
                             # Check if the picking should be updated
                             if move.picking_id.subtype == 'picking':
@@ -2123,6 +2131,11 @@
                     wf_service.trg_validate(uid, 'stock.picking', pick_id, 'button_confirm', cr)
                     wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
 
+            if to_invoice:
+                conf_context = context.copy()
+                conf_context['invoice_dpo_confirmation'] = order.id
+                self.pool.get('stock.picking').action_invoice_create(cr, uid, list(to_invoice), type='out_invoice', context=conf_context)
+
         # @@@[e-mail]_approve_order
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': strftime('%Y-%m-%d')})
         return True

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2017-03-06 08:27:43 +0000
+++ bin/addons/stock/stock.py	2017-03-22 09:52:36 +0000
@@ -1081,6 +1081,7 @@
         invoices_group = {}
         res = {}
         inv_type = type
+        all_pick_lines_invoiced = True
         for picking in self.browse(cr, uid, ids, context=context):
             if picking.invoice_state != '2binvoiced':
                 continue
@@ -1180,9 +1181,22 @@
                 invoice_id = invoice_obj.create(cr, uid, invoice_vals, context=context)
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
+            all_pick_lines_invoiced = True
             for move_line in picking.move_lines:
                 if move_line.state == 'cancel':
                     continue
+
+                # US-2041 - Do not invoice Picking Ticket / Delivery Order lines that are not linked to a DPO when
+                # invoice creation was requested at DPO confirmation
+                if picking.type == 'out' and context.get('invoice_dpo_confirmation') and move_line.dpo_id.id != context.get('invoice_dpo_confirmation'):
+                    all_pick_lines_invoiced = False
+                    continue
+
+                # US-2041 - Do not invoice Picking Ticket / Delivery Order lines that are linked to a DPO
+                # when the invoice creation was requested at Picking Ticket / Delivery Order processing
+                if picking.type == 'out' and not context.get('invoice_dpo_confirmation') and move_line.dpo_line_id:
+                    continue
+
                 origin = move_line.picking_id.name or ''
                 if move_line.picking_id.origin:
                     origin += ':' + move_line.picking_id.origin
@@ -1232,13 +1246,15 @@
 
             invoice_obj.button_compute(cr, uid, [invoice_id], context=context,
                                        set_total=(inv_type in ('in_invoice', 'in_refund')))
-            self.write(cr, uid, [picking.id], {
+            if all_pick_lines_invoiced:
+                self.write(cr, uid, [picking.id], {
+                    'invoice_state': 'invoiced',
+                }, context=context)
+            self._invoice_hook(cr, uid, picking, invoice_id)
+        if all_pick_lines_invoiced:
+            self.write(cr, uid, res.keys(), {
                 'invoice_state': 'invoiced',
             }, context=context)
-            self._invoice_hook(cr, uid, picking, invoice_id)
-        self.write(cr, uid, res.keys(), {
-            'invoice_state': 'invoiced',
-        }, context=context)
         return res
 
     def test_done(self, cr, uid, ids, context=None):