Merge lp:~mallorymarcot/unifield-server/us-4201 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_config_locations/stock_configuration.py'
--- bin/addons/msf_config_locations/stock_configuration.py	2018-06-12 13:34:28 +0000
+++ bin/addons/msf_config_locations/stock_configuration.py	2018-11-06 16:35:55 +0000
@@ -603,9 +603,12 @@
                                               string='Location type'),
         'error_message': fields.text(string='Information Message', readonly=True),
         'error': fields.boolean(string='Error'),
-        'move_from_to': fields.boolean(string='Has a move from/to the location'),
+        'can_force': fields.boolean(string='Can force'),
+        'move_from': fields.boolean(string='Has a move from the location'),
+        'move_to': fields.boolean(string='Has a move to the location'),
         'not_empty': fields.boolean(string='Location not empty'),
         'has_child': fields.boolean(string='Location has children locations'),
+        'related_ir': fields.boolean(string='Location has related IR open'),
     }
 
     def location_id_on_change(self, cr, uid, ids, location_id, context=None):
@@ -614,44 +617,73 @@
         Check if there is no stock in this location
         '''
         res = {'error_message': '',
-               'move_from_to': False,
+               'move_from': False,
+               'move_to': False,
                'not_empty': False,
-               'has_child': False}
+               'has_child': False,
+               'related_ir': False}
         warning = {}
         error = False
+        can_force = False
 
         if location_id:
             location = self.pool.get('stock.location').browse(cr, uid, location_id, context=context)
-            # Check if no moves to this location aren't done
-            move_from_to = self.pool.get('stock.move').search(cr, uid, [('state', 'not in', ('done', 'cancel')), '|', ('location_id', '=', location.id), ('location_dest_id', '=', location.id)])
-            if move_from_to:
-                error = True
-                res['move_from_to'] = True
-                res['error_message'] += '''* You have at least one move from or to the location '%s' which is not 'Done'.
-Please click on the 'See moves' button to see which moves are still in progress from/to this location.''' %location.name
-                res['error_message'] += '\n' + '\n'
+
+            move_to = self.pool.get('stock.move').search(cr, uid, [
+                ('state', 'not in', ('done', 'cancel')), 
+                ('location_dest_id', '=', location.id),
+                ('type', 'in', ['in', 'internal']),
+            ])
+            if move_to:
+                error = True
+                can_force = True
+                res['move_to'] = True
+                res['error_message'] += _("* You have at least one move to the location '%s' which is not 'Done'.\nPlease click on the 'See moves' button to see which moves are still in progress to this location.") % location.name
+                res['error_message'] += '\n' + '\n'
+
+            move_from = self.pool.get('stock.move').search(cr, uid, [
+                ('state', 'not in', ('done', 'cancel')),
+                ('id', 'not in', move_to),
+                '|', ('location_id', '=', location.id), ('location_dest_id', '=', location.id),
+            ])
+            if move_from:
+                error = True
+                res['move_from'] = True
+                res['error_message'] += _("* You have at least one move from or to the location '%s' which is not 'Done'.\nPlease click on the 'See moves' button to see which moves are still in progress from/to this location.") % location.name
+                res['error_message'] += '\n' + '\n'
+
+
             # Check if no stock in the location
             if location.stock_real and location.usage == 'internal':
                 error = True
                 res['not_empty'] = True
-                res['error_message'] += '''* The location '%s' is not empty of products. 
-Please click on the 'Products in location' button to see which products are still in the location.''' %location.name
+                res['error_message'] += _("* The location '%s' is not empty of products.\nPlease click on the 'Products in location' button to see which products are still in the location.") % location.name
                 res['error_message'] += '\n' + '\n'
 
             # Check if the location has children locations
             if location.child_ids:
                 error = True
                 res['has_child'] = True
-                res['error_message'] += '''* The location '%s' has children locations.
-Please remove all children locations before remove it. 
-Please click on the 'Children locations' button to see all children locations.''' %location.name
+                res['error_message'] += _("* The location '%s' has children locations.\nPlease remove all children locations before remove it.\nPlease click on the 'Children locations' button to see all children locations.") % location.name
                 res['error_message'] += '\n' + '\n'
 
+            related_ir = self.pool.get('sale.order').search(cr, uid, [
+                ('procurement_request', '=', True),
+                ('state', 'in', ('draft', 'draft_p', 'validated', 'validated_p', 'sourced', 'sourced_p')),
+                ('location_requestor_id', '=', location_id),
+            ], context=context)
+            if related_ir:
+                error = True
+                can_force = True
+                res['related_ir'] = True
+                res['error_message'] += _("* Warning there are open IR with location '%s'.\n Please click on the 'See documents' button to see all children locations.\n\n") % location.name
+
         if error:
-            warning.update({'title': 'Be careful !',
-                            'message': 'You have a problem with this location − Please see the message in the form for more information.'})
+            warning.update({'title': _('Be careful !'),
+                            'message': _('You have a problem with this location − Please see the message in the form for more information.')})
 
         res['error'] = error
+        res['can_force'] = error and not (res['not_empty'] or res['has_child'] or res['move_from']) and can_force or False
 
         return {'value': res,
                 'warning': warning}
@@ -696,9 +728,8 @@
         internal_cu_loc_id = data_obj.get_object_reference(cr, uid, 'msf_config_locations', 'stock_location_consumption_units_view')[1]
 
         for wizard in self.browse(cr, uid, ids, context=context):
-            if wizard.error or wizard.has_child or wizard.not_empty or wizard.move_from_to:
+            if (wizard.error and not wizard.can_force) or wizard.has_child or wizard.not_empty or wizard.move_from:
                 raise osv.except_osv(_('Error'), _('You cannot remove this location because some errors are still here !'))
-
             location = wizard.location_id
 
         # De-activate the location
@@ -762,6 +793,37 @@
                 'target': 'current',
                 }
 
+
+    def related_ir(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        location = wizard.location_id
+        context.update({'procurement_request': True})
+
+        related_ir = self.pool.get('sale.order').search(cr, uid, [
+            ('procurement_request', '=', True),
+            ('state', 'in', ('draft', 'draft_p', 'validated', 'validated_p', 'sourced', 'sourced_p')),
+            ('location_requestor_id', '=', location.id),
+        ], context=context)
+
+        view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'procurement_request', 'procurement_request_tree_view')[1]
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'sale.order',
+            'domain': [('id', 'in', related_ir)],
+            'view_id': [view_id],
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'target': 'current',
+            'context': context,
+        }
+
+
     def products_in_location(self, cr, uid, ids, context=None):
         '''
         Returns a list of products in the location

=== modified file 'bin/addons/msf_config_locations/stock_configuration_view.xml'
--- bin/addons/msf_config_locations/stock_configuration_view.xml	2018-08-10 15:54:25 +0000
+++ bin/addons/msf_config_locations/stock_configuration_view.xml	2018-11-06 16:35:55 +0000
@@ -50,9 +50,12 @@
 			<field name="arch" type="xml">
 				<form string="Remove an optional location">
 					<field name="error" invisible="1" />
-					<field name="move_from_to" invisible="1" />
+					<field name="move_from" invisible="1" />
+					<field name="move_to" invisible="1" />
 					<field name="not_empty" invisible="1" />
 					<field name="has_child" invisible="1" />
+					<field name="related_ir" invisible="1" />
+					<field name="can_force" invisible="1" />
 					<separator string="Parameters" colspan="4" />
 					<!--<field name="location_usage" string="Which is the usage of the location to remove ?" colspan="4" 
 						   on_change="location_usage_change(location_usage)" />
@@ -65,15 +68,16 @@
 					<group colspan="4" col="3" attrs="{'invisible': [('error', '=', False)]}">
 						<separator string="Message" colspan="4" />
 						<field name="error_message" nolabel="1" colspan="4" />
-						<button type="object" name="see_moves" string="See moves" attrs="{'invisible': [('move_from_to', '=', False)]}" />
+						<button type="object" name="see_moves" string="See moves" attrs="{'invisible': [('move_from', '=', False),('move_to', '=', False)]}" />
 						<button type="object" name="products_in_location" string="Products in location" attrs="{'invisible': [('not_empty', '=', False)]}" />
 						<button type="object" name="children_location" string="Children locations" attrs="{'invisible': [('has_child', '=', False)]}" />
+						<button type="object" name="related_ir" string="See documents" attrs="{'invisible': [('related_ir', '=', False)]}" />
 					</group>
 					<separator colspan="4" string="Actions" />
 					<button special="cancel" icon="gtk-cancel" string="Cancel" />
 					<group colspan="3" col="2">
 						<button type="object" name="deactivate_location" icon="terp-camera_test" string="Inactivate the location" 
-							attrs="{'invisible': [('error', '=', True)]}" colspan="2" />
+							attrs="{'invisible': [('error', '=', True), ('can_force', '=', False)]}" colspan="2" />
 						<button type="object" name="check_error" icon="gtk-execute" string="Check errors" 
 							attrs="{'invisible': [('error', '=', False)]}" colspan="2" />
 					</group>

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2018-08-14 12:57:02 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2018-11-06 16:35:55 +0000
@@ -138,6 +138,32 @@
         return res
 
 
+    def _get_location_dest_active_ok(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Returns True if there is draft moves on Picking Ticket
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        res = {}
+        for wiz in self.browse(cr, uid, ids, context=context):
+            res[wiz.id] = True
+            if not wiz.picking_id:
+                break
+            sys_int_moves = self.pool.get('stock.move').search(cr, uid, [
+                ('linked_incoming_move', 'in', [x.id for x in wiz.picking_id.move_lines]),
+                ('type', '=', 'internal'),
+            ], context=context)
+            for sys_move in self.pool.get('stock.move').browse(cr, uid, sys_int_moves, context=context):
+                if not sys_move.location_dest_id.active:
+                    res[wiz.id] = False
+                    break
+
+        return res
+
+
     _columns = {
         'move_ids': fields.one2many(
             'stock.move.in.processor',
@@ -198,6 +224,7 @@
             string='Claim Description',
         ),
         'display_process_to_ship_button': fields.function(_get_display_process_to_ship_button, method=True, type='boolean', string='Process to ship'),
+        'location_dest_active_ok': fields.function(_get_location_dest_active_ok, method=True, type='boolean', string='Dest location is inactive ?', store=False),
     }
 
     _defaults = {
@@ -359,6 +386,9 @@
                     _("You have to enter the quantities you want to process before processing the move")
                 )
 
+            if proc.direct_incoming and not proc.location_dest_active_ok:
+                self.write(cr, uid, [proc.id], {'direct_incoming': False}, context=context)
+
         if to_unlink:
             in_proc_obj.unlink(cr, uid, to_unlink, context=context)
 

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml	2018-05-29 13:24:45 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml	2018-11-06 16:35:55 +0000
@@ -20,6 +20,7 @@
                     </group>
                     <field name="contains_dg" invisible="1" />
                     <field name="contains_kc" invisible="1" />
+                    <field name="location_dest_active_ok" invisible="1"/>
                     <field name="draft" invisible="1" />
                     <group colspan="4" attrs="{'invisible': ['|', ('contains_dg', '=', True), ('contains_kc', '=', False)]}">
                         <html>
@@ -84,7 +85,9 @@
                         <button name="do_reset" type="object" string="Reset" attrs="{'invisible':[('draft','!=',True)]}" icon="gtk-go-forward" />
                         <button name="do_save_draft" type="object" string="Save as draft" icon="gtk-go-forward" />
                         <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                        <button name="do_incoming_shipment" type="object" string="Process" icon="gtk-go-forward" />
+                        <button name="do_incoming_shipment" type="object" string="Process" icon="gtk-go-forward" attrs="{'invisible': [('location_dest_active_ok', '!=', True)]}" />
+                        <button name="do_incoming_shipment" type="object" string="Process" icon="gtk-go-forward" attrs="{'invisible': [('location_dest_active_ok', '!=', False)]}"
+                            confirm="Warning the final destination location of these goods is no longer active, IN will be processed as normal but please check and process the Internal move created after manually. Continue ?" />
                         <button name="process_to_ship" attrs="{'invisible': [('display_process_to_ship_button', '!=', True)]}" type="object" string="Process to ship" icon="gtk-goto-last" />
                     </group>
                 </form>

=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor.py'
--- bin/addons/msf_outgoing/wizard/internal_move_processor.py	2018-08-10 12:46:33 +0000
+++ bin/addons/msf_outgoing/wizard/internal_move_processor.py	2018-11-06 16:35:55 +0000
@@ -131,6 +131,21 @@
 
         return super(internal_picking_processor, self).create(cr, uid, vals, context=context)
 
+
+    def check_destination_location(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        for wizard in self.browse(cr, uid, ids, context=context):
+            for line in wizard.move_ids:
+                if line.move_id and not line.move_id.location_dest_id.active:
+                    raise osv.except_osv(_('Error'), _('Warning, destination location is no longer active, please select an active location'))
+
+        return True
+
+
     def do_partial(self, cr, uid, ids, context=None):
         """
         Made some integrity check on lines and run the do_incoming_shipment of stock.picking
@@ -163,6 +178,7 @@
 
         self.integrity_check_quantity(cr, uid, wizard_brw_list, context)
         self.integrity_check_prodlot(cr, uid, wizard_brw_list, context=context)
+        self.check_destination_location(cr, uid, ids, context=context)
         # call stock_picking method which returns action call
         res = picking_obj.do_partial(cr, uid, ids, context=context)
         return self.return_hook_do_partial(cr, uid, ids, context=context, res=res)

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-10-30 10:56:14 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-11-06 16:35:55 +0000
@@ -101868,11 +101868,59 @@
 msgid " goods products, please refer to the appropriate procedures"
 msgstr " veuillez vous référer aux procédures adéquates."
 
+<<<<<<< TREE
 #. module: specific_rules
 #: view:export.report.stock.inventory:0
 msgid "Generate report (product list)"
 msgstr "Générer le rapport (liste de produits)"
 
+=======
+#. module: msf_outgoing
+#: view:stock.incoming.processor:0
+msgid "Warning the final destination location of these goods is no longer active, IN will be processed as normal but please check and process the Internal move created after manually."
+msgstr "Attention la location de stock finale pour ces biens n'est plus active, le IN va être executé normalement mais merci de vérifier et d'executer les mouvements internes résultants manuellement."
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/wizard/internal_move_processor.py:144
+#, python-format
+msgid "Warning, destination location is no longer active, please select an active location"
+msgstr "Attention, la location de stock finale n'est plus active, merci de selectionner une location active"
+
+#. module: stock
+#: code:addons/stock/stock.py:493
+#, python-format
+msgid "You cannot deactivate location %s because of the following products currently in stock:\n"
+" %s %s"
+msgstr "Vous ne pouvez pas desactiver la location %s car elle contient les produits suivants en stock:\n"
+" %s %s"
+
+#. module: stock
+#: code:addons/stock/stock.py:496
+#, python-format
+msgid "\n"
+"... and %s more"
+msgstr "\n"
+"... et %s en plus"
+
+#. module: stock
+#: code:addons/stock/stock.py:525
+#, python-format
+msgid "The location %s has open OUT stock moves:\n"
+""
+msgstr "La location %s a des mouvements de stock sortant ouverts:\n"
+""
+
+#. module: stock
+#: view:stock.location.confirm.deactivation:0
+msgid "There are open documents relating to this location or stock movements into this location, would you like to deactivation it anyway ?"
+msgstr "Des documents sont ouverts pour cette location ou il y a des mouvements de stock vers cette location, êtes-vous sûr de vouloir la désactiver ?"
+
+#. module: stock
+#: view:stock.location.confirm.deactivation:0
+msgid "Deactivate location"
+msgstr "Désactiver la location"
+
+>>>>>>> MERGE-SOURCE
 #. module: account_override
 #: code:addons/account_override/account.py:517
 #, python-format
@@ -101958,6 +102006,7 @@
 #: field:account.commitment.line,commit_number:0
 msgid "Commitment Voucher Number"
 msgstr "Numéro du Bon d'Engagement"
+<<<<<<< TREE
 
 #. module: account_mcdb
 #: code:addons/account_mcdb/account_mcdb.py:1494
@@ -102085,3 +102134,92 @@
 #, python-format
 msgid "%s months"
 msgstr "%s mois"
+=======
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:641
+#, python-format
+msgid "* You have at least one move to the location '%s' which is not 'Done'.\n"
+"Please click on the 'See moves' button to see which moves are still in progress to this location."
+msgstr "* Il y a au moins un mouvement de stock dans l'emplacement '%s' qui n'est pas clos.\n"
+"Merci de cliquer sur le bouton 'Voir les mouvements' pour voir les mouvements non clos."
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:652
+#, python-format
+msgid "* You have at least one move from or to the location '%s' which is not 'Done'.\n"
+"Please click on the 'See moves' button to see which moves are still in progress from/to this location."
+msgstr "* Il y a au moins un mouvement de stock dans l'emplacement '%s' qui n'est pas clos.\n"
+"Merci de cliquer sur le bouton 'Voir les mouvements' pour voir les mouvements non clos."
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:660
+#, python-format
+msgid "* The location '%s' is not empty of products.\n"
+"Please click on the 'Products in location' button to see which products are still in the location."
+msgstr "* L'emplacement '%s' n'est pas vide.\n"
+"Merci de cliquer sur le bouton 'Produits dans l'emplacement' pour voir les produits contenus dans cet emplacement."
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:667
+#, python-format
+msgid "* The location '%s' has children locations.\n"
+"Please remove all children locations before remove it.\n"
+"Please click on the 'Children locations' button to see all children locations."
+msgstr "* L'emplacement '%s' a des emplacements enfants\n"
+"Merci de d'abord supprimer ces emplacements enfants.\n"
+"Merci de cliquer sur le bouton 'Emplacements enfants' pour voir les emplacements enfants."
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:679
+#, python-format
+msgid "* Warning there are open IR with location '%s'.\n"
+" Please click on the 'See documents' button to see all children locations.\n"
+"\n"
+""
+msgstr "* Attention, il y a des demandes internes en cours pour l'emplacement '%s'.\n"
+"Merci de cliquer sur le bouton  'Voir les doucements' pour voir les emplacements enfants.\n"
+"\n"
+""
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:683
+#, python-format
+msgid "You have a problem with this location − Please see the message in the form for more information."
+msgstr "Il y a un problème avec cet emplacement de stock - Merci de lire le message dans le formulaire pour plus d'informations"
+
+#. module: msf_config_locations
+#: code:addons/msf_config_locations/stock_configuration.py:682
+#, python-format
+msgid "Be careful !"
+msgstr "Attention !"
+
+#. module: msf_config_locations
+#: view:stock.remove.location.wizard:0
+msgid "See moves"
+msgstr "Voir les mouvements"
+
+#. module: msf_config_locations
+#: view:stock.remove.location.wizard:0
+msgid "Products in location"
+msgstr "Produits dans l'emplacement"
+
+#. module: msf_config_locations
+#: view:stock.remove.location.wizard:0
+msgid "Children locations"
+msgstr "Emplacements enfants"
+
+#. module: msf_config_locations
+#: view:stock.remove.location.wizard:0
+msgid "See documents"
+msgstr "Voir les documents"
+
+#. module: msf_config_locations
+#: view:stock.remove.location.wizard:0
+msgid "Inactivate the location"
+msgstr "Desactiver l'emplacement"
+
+#. module: msf_config_locations
+#: view:stock.remove.location.wizard:0
+msgid "Check errors"
+msgstr "Tester les erreurs">>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/stock/__openerp__.py'
--- bin/addons/stock/__openerp__.py	2018-06-28 11:55:57 +0000
+++ bin/addons/stock/__openerp__.py	2018-11-06 16:35:55 +0000
@@ -60,6 +60,7 @@
         "wizard/stock_inventory_line_split_view.xml",
         "wizard/stock_change_standard_price_view.xml",
         'wizard/stock_return_picking_view.xml',
+        'wizard/stock_location_confirm_deactivation.xml',
         "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_view.xml",

=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2018-09-17 16:16:37 +0000
+++ bin/addons/stock/stock.py	2018-11-06 16:35:55 +0000
@@ -455,6 +455,8 @@
 
         return False
 
+
+
 stock_location()
 
 
@@ -612,6 +614,27 @@
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         return new_id
 
+
+    def _get_location_dest_active_ok(self, cr, uid, ids, field_name, args, context=None):
+        '''
+        Returns True if there is draft moves on Picking Ticket
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+
+        res = {}
+        for pick in self.browse(cr, uid, ids, fields_to_fetch=['move_lines'], context=context):
+            res[pick.id] = True
+            for int_move in self.pool.get('stock.move').browse(cr, uid, [x.id for x in pick.move_lines], fields_to_fetch=['location_dest_id'], context=context):
+                if not int_move.location_dest_id.active:
+                    res[pick.id] = False
+                    break
+
+        return res
+
+
     _columns = {
         'name': fields.char('Reference', size=64, select=True),
         'origin': fields.char('Origin', size=512, help="Reference of the document that produced this picking.", select=True),
@@ -657,6 +680,7 @@
         'claim': fields.boolean('Claim'),
         'claim_name': fields.char(string='Claim name', size=512),
         'physical_reception_date': fields.datetime('Physical Reception Date', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'location_dest_active_ok': fields.function(_get_location_dest_active_ok, method=True, type='boolean', string='Dest location is inactive ?', store=False),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2018-09-17 16:16:37 +0000
+++ bin/addons/stock/stock_view.xml	2018-11-06 16:35:55 +0000
@@ -510,7 +510,7 @@
                         <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="4"/>
                         <field name="icon" groups="base.group_extended" colspan="4"/>
                         <field name="scrap_location" groups="base.group_extended"/>
-                        <field name="active" groups="base.group_extended"/>
+                        <field name="active" groups="base.group_extended" readonly="1" />
                     </group>
                     <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>

=== modified file 'bin/addons/stock/wizard/__init__.py'
--- bin/addons/stock/wizard/__init__.py	2018-06-28 11:55:57 +0000
+++ bin/addons/stock/wizard/__init__.py	2018-11-06 16:35:55 +0000
@@ -38,5 +38,6 @@
 import physical_inventory_generate_counting_sheet
 import physical_inventory_import
 import manage_expired_stock
+import stock_location_confirm_deactivation
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== added file 'bin/addons/stock/wizard/stock_location_confirm_deactivation.py'
--- bin/addons/stock/wizard/stock_location_confirm_deactivation.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/stock_location_confirm_deactivation.py	2018-11-06 16:35:55 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class stock_location_confirm_deactivation(osv.osv_memory):
+    _name = 'stock.location.confirm.deactivation'
+
+    _columns = {
+        'location_id': fields.many2one('stock.location', string='Stock location to deactive'),
+        'message': fields.text('Message'),
+    }
+
+    def confirm_deactivation(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for wiz in self.browse(cr, uid, ids, context=context):
+            self.pool.get('stock.location').write(cr, uid, [wiz.location_id.id], {'active': False}, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
+
+    def close_wizard(self, cr, uid, ids, context=None):
+        '''
+        Just close the wizard
+        '''
+        if context is None:
+            context = {}
+        if isinstance(ids, (int,long)):
+            ids = [ids]
+        return {'type': 'ir.actions.act_window_close'}
+
+
+stock_location_confirm_deactivation()

=== added file 'bin/addons/stock/wizard/stock_location_confirm_deactivation.xml'
--- bin/addons/stock/wizard/stock_location_confirm_deactivation.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/stock_location_confirm_deactivation.xml	2018-11-06 16:35:55 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="stock_location_confirm_deactivation_form_view" model="ir.ui.view">
+            <field name="name">Confirm location deactivation</field>
+            <field name="model">stock.location.confirm.deactivation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm location deactivation">
+                    <group colspan="4" col="1">
+                        <html>
+                            <h3 style="text-align: center; margin: 13px"><translate>There are open documents relating to this location or stock movements into this location, would you like to deactivation it anyway ?</translate></h3>
+                        </html>
+                        <field name="message" nolabel="1" readonly="1" />
+                    </group>
+                    <newline />
+                    <separator string="Actions" />
+                    <button name="confirm_deactivation" string="Deactivate location" type="object" icon="terp-camera_test" colspan="2" />
+                    <button name="close_wizard" string="Close the wizard" type="object" icon="gtk-close" colspan="2" />
+                </form>
+            </field>
+        </record>  
+    </data>
+</openerp>  
+        

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2018-10-25 14:44:55 +0000
+++ bin/addons/stock_override/stock_view.xml	2018-11-06 16:35:55 +0000
@@ -342,7 +342,7 @@
                                 on_change="onchange_move()"
                                 attrs="{'readonly': [('from_manage_expired', '=', True)]}"
                                 >
-                                <tree colors="grey:scrapped == True; red: inactive_product or to_correct_ok or expired_lot" string="Stock Moves" noteditable="fake_state=='assigned' or linked_incoming_move != False" hide_new_button="context.get('from_wkf')" hide_delete_button="context.get('from_wkf')">
+                                <tree colors="grey:scrapped == True; red: inactive_product or to_correct_ok or expired_lot" string="Stock Moves" noteditable="linked_incoming_move != False" hide_new_button="context.get('from_wkf')" hide_delete_button="context.get('from_wkf')">
                                     <field name="line_number"/>
                                     <field name="product_id" />
                                     <field name="comment" />