Merge lp:~unifield-team/unifield-wm/us-285-299-307-416 into lp:unifield-wm

[jftempo]

[lp:~unifield-team/unifield-wm/us-285-299-307-416]

2557. By Quentin THEURET @Amaris on 2015-07-24

Merge latest US-416 modifications

2558. By Quentin THEURET @Amaris on 2015-08-07

US-416 [FIX] Run procurement automatically for lines sourced from stock

Unmerged revisions

2558. By Quentin THEURET @Amaris on 2015-08-07

US-416 [FIX] Run procurement automatically for lines sourced from stock

2557. By Quentin THEURET @Amaris on 2015-07-24

Merge latest US-416 modifications

2556. By Quentin THEURET @Amaris on 2015-07-15

US-285 [IMP] At import of Physical inventory and product cost reevaluation, take care of only the product code (not the product name) to find the good product

2555. By Quentin THEURET @Amaris on 2015-07-15

US-416 [MERGE] Merge US-416 branch :: lp:~unifield-team/unifield-wm/us-416

2554. By Quentin THEURET @Amaris on 2015-07-15

US-307 [MERGE] Merge US-307 branch :: lp:~unifield-team/unifield-wm/us-307

2553. By Quentin THEURET @Amaris on 2015-07-15

US-299 [MERGE] Merge US-299 branch :: lp:~unifield-team/unifield-wm/us-299

2552. By Quentin THEURET @Amaris on 2015-07-15

US-285 [MERGE] Merge US-285 branch :: lp:~unifield-team/unifield-wm/us-285

=== modified file 'account_hq_entries/wizard/hq_entries_import.py'
=== modified file 'analytic_override/analytic_line.py'
=== modified file 'delivery_mechanism/delivery_mechanism.py'
=== modified file 'msf_outgoing/msf_outgoing.py'
--- msf_outgoing/msf_outgoing.py	2015-08-04 11:45:10 +0000
+++ msf_outgoing/msf_outgoing.py	2015-08-07 08:26:53 +0000
@@ -4500,13 +4500,20 @@
         '''
         pol_obj = self.pool.get('purchase.order.line')
         proc_obj = self.pool.get('procurement.order')
+        pick_obj = self.pool.get('stock.picking')
         sol_obj = self.pool.get('sale.order.line')
         uom_obj = self.pool.get('product.uom')
 
         if context is None:
             context = {}
 
+        move_to_done = []
+        pick_to_check = set()
+
         for move in self.browse(cr, uid, ids, context=context):
+            if move.product_qty == 0.00:
+                move_to_done.append(move.id)
+                ids.remove(move.id)
             """
             A stock move can be re-sourced but there are some conditions
 
@@ -4532,6 +4539,9 @@
             pick_state = move.picking_id.state
             subtype_ok = pick_type == 'out' and (pick_subtype == 'standard' or (pick_subtype == 'picking' and pick_state == 'draft'))
 
+            if pick_subtype == 'picking' and pick_state == 'draft':
+                pick_to_check.add(move.picking_id.id)
+
             if pick_type == 'in' and move.purchase_line_id:
                 sol_ids = pol_obj.get_sol_ids_from_pol_ids(cr, uid, [move.purchase_line_id.id], context=context)
                 for sol in sol_obj.browse(cr, uid, sol_ids, context=context):
@@ -4568,6 +4578,8 @@
                             {'move_id': other_out_move_ids[0]},
                             context=context)
 
+        self.action_done(cr, uid, move_to_done, context=context)
+
         # Search only non unlink move
         ids = self.search(cr, uid, [('id', 'in', ids)])
         res = super(stock_move, self).action_cancel(cr, uid, ids, context=context)
@@ -4582,6 +4594,13 @@
 #            else:
 #                wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
 
+        for ptc in pick_obj.browse(cr, uid, list(pick_to_check), context=context):
+            if ptc.subtype == 'picking' and ptc.state == 'draft' and not pick_obj.has_picking_ticket_in_progress(cr, uid, [ptc.id], context=context)[ptc.id] and all(m.state == 'cancel' or m.product_qty == 0.00 for m in ptc.move_lines):
+                moves_to_done = self.search(cr, uid, [('picking_id', '=', ptc.id), ('product_qty', '=', 0.00), ('state', 'not in', ['done', 'cancel'])], context=context)
+                if moves_to_done:
+                    self.action_done(cr, uid, moves_to_done, context=context)
+                ptc.action_done(context=context)
+
         return res
 
     def update_linked_documents(self, cr, uid, ids, new_id, context=None):

=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2015-08-05 13:43:27 +0000
+++ register_accounting/account_bank_statement.py	2015-08-07 08:26:53 +0000
@@ -1907,12 +1907,21 @@
 
                 old_distrib = False
                 if line.get('analytic_distribution_id', False):
+<<<<<<< TREE
                     old_distrib = line.get('analytic_distribution_id')[0]
 
                 # US-427: Do not update the AD from Employee/Third party if it comes from sync, only use the one provided by sync
                 if not context.get('sync_update_execution'):
                     values = self.update_employee_analytic_distribution(cr, uid, values) # this should only be done at local instance
 
+=======
+                    old_distrib = line.get('analytic_distribution_id')[0]
+
+                # US-427: Do not update the AD from Employee/Third party if it comes from sync, only use the one provided by sync  
+                if not context.get('sync_update_execution'):
+                    values = self.update_employee_analytic_distribution(cr, uid, values) # this should only be done at local instance 
+
+>>>>>>> MERGE-SOURCE
                 tmp = super(account_bank_statement_line, self).write(cr, uid, line.get('id'), values, context=context)
                 res.append(tmp)
 

=== modified file 'res_currency_functional/account_move_compute_currency.py'
=== modified file 'res_currency_functional/account_move_line_compute_currency.py'
=== modified file 'sale_override/sale.py'
--- sale_override/sale.py	2015-08-06 08:49:25 +0000
+++ sale_override/sale.py	2015-08-07 08:26:53 +0000
@@ -1640,6 +1640,9 @@
 
                     wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
 
+                if line.type == 'make_to_stock' and line.procurement_id:
+                    wf_service.trg_validate(uid, 'procurement.order', line.procurement_id.id, 'button_check', cr)
+
                 line_done += 1
                 prog_id = self.update_sourcing_progress(cr, uid, order, prog_id, {
                    'line_completed': _('In progress (%s/%s)') % (line_done, line_total),
@@ -2324,7 +2327,13 @@
             # - purchase_order_line.cancel_sol()
             if not 'update_or_cancel_line_not_delete' in context \
                 or not context['update_or_cancel_line_not_delete']:
+                tmp_ctx = context.get('call_unlink', None)
+                context['call_unlink'] = True
                 self.unlink(cr, uid, [line.id], context=context)
+                if tmp_ctx is None:
+                    del context['call_unlink']
+                else:
+                    context['call_unlink'] = tmp_ctx
             elif line.order_id.procurement_request:
                 # UFTP-82: flagging SO is an IR and its PO is cancelled
                 self.pool.get('sale.order').write(cr, uid, [line.order_id.id], {'is_ir_from_po_cancel': True}, context=context)