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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2023-08-16 09:21:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-10-23 07:51:07 +0000
@@ -4859,8 +4859,6 @@
 
 #. module: stock_override
 #: view:stock.move.cancel.wizard:0
-#: view:stock.move.cancel.more.wizard:0
-#: view:stock.picking.cancel.more.wizard:0
 #: view:stock.picking.cancel.wizard:0
 msgid "Cancel Only"
 msgstr "Annuler Seulement"
@@ -9752,10 +9750,16 @@
 
 #. module: stock_override
 #: view:stock.picking.cancel.wizard:0
-#: view:stock.picking.cancel.more.wizard:0
+#: code:addons/stock_override/stock.py:723
 msgid "Cancel Picking"
 msgstr "Annuler Picking"
 
+#. module: stock_override
+#: code:addons/stock_override/stock.py:725
+#, python-format
+msgid "Cancel OUT"
+msgstr "Annuler Livraison OUT"
+
 #. module: analytic_distribution
 #: selection:account.commitment,type:0
 #: selection:account.commitment.line,commit_type:0
@@ -69554,7 +69558,6 @@
 #: field:allocation.stock.setup,error_sm_central_ids:0
 #: field:allocation.stock.setup,error_sm_cross_ids:0
 #: view:stock.move:0
-#: field:stock.picking.cancel.more.wizard,picking_id:0
 #: view:change.dest.location:0
 msgid "Picking"
 msgstr "Picking"
@@ -80191,7 +80194,6 @@
 
 #. module: stock_override
 #: view:stock.move.cancel.wizard:0
-#: view:stock.move.cancel.more.wizard:0
 msgid "Cancel move"
 msgstr "Annuler le mouvement"
 
@@ -84193,7 +84195,6 @@
 #: field:stock.certificate.valuation,move_id:0
 #: field:purchase.order.followup.line,move_id:0
 #: field:report.stock.move,move:0
-#: field:stock.move.cancel.more.wizard,move_id:0
 #: field:change.dest.location,picking_id:0
 #: field:return.ppl.move.processor,move_id:0
 msgid "Move"
@@ -91628,8 +91629,6 @@
 #: view:reserved.products.wizard:0
 #: view:stock.expired.damaged.report:0
 #: view:stock.reception.wizard:0
-#: view:stock.move.cancel.more.wizard:0
-#: view:stock.picking.cancel.more.wizard:0
 #: view:product.ask.activate.wizard:0
 #: view:wizard.cancel.lines:0
 #: view:shipment.add.pack.processor:0
@@ -102646,14 +102645,14 @@
 msgstr "Le %s id:%s (%s) a été annulé."
 
 #. module: stock_override
-#: view:stock.move.cancel.more.wizard:0
-#: view:stock.picking.cancel.more.wizard:0
+#: view:stock.move.cancel.wizard:0
+#: view:stock.picking.cancel.wizard:0
 msgid "Do not cancel"
 msgstr "Ne pas annuler"
 
 #. module: stock_override
-#: view:stock.move.cancel.more.wizard:0
-#: view:stock.picking.cancel.more.wizard:0
+#: view:stock.move.cancel.wizard:0
+#: view:stock.picking.cancel.wizard:0
 msgid "Cancel & create Internal Move"
 msgstr "Annuler & créer un Mouvement Interne"
 
@@ -102679,26 +102678,14 @@
 msgstr "RAPPORT DU STOCK NON ALLOUÉ"
 
 #. module: stock_override
-#: view:stock.picking.cancel.more.wizard:0
-msgid "\n"
-"                                Cancelling these moves might result in unreserved stock.<br/>\n"
-"                                Do you want to create an Internal Move or update the existing one to reallocate the quantities ?\n"
-"                            "
-msgstr "\n"
-"                                Annuler ces mouvements peut générer du stock non alloué.<br/>\n"
-"                                Voulez-vous créer un Mouvement Interne ou mettre à jour l'existant pour réattribuer les quantités ?\n"
-"                            "
+#: view:stock.picking.cancel.wizard:0
+msgid "Cancelling these moves might result in unreserved stock. Do you want to create an Internal Move or update the existing one to reallocate the quantities ?"
+msgstr "Annuler ces mouvements peut générer du stock non alloué. Voulez-vous créer un Mouvement Interne ou mettre à jour l'existant pour réattribuer les quantités ?"
 
 #. module: stock_override
-#: view:stock.move.cancel.more.wizard:0
-msgid "\n"
-"                                Cancelling this move might result in unreserved stock.<br/>\n"
-"                                Do you want to create an Internal Move or update the existing one to reallocate the quantities ?\n"
-"                            "
-msgstr "\n"
-"                                Annuler ce mouvement peut générer du stock non alloué.<br/>\n"
-"                                Voulez-vous créer un Mouvement Interne ou mettre à jour l'existant pour réattribuer les quantités ?\n"
-"                            "
+#: view:stock.move.cancel.wizard:0
+msgid "Cancelling this move might result in unreserved stock. Do you want to create an Internal Move or update the existing one to reallocate the quantities ?"
+msgstr "Annuler ce mouvement peut générer du stock non alloué. Voulez-vous créer un Mouvement Interne ou mettre à jour l'existant pour réattribuer les quantités ?"
 
 #. module: stock
 #: report:addons/stock/report/unreserved_stock_report_xls.mako:84
@@ -103346,6 +103333,11 @@
 
 #. module: stock_override
 #: view:stock.picking.cancel.wizard:0
+msgid "If you click on 'Cancel & Resource' button, all lines of this Picking attached to a Field order or an Internal Request will be re-sourced. All lines or quantities already processed wouldn't be re-sourced."
+msgstr "Si vous cliquez sur 'Annuler & Réallouer', toutes les lignes du Bon de Picking attachées à une CdT ou à une Demande Interne seront re-sourcées. Les quantités et les lignes déjà traitées ne seront pas impactées."
+
+#. module: stock_override
+#: view:stock.picking.cancel.wizard:0
 msgid "If you click on 'Cancel & Resource' button, all lines of this delivery OUT attached to a Field order or an Internal Request will be re-sourced. All lines or quantities already processed wouldn't be re-sourced."
 msgstr "Si vous cliquez sur 'Annuler & Réallouer', toutes les lignes du Bon de Livraison attachées à une CdT ou à une Demande Interne seront re-sourcées. Les quantités et les lignes déjà traitées ne seront pas impactées."
 

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2023-07-24 15:36:24 +0000
+++ bin/addons/stock_override/stock.py	2023-10-23 07:51:07 +0000
@@ -710,7 +710,7 @@
         '''
         if isinstance(ids, (int, long)):
             ids = [ids]
-        for pick_data in self.read(cr, uid, ids, ['sale_id', 'purchase_id', 'subtype', 'state'], context=context):
+        for pick_data in self.read(cr, uid, ids, ['sale_id', 'purchase_id', 'type', 'subtype', 'state'], context=context):
             # if draft and shipment is in progress, we cannot cancel
             if pick_data['subtype'] == 'picking' and pick_data['state'] in ('draft',):
                 if self.has_picking_ticket_in_progress(cr, uid, [pick_data['id']], context=context)[pick_data['id']]:
@@ -720,8 +720,12 @@
                 raise osv.except_osv(_('Warning !'), _('The shipment process is completed and cannot be canceled!'))
 
             if pick_data['sale_id'] or pick_data['purchase_id']:
+                wiz_title = _('Cancel Picking')
+                if pick_data['type'] == 'out' and pick_data['subtype'] == 'standard':
+                    wiz_title = _('Cancel OUT')
                 return {'type': 'ir.actions.act_window',
                         'res_model': 'stock.picking.cancel.wizard',
+                        'name': wiz_title,
                         'view_type': 'form',
                         'view_mode': 'form',
                         'target': 'new',
@@ -2058,20 +2062,8 @@
         'display_warning': False,
     }
 
-    def ask_cancel(self, cr, uid, ids, context=None, *args, **kw):
-        if context is None:
-            context = {}
-
-        move_id = self.pool.get('stock.move.cancel.wizard').read(cr, uid, ids[0], ['move_id'], context=context)['move_id']
-        wiz_id = self.pool.get('stock.move.cancel.more.wizard').create(cr, uid, {'move_id': move_id}, context=context)
-
-        return {'type': 'ir.actions.act_window',
-                'res_model': 'stock.move.cancel.more.wizard',
-                'view_type': 'form',
-                'view_mode': 'form',
-                'target': 'new',
-                'res_id': wiz_id,
-                'context': context}
+    def no_cancel(self, uid, ids, context=None, *args, **kw):
+        return {'type': 'ir.actions.act_window_close'}
 
     def is_in_forced(self, cr, uid, picking_browse, context=None):
         return picking_browse.state == 'assigned' and \
@@ -2079,7 +2071,6 @@
             picking_browse.purchase_id.partner_type in ('internal', 'section', 'intermission') and \
             picking_browse.purchase_id.order_type != 'direct'
 
-
     def just_cancel(self, cr, uid, ids, context=None):
         '''
         Just call the cancel of stock.move (re-sourcing flag not set)
@@ -2136,62 +2127,6 @@
 
         return self.just_cancel(cr, uid, ids, context=context)
 
-
-stock_move_cancel_wizard()
-
-
-class stock_move_cancel_more_wizard(osv.osv_memory):
-    _name = 'stock.move.cancel.more.wizard'
-
-    _columns = {
-        'move_id': fields.many2one('stock.move', string='Move', required=True),
-    }
-
-    _defaults = {
-        'move_id': lambda self, cr, uid, c: c.get('active_id'),
-    }
-
-    def no_cancel(self, uid, ids, context=None, *args, **kw):
-        return {'type': 'ir.actions.act_window_close'}
-
-    def just_cancel(self, cr, uid, ids, context=None):
-        '''
-        Just call the cancel of stock.move (re-sourcing flag not set)
-        '''
-        # Objects
-        move_obj = self.pool.get('stock.move')
-        pick_obj = self.pool.get('stock.picking')
-
-        wf_service = netsvc.LocalService("workflow")
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-
-        for wiz in self.browse(cr, uid, ids, context=context):
-            move_id = wiz.move_id.id
-            picking_id = wiz.move_id.picking_id.id
-            move_obj.action_cancel(cr, uid, [wiz.move_id.id], context=context)
-            move_ids = move_obj.search(cr, uid, [('id', '=', wiz.move_id.id)],
-                                       limit=1, order='NO_ORDER', context=context)
-            if move_ids and  wiz.move_id.has_to_be_resourced:
-                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s (%s) has been canceled and resourced" % (
-                    move_id,
-                    picking_id,
-                    pick_obj.read(cr, uid, picking_id, ['name'], context=context)['name'],
-                ))
-            else:
-                self.infolog(cr, uid, "The stock.move id:%s of the picking id:%s (%s) has been canceled" % (
-                    move_id,
-                    picking_id,
-                    pick_obj.read(cr, uid, picking_id, ['name'], context=context)['name'],
-                ))
-
-            if move_ids and wiz.move_id.picking_id:
-                lines = wiz.move_id.picking_id.move_lines
-                if all(l.state == 'cancel' for l in lines):
-                    wf_service.trg_validate(uid, 'stock.picking', wiz.move_id.picking_id.id, 'button_cancel', cr)
-
-        return {'type': 'ir.actions.act_window_close'}
-
     def cancel_and_create_int(self, cr, uid, ids, context=None):
         """
         Create/Update INT with stock in Cross Docking while cancelling Picking
@@ -2285,7 +2220,7 @@
         return {'type': 'ir.actions.act_window_close'}
 
 
-stock_move_cancel_more_wizard()
+stock_move_cancel_wizard()
 
 
 class stock_picking_cancel_wizard(osv.osv_memory):
@@ -2321,32 +2256,34 @@
 
         return False
 
+    def _get_doc_type(self, cr, uid, context=None):
+        """
+        Is the document an OUT, a Pick or something else ?
+        """
+        if context is None:
+            context = {}
+
+        picking_id = context.get('active_id')
+        pick = self.pool.get('stock.picking').read(cr, uid, picking_id, ['type', 'subtype'], context=context)
+
+        return pick['type'] == 'out' and (pick['subtype'] == 'standard' and 'out' or pick['subtype'] == 'picking' and 'pick') or 'other'
+
     _columns = {
         'picking_id': fields.many2one('stock.picking', string='Picking', required=True),
         'allow_cr': fields.boolean(string='Allow Cancel and resource'),
         'has_moves_from_cross_docking': fields.boolean(string='Is one of the moves from the Cross docking Location ?'),
+        'doc_type': fields.selection(string="Document Type", selection=[('out', 'OUT'), ('pick', 'Picking'), ('other', 'Other')]),
     }
 
     _defaults = {
         'picking_id': lambda self, cr, uid, c: c.get('active_id'),
         'allow_cr': _get_allow_cr,
         'has_moves_from_cross_docking': _check_from_cross_docking,
+        'doc_type': _get_doc_type,
     }
 
-    def ask_cancel(self, cr, uid, ids, context=None, *args, **kw):
-        if context is None:
-            context = {}
-
-        picking_id = self.pool.get('stock.picking.cancel.wizard').read(cr, uid, ids[0], ['picking_id'], context=context)['picking_id']
-        wiz_id = self.pool.get('stock.picking.cancel.more.wizard').create(cr, uid, {'picking_id': picking_id}, context=context)
-
-        return {'type': 'ir.actions.act_window',
-                'res_model': 'stock.picking.cancel.more.wizard',
-                'view_type': 'form',
-                'view_mode': 'form',
-                'target': 'new',
-                'res_id': wiz_id,
-                'context': context}
+    def no_cancel(self, uid, ids, context=None, *args, **kw):
+        return {'type': 'ir.actions.act_window_close'}
 
     def just_cancel(self, cr, uid, ids, context=None):
         '''
@@ -2396,50 +2333,6 @@
 
         return self.just_cancel(cr, uid, ids, context=context)
 
-
-stock_picking_cancel_wizard()
-
-
-class stock_picking_cancel_more_wizard(osv.osv_memory):
-    _name = 'stock.picking.cancel.more.wizard'
-
-    _columns = {
-        'picking_id': fields.many2one('stock.picking', string='Picking', required=True),
-    }
-
-    _defaults = {
-        'picking_id': lambda self, cr, uid, c: c.get('active_id'),
-    }
-
-    def no_cancel(self, uid, ids, context=None, *args, **kw):
-        return {'type': 'ir.actions.act_window_close'}
-
-    def just_cancel(self, cr, uid, ids, context=None):
-        '''
-        Just call the cancel of the stock.picking
-        '''
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        msg_type = {
-            'in': 'Incoming Shipment',
-            'internal': 'Internal Picking',
-            'out': {
-                'standard': 'Delivery Order',
-                'picking': 'Picking Ticket',
-            }
-        }
-
-        wf_service = netsvc.LocalService("workflow")
-        for wiz in self.browse(cr, uid, ids, context=context):
-            wf_service.trg_validate(uid, 'stock.picking', wiz.picking_id.id, 'button_cancel', cr)
-            self.infolog(cr, uid, "The %s id:%s (%s) has been canceled." % (
-                wiz.picking_id.type == 'out' and msg_type.get('out', {}).get(wiz.picking_id.subtype, '') or msg_type.get(wiz.picking_id.type),
-                wiz.picking_id.id,
-                wiz.picking_id.name,
-            ))
-
-        return {'type': 'ir.actions.act_window_close'}
-
     def cancel_and_create_int(self, cr, uid, ids, context=None):
         """
         Create/Update INT with stock in Cross Docking while cancelling Picking
@@ -2541,4 +2434,4 @@
         return {'type': 'ir.actions.act_window_close'}
 
 
-stock_picking_cancel_more_wizard()
+stock_picking_cancel_wizard()

=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2023-08-08 09:24:25 +0000
+++ bin/addons/stock_override/stock_view.xml	2023-10-23 07:51:07 +0000
@@ -1118,40 +1118,29 @@
             <field name="arch" type="xml">
                 <form string="Cancel Picking">
                     <field name="allow_cr" invisible="1" />
-                    <group colspan="4" col="1" attrs="{'invisible': [('allow_cr', '=', False)]}">
+                    <field name="has_moves_from_cross_docking" invisible="1" />
+                    <field name="doc_type" invisible="1" />
+                    <group colspan="4" col="1" attrs="{'invisible': ['|', ('allow_cr', '=', False), ('doc_type', '!=', 'pick')]}">
+                        <html>
+                            <h4 style="text-align: center; margin: 10px"><translate>If you click on 'Cancel &amp; Resource' button, all lines of this Picking attached to a Field order or an Internal Request will be re-sourced. All lines or quantities already processed wouldn't be re-sourced.</translate></h4>
+                        </html>
+                    </group>
+                    <group colspan="4" col="1" attrs="{'invisible': ['|', ('allow_cr', '=', False), ('doc_type', '=', 'pick')]}">
                         <html>
                             <h4 style="text-align: center; margin: 10px"><translate>If you click on 'Cancel &amp; Resource' button, all lines of this delivery OUT attached to a Field order or an Internal Request will be re-sourced. All lines or quantities already processed wouldn't be re-sourced.</translate></h4>
                         </html>
                     </group>
+                    <group colspan="4" col="1" attrs="{'invisible': [('has_moves_from_cross_docking', '=', False)]}">
+                        <html>
+                            <h4 style="text-align: center; margin: 10px"><translate>Cancelling these moves might result in unreserved stock. Do you want to create an Internal Move or update the existing one to reallocate the quantities ?</translate></h4>
+                        </html>
+                    </group>
                     <newline />
                     <separator string="Actions" />
-                    <field name="has_moves_from_cross_docking" invisible="1" />
-                    <button name="ask_cancel" string="Cancel" type="object" icon="gtk-cancel" colspan="1" attrs="{'invisible': [('has_moves_from_cross_docking', '=', False)]}" />
-                    <button name="just_cancel" string="Cancel Only" type="object" icon="gtk-cancel" colspan="1" attrs="{'invisible': [('has_moves_from_cross_docking', '=', True)]}" />
+                    <button name="no_cancel" string="Do not cancel" type="object" icon="gtk-undo" colspan="1" />
+                    <button name="just_cancel" string="Cancel Only" type="object" icon="gtk-cancel" colspan="1" />
                     <button name="cancel_and_resource" string="Cancel &amp; Resource" type="object" icon="gtk-cancel" colspan="1" attrs="{'invisible': [('allow_cr', '=', False)]}" />
-                </form>
-            </field>
-        </record>
-
-        <record id="stock_picking_cancel_more_wizard" model="ir.ui.view">
-            <field name="name">stock.picking.cancel.more.wizard</field>
-            <field name="model">stock.picking.cancel.more.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Cancel Picking">
-                    <group colspan="4" col="1">
-                        <html>
-                            <h4 style="text-align: center; margin: 10px"><translate>
-                                Cancelling these moves might result in unreserved stock.<br/>
-                                Do you want to create an Internal Move or update the existing one to reallocate the quantities ?
-                            </translate></h4>
-                        </html>
-                    </group>
-                    <newline />
-                    <separator string="Actions" />
-                    <button name="no_cancel" string="Do not cancel" type="object" icon="gtk-undo" colspan="1" />
-                    <button name="just_cancel" string="Cancel Only" type="object" icon="gtk-cancel" colspan="1" />
-                    <button name="cancel_and_create_int" string="Cancel &amp; create Internal Move" type="object" icon="terp-document-new" colspan="1" />
+                    <button name="cancel_and_create_int" string="Cancel &amp; create Internal Move" type="object" icon="terp-document-new" colspan="1" attrs="{'invisible': [('has_moves_from_cross_docking', '=', False)]}" />
                 </form>
             </field>
         </record>
@@ -1177,39 +1166,21 @@
                             <h2 style="text-align: center; margin: 10px"><translate>Warning! There is a risk of producing inconsistent data if you cancel this line before it receives the delivery details and is changed into status "Available Shipped" after synchronization.</translate></h2>
                         </html>
                     </group>
+                    <group colspan="4" col="1" attrs="{'invisible': [('is_move_from_cross_docking', '=', False)]}">
+                        <html>
+                            <h4 style="text-align: center; margin: 10px"><translate>Cancelling this move might result in unreserved stock. Do you want to create an Internal Move or update the existing one to reallocate the quantities ?</translate></h4>
+                        </html>
+                    </group>
                     <newline />
                     <field name="cancel_only" invisible="1" />
                     <field name="from_dpo" invisible="1" />
                     <field name="display_warning" invisible="1" />
                     <field name="is_move_from_cross_docking" invisible="1" />
                     <separator string="Actions" colspan="4" />
-                    <button name="ask_cancel" string="Cancel" type="object" icon="gtk-execute" colspan="1" attrs="{'invisible': [('is_move_from_cross_docking', '=', False)]}" />
-                    <button name="just_cancel" string="Cancel Only" type="object" icon="gtk-execute" colspan="1" attrs="{'invisible': [('is_move_from_cross_docking', '=', True)]}" />
-                    <button name="cancel_and_resource" string="Cancel and Resource" type="object" icon="gtk-execute" colspan="1"
-                    attrs="{'invisible': [('cancel_only', '=', True)]}" />
-                </form>
-            </field>
-        </record>
-
-        <record id="stock_move_cancel_more_wizard_form_view" model="ir.ui.view">
-            <field name="name">stock.move.cancel.more.wizard.form.view</field>
-            <field name="model">stock.move.cancel.more.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Cancel move">
-                    <group colspan="4" col="1">
-                        <html>
-                            <h4 style="text-align: center; margin: 10px"><translate>
-                                Cancelling this move might result in unreserved stock.<br/>
-                                Do you want to create an Internal Move or update the existing one to reallocate the quantities ?
-                            </translate></h4>
-                        </html>
-                    </group>
-                    <newline />
-                    <separator string="Actions" colspan="4" />
                     <button name="no_cancel" string="Do not cancel" type="object" icon="gtk-undo" colspan="1" />
-                    <button name="just_cancel" string="Cancel Only" type="object" icon="gtk-execute" colspan="1" />
-                    <button name="cancel_and_create_int" string="Cancel &amp; create Internal Move" type="object" icon="terp-document-new" colspan="1" />
+                    <button name="just_cancel" string="Cancel Only" type="object" icon="gtk-cancel" colspan="1" />
+                    <button name="cancel_and_resource" string="Cancel and Resource" type="object" icon="gtk-execute" colspan="1" attrs="{'invisible': [('cancel_only', '=', True)]}" />
+                    <button name="cancel_and_create_int" string="Cancel &amp; create Internal Move" type="object" icon="terp-document-new" colspan="1" attrs="{'invisible': [('is_move_from_cross_docking', '=', False)]}" />
                 </form>
             </field>
         </record>