Merge lp:~jfb-tempo-consulting/unifield-server/us-3831 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	2017-11-27 15:33:59 +0000
+++ bin/addons/stock/physical_inventory.py	2017-12-13 16:51:35 +0000
@@ -117,6 +117,7 @@
         'company_id': fields.many2one('res.company', 'Company', readonly=True, select=True, required=True,
                                       states={'draft': [('readonly', False)]}),
         'full_inventory': fields.boolean('Full inventory', readonly=True),
+        'discrepancies_generated': fields.boolean('Discrepancies Generated', readonly=True),
         'file_to_import': fields.binary(string='File to import', filters='*.xml'),
         'file_to_import2': fields.binary(string='File to import', filters='*.xml'),
 
@@ -433,7 +434,7 @@
         todo.extend(create_discrepancy_lines)
 
         # Do the actual write
-        write("physical.inventory", inventory_id, {'discrepancy_line_ids': todo})
+        write("physical.inventory", inventory_id, {'discrepancy_line_ids': todo, 'discrepancies_generated': True})
 
 
         self._update_total_product(cr, uid, inventory_id,
@@ -889,9 +890,6 @@
         """ Finish the inventory"""
         if context is None:
             context = {}
-        move_obj = self.pool.get('stock.move')
-        for inv in self.read(cr, uid, ids, ['move_ids'], context=context):
-            move_obj.action_done(cr, uid, inv['move_ids'], context=context)
         self.write(cr, uid, ids, {'state': 'closed', 'date_done': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)},
                    context=context)
         return {}
@@ -909,7 +907,7 @@
         return {}
 
     def action_confirm(self, cr, uid, ids, context=None):
-        """ Confirm the inventory and writes its finished date"""
+        """ Confirm the inventory, close the stock moves and writes its finished date"""
 
         if context is None:
             context = {}
@@ -923,6 +921,7 @@
         product_tmpl_obj = self.pool.get('product.template')
         prod_lot_obj = self.pool.get('stock.production.lot')
         picking_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get('stock.move')
 
         product_dict = {}
         product_tmpl_dict = {}
@@ -1066,6 +1065,9 @@
             for line_id, move_id in discrepancy_to_move.items():
                 inv_line_obj.write(cr, uid, [line_id], {'move_id': move_id}, context=context)
 
+            # Close the moves
+            move_obj.action_done(cr, uid, move_ids, context=context)
+
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
         """ Cancels the stock move and change inventory state to draft."""
 
=== modified file 'bin/addons/stock/physical_inventory_view.xml'
--- bin/addons/stock/physical_inventory_view.xml	2017-11-22 12:59:24 +0000
+++ bin/addons/stock/physical_inventory_view.xml	2017-12-13 16:51:35 +0000
@@ -16,6 +16,7 @@
                     <field name="responsible"/>
                     <field name="date_done"/>
                     <field name="full_inventory"/>
+                    <field name="discrepancies_generated" invisible="1"/>
                     <button colspan="2" name="set_full_inventory" states="draft" string="Set as full inventory" type="object"
                         icon="gtk-about" 
                         confirm="Setting as 'full inventory' is irreversible. Do you confirm ?" 
@@ -201,8 +202,10 @@
 
                         <button name="action_recount" states="validated" string="Recount"
                                 type="object" icon="gtk-undo"/>
+
                         <button name="action_confirm" states="validated" string="Confirm Inventory"
-                                type="object" icon="gtk-jump-to" confirm="Do you confirm that you want confirm the inventory ?"/>
+                                type="object" icon="gtk-jump-to" confirm="Do you confirm that you want confirm the inventory ?"
+                                attrs="{'readonly': [('discrepancies_generated', '=', False)]}"/>
 
                         <button name="action_done" states="confirmed" string="Close Inventory"
                                 type="object" icon="gtk-jump-to" confirm="Do you confirm that you want to close the inventory ?"/>
 
=== modified file 'bin/addons/stock_override/wizard/stock_card_wizard.py'
--- bin/addons/stock_override/wizard/stock_card_wizard.py	2017-11-21 13:19:44 +0000
+++ bin/addons/stock_override/wizard/stock_card_wizard.py	2017-12-13 16:51:35 +0000
@@ -268,7 +268,7 @@
 
             doc_ref = (move.picking_id and move.picking_id.name) or \
                       (move.init_inv_ids and move.init_inv_ids[0].name) or \
-                      (move.inventory_ids and move.inventory_ids[0].name) or ''
+                      (move.inventory_ids and move.inventory_ids[0].name) or move.name or ''
 
             line_values = {
                 'card_id': ids[0],