Merge lp:~dorian-kemps/unifield-server/US-4980 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/kit/kit.py'
--- bin/addons/kit/kit.py	2020-02-24 12:16:24 +0000
+++ bin/addons/kit/kit.py	2020-08-24 07:25:52 +0000
@@ -180,6 +180,23 @@
         self.write(cr, uid, ids, {'state': 'done'}, context=context)
         return True
 
+    def reactivate_kit(self, cr, uid, ids, context=None):
+        '''
+        set the state of a Kit Composition List to 'completed'
+        '''
+        # Some verifications
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for kit in self.browse(cr, uid, ids, fields_to_fetch=['state'], context=context):
+            if kit.state != 'done':
+                raise osv.except_osv(_('Error'), _('You can only re-activate a Closed Kit Composition.'))
+
+        self.write(cr, uid, ids, {'state': 'completed'}, context=context)
+        return True
+
     def reset_to_version(self, cr, uid, ids, context=None):
         '''
         open confirmation wizard
@@ -235,16 +252,7 @@
                           }
                 item_obj.create(cr, uid, values, context=context)
             # we display the composition list view form
-            return {'name':_("Kit Composition List"),
-                    'view_mode': 'form,tree',
-                    'view_type': 'form',
-                    'res_model': 'composition.kit',
-                    'res_id': obj.id,
-                    'type': 'ir.actions.act_window',
-                    'target': 'dummy',
-                    'domain': [('composition_type', '=', 'real')],
-                    'context': {'composition_type':'real'},
-                    }
+            return {'type': 'ir.actions.act_window_close'}
 
     def _generate_item_mirror_objects(self, cr, uid, ids, wizard_data, context=None):
         """
 
=== modified file 'bin/addons/kit/kit_view.xml'
--- bin/addons/kit/kit_view.xml	2020-02-24 10:31:12 +0000
+++ bin/addons/kit/kit_view.xml	2020-08-24 07:25:52 +0000
@@ -177,7 +177,8 @@
                     	<button name="substitute_items" type="object" string="Substitute Items" icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('state', '!=', 'completed')]}" />
                         <button name="de_kitting" string="De-Kitting" type="object" icon="gtk-dnd-multiple" attrs="{'invisible': [('state', '!=', 'completed')]}" />
                         <button name="close_kit" string="Close" type="object" icon="gtk-close" attrs="{'invisible': [('state', '!=', 'completed')]}" />
-                    </group>
+                    	<button name="reactivate_kit" string="Re-activate" type="object" icon="gtk-undo" attrs="{'invisible': [('state', '!=', 'done')]}" />
+					</group>
             	</form>
             </field>
 		</record>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-08-21 08:22:41 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-08-24 07:25:52 +0000
@@ -70216,10 +70216,11 @@
 msgid "Sender's email"
 msgstr "Courriel de l'expéditeur"
 
-#. module: analytic_distribution
+#. module: analytic_distribution, kit
 #: view:account.analytic.account:0
+#: view:composition.kit:0
 msgid "Re-activate"
-msgstr "Re-activate"
+msgstr "Réactiver"
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/account.py:435
@@ -110447,6 +110448,12 @@
 msgid "is dispatched."
 msgstr "est expédié."
 
+#. module: kit
+#: code:addons/kit/kit.py:196
+#, python-format
+msgid "You can only re-activate a Closed Kit Composition."
+msgstr "Vous pouvez uniquement réactiver une Composition de Kit Cloturée."
+
 #. module: sale
 #: code:addons/sale/sale_workflow.py:584
 #, python-format