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

[jftempo]

=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2020-06-15 15:01:06 +0000
+++ bin/addons/base/rng/view.rng	2020-11-02 12:52:59 +0000
@@ -495,6 +495,7 @@
             <rng:optional><rng:attribute name="filter_selector"/></rng:optional>
             <rng:optional><rng:attribute name="default_selector"/></rng:optional>
             <rng:optional><rng:attribute name="o2m_selectable"/></rng:optional>
+            <rng:optional><rng:attribute name="m2m_selectable"/></rng:optional>
             <rng:optional><rng:attribute name="required_error_msg"/></rng:optional>
             <rng:optional><rng:attribute name="truncate"/></rng:optional>
             <rng:optional><rng:attribute name="tooltip"/></rng:optional>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-10-28 17:16:11 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-11-02 12:52:59 +0000
@@ -76468,7 +76468,7 @@
 msgid "Indicative Total Value"
 msgstr "Valeur totale"
 
-#. modules: tender_flow, account_override, purchase_allocation_report, register_accounting, msf_accrual, stock_forecast, analytic, msf_supply_doc_export, stock, msf_order_date, sales_followup, consumption_calculation, purchase_override, specific_rules, kit, out_step, base, purchase, account, msf_outgoing, sale, procurement, sourcing, stock_override, procurement_cycle
+#. modules: tender_flow, account_override, purchase_allocation_report, register_accounting, msf_accrual, stock_forecast, analytic, msf_supply_doc_export, stock, msf_order_date, sales_followup, consumption_calculation, purchase_override, specific_rules, kit, out_step, base, purchase, account, msf_outgoing, sale, procurement, sourcing, stock_override, procurement_cycle, product
 #: selection:account.invoice,state:0
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
@@ -76545,6 +76545,7 @@
 #: selection:replenishment.segment,state:0
 #: view:product.stock_out:0
 #: selection:product.stock_out,state:0
+#: selection:product.mass.update,state:0
 #, python-format
 msgid "Cancelled"
 msgstr "Annulé"
@@ -101973,11 +101974,6 @@
 
 #. module: product
 #: view:product.mass.update:0
-msgid "Delete Update"
-msgstr "Supprimer la Mise à Jour"
-
-#. module: product
-#: view:product.mass.update:0
 msgid "Apply Update"
 msgstr "Appliquer la Mise à Jour"
 
@@ -110285,6 +110281,7 @@
 #, python-format
 msgid "Writing file report at %s"
 msgstr "Écriture du fichier rapport sur %s"
+<<<<<<< TREE
 
 #. module: msf_tools
 #: view:automated.import:0
@@ -110306,3 +110303,15 @@
 #: view:stock.move:0
 msgid "Ship Closed Date"
 msgstr "Date de Clôture de l'Expédition"
+=======
+
+#. module: product
+#: view:product.mass.update:0
+msgid "Cancel Update"
+msgstr "Annuler la Mise à Jour"
+
+#. module: product
+#: view:product.mass.update:0
+msgid "Delete Selected Products"
+msgstr "Supprimer les Produits Sélectionnés"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/product/wizard/product_mass_update.py'
--- bin/addons/product/wizard/product_mass_update.py	2020-08-13 15:49:56 +0000
+++ bin/addons/product/wizard/product_mass_update.py	2020-11-02 12:52:59 +0000
@@ -38,7 +38,7 @@
 
     _columns = {
         'name': fields.char(size=64, string='Update Reference'),
-        'state': fields.selection(selection=[('draft', 'Draft'), ('in_progress', 'In Progress'), ('error', 'Error'), ('done', 'Done')], string='Status', readonly=True),
+        'state': fields.selection(selection=[('draft', 'Draft'), ('in_progress', 'In Progress'), ('error', 'Error'), ('done', 'Done'), ('cancel', 'Cancelled')], string='Status', readonly=True),
         'date_done': fields.datetime(string='Date of the update', readonly=True),
         'user_id': fields.many2one('res.users', string='User who Updated', readonly=True),
         'import_in_progress': fields.boolean(string='Import in progress'),
@@ -164,22 +164,29 @@
             return {'value': {'property_account_expense': False}}
         return {'value': {}}
 
+    def delete_products(self, cr, uid, ids, context=None):
+        '''
+        Delete the selected products
+        '''
+        if context is None:
+            context = {}
+        if not context.get('button_selected_ids'):
+            raise osv.except_osv(_('Warning'),  _('Please select at least one line'))
+
+        self.write(cr, uid, ids, {'product_ids': [(3, x) for x in context['button_selected_ids']]}, context=context)
+
+        return True
+
     def cancel_update(self, cr, uid, ids, context=None):
         '''
-        Delete the current Product Mass Update
+        Cancel the current Product Mass Update
         '''
         if context is None:
             context = {}
 
-        self.unlink(cr, uid, ids, context=context)
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
-        return {
-            'type': 'ir.actions.act_window',
-            'res_model': 'product.mass.update',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'target': 'crush',
-        }
+        return True
 
     def dummy(self, cr, uid, ids, context=None):
         """

=== modified file 'bin/addons/product/wizard/product_mass_update_view.xml'
--- bin/addons/product/wizard/product_mass_update_view.xml	2020-08-13 15:49:56 +0000
+++ bin/addons/product/wizard/product_mass_update_view.xml	2020-11-02 12:52:59 +0000
@@ -71,7 +71,7 @@
                             <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
                                 <button name="wizard_import_products" string="Import products" icon="gtk-dnd" colspan="2" type="object"/>
                             </group>
-                            <field name="product_ids" colspan="4" nolabel="1" attrs="{'readonly': [('state', '!=', 'draft')]}" domain="[('active', 'in', ['t', 'f']), ('expected_prod_creator', '=', True)]">
+                            <field name="product_ids" colspan="4" nolabel="1" attrs="{'readonly': [('state', '!=', 'draft')]}" domain="[('active', 'in', ['t', 'f']), ('expected_prod_creator', '=', True)]" m2m_selectable="2">
                                 <tree string="Products" hide_edit_button="1" colors="grey:active == False">
                                     <field name="default_code" />
                                     <field name="name" />
@@ -97,10 +97,11 @@
                             </field>
                         </page>
                     </notebook>
-                    <group colspan="4">
-                        <field name="state" colspan="2" />
-                        <button name="cancel_update" string="Delete Update" icon="gtk-cancel" colspan="1" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
-                        <button name="launch_update" string="Apply Update" icon="gtk-go-forward" colspan="1" type="object" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <field name="state" />
+                    <group col="3" colspan="6">
+                        <button name="cancel_update" string="Cancel Update" icon="gtk-cancel" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
+                        <button name="delete_products" string="Delete Selected Products" icon="gtk-del" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}" set_ids="product_ids"/>
+                        <button name="launch_update" string="Apply Update" icon="gtk-go-forward" type="object" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
                     </group>
                 </form>
             </field>
@@ -111,7 +112,7 @@
             <field name="model">product.mass.update</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Product Mass Update" noteditable="state!='draft'" hide_delete_button="1" colors="blue:state in ('draft');red:state in ('error')">
+                <tree string="Product Mass Update" noteditable="state!='draft'" hide_delete_button="1" colors="blue:state in ('draft');red:state in ('error');grey:state in ('cancel')">
                     <field name="name"/>
                     <field name="product_ids"/>
                     <field name="date_done"/>
@@ -184,13 +185,17 @@
                         <field name="date_done"  attrs="{'invisible': [('state', '!=', 'done')]}" />
                         <field name="user_id"  attrs="{'invisible': [('state', '!=', 'done')]}" />
                     </group>
-                    <button name="change_bn_ed" string="Apply Update" icon="gtk-go-forward" colspan="4" type="object" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <group colspan="4" col="6">
+                        <button name="cancel_update" string="Cancel Update" icon="gtk-cancel" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}"/>
+                        <button name="delete_products" string="Delete Selected Products" icon="gtk-del" type="object" attrs="{'invisible':[('state', '!=', 'draft')]}" set_ids="product_ids"/>
+                        <button name="change_bn_ed" string="Apply Update" icon="gtk-go-forward" type="object" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Products" attrs="{'invisible': [('state', '=', 'done')]}">
                             <group name="import" string=" Import Lines " colspan="4" attrs="{'invisible':[('state', '!=', 'draft')]}">
                                 <button name="wizard_import_products" string="Import products" icon="gtk-dnd" colspan="2" type="object"/>
                             </group>
-                            <field name="product_ids" colspan="4" nolabel="1" attrs="{'readonly': [('state', '!=', 'draft')]}" domain="[('expected_prod_creator', '=', 'bned')]" context="{'display_batch_attr': 1}">
+                            <field name="product_ids" colspan="4" nolabel="1" attrs="{'readonly': [('state', '!=', 'draft')]}" domain="[('expected_prod_creator', '=', 'bned')]" context="{'display_batch_attr': 1}" m2m_selectable="2">
                                 <tree string="Products" hide_edit_button="1" colors="grey:active == False">
                                     <field name="default_code" />
                                     <field name="name" />