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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2022-05-30 15:32:49 +0000
+++ bin/addons/msf_profile/data/patches.xml	2022-06-27 14:49:29 +0000
@@ -787,9 +787,17 @@
             <field name="method">us_5722_update_accruals</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_8259_remove_currency_table_wkf" model="patch.scripts">
             <field name="method">us_8259_remove_currency_table_wkf</field>
         </record>
 
+=======
+        <!-- UF26.0 -->
+        <record id="us_8428_pi_type_migration" model="patch.scripts">
+            <field name="method">us_8428_pi_type_migration</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-06-20 12:58:24 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-06-27 14:49:29 +0000
@@ -10132,11 +10132,6 @@
 msgid "Nauru"
 msgstr "Nauru"
 
-#. module: stock
-#: field:physical.inventory.select.products,full_inventory:0
-msgid "Full Inventory"
-msgstr "Inventaire Complet"
-
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
@@ -45790,11 +45785,6 @@
 msgid "Anguilla"
 msgstr "Anguille"
 
-#. module: stock
-#: view:physical.inventory:0
-msgid "Set as full inventory"
-msgstr "Marquer comme inventaire complet"
-
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:134
 #: code:addons/msf_doc_import/wizard/wizard_import_product_line.py:124
@@ -79033,11 +79023,6 @@
 msgid "Sourced"
 msgstr "Sourcé"
 
-#. module: stock
-#: view:physical.inventory:0
-msgid "Setting as 'full inventory' is irreversible. Do you confirm ?"
-msgstr "Marquer comme étant 'inventaire complet' est irréversible. Voulez-vous continuer ?"
-
 #. module: consumption_calculation
 #: model:ir.actions.report.xml,name:consumption_calculation.report_incoming_consumption_xls
 #: model:ir.actions.server,name:consumption_calculation.action_incoming_print_xml_export
@@ -115057,6 +115042,7 @@
 #, python-format
 msgid "Cannot update these products, ED/BN attributes have not changed since the KCL creation"
 msgstr "Impossible de mettre à jour ces produits. Les attributs NL/DE n'ont pas changé depuis la création du Kit"
+<<<<<<< TREE
 
 #. module: board
 #: report:addons/board/report/integrity.mako:83
@@ -115185,3 +115171,30 @@
 #, python-format
 msgid "Import error for account \"%s\" : Listing both Accounts/Destinations and G/L Accounts is not allowed"
 msgstr "Erreur lors de l'import du compte \"%s\" : Lister à la fois les Comptes/Destinations et les Comptes Grand Livre n'est pas permis"
+=======
+
+#. module: stock
+#: selection:physical.inventory,type:0
+msgid "Full Inventory count (planned)"
+msgstr "Comptage complet de l'Inventaire (planifié)"
+
+#. module: stock
+#: selection:physical.inventory,type:0
+msgid "Partial Inventory count (planned)"
+msgstr "Comptage partiel de l'Inventaire (planifié)"
+
+#. module: stock
+#: selection:physical.inventory,type:0
+msgid "Stock correction (unplanned)"
+msgstr "Correction du Stock (non planifiée)"
+
+#. module: stock
+#: field:physical.inventory,products_added:0
+msgid "Has products"
+msgstr "A des produits"
+
+#. module: stock
+#: field:physical.inventory,type:0
+msgid "Inventory Type"
+msgstr "Type d'Inventaire"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2022-05-30 15:32:49 +0000
+++ bin/addons/msf_profile/msf_profile.py	2022-06-27 14:49:29 +0000
@@ -56,12 +56,24 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     def us_8259_remove_currency_table_wkf(self, cr, uid, *a, **b):
         cr.execute("delete from wkf_workitem where act_id in (select id from wkf_activity where wkf_id = (select id from wkf where name='wkf.res.currency.table' and osv='res.currency.table'))")
         cr.execute("delete from wkf_activity where wkf_id = (select id from wkf where name='wkf.res.currency.table' and osv='res.currency.table')")
         cr.execute("delete from wkf where name='wkf.res.currency.table' and osv='res.currency.table'")
         return True
 
+=======
+    # UF26.0
+    def us_8428_pi_type_migration(self, cr, uid, *a, **b):
+        '''
+        In PIs, if full_inventory == True, set the type to 'full'
+        '''
+        cr.execute("""UPDATE physical_inventory SET type = 'full' WHERE full_inventory = 't'""")
+
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF25.0
     def us_8451_split_rr(self, cr, uid, *a, **b):
         if not cr.column_exists('replenishment_segment_line', 'rr_fmc_1') or not cr.column_exists('replenishment_segment_line', 'rr_max_1'):
 
=== modified file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	2022-05-19 09:23:30 +0000
+++ bin/addons/stock/physical_inventory.py	2022-06-27 14:49:29 +0000
@@ -105,6 +105,25 @@
 
         return totals
 
+    def _get_products_added(self, cr, uid, ids, field_name, arg, context=None):
+        if not ids:
+            return False
+
+        cr.execute("""
+            SELECT pi.id, count(rel.product_id)
+            FROM
+                physical_inventory pi
+            LEFT JOIN
+                physical_inventory_product_rel rel ON rel.product_id = pi.id
+            WHERE
+                pi.id in %s
+            GROUP BY pi.id
+        """, (tuple(ids), ))
+        ret = {}
+        for x in cr.fetchall():
+            ret[x[0]] = x[1] > 0
+
+        return ret
 
     _columns = {
         'ref': fields.char('Reference', size=64, readonly=True, sort_column='id'),
@@ -113,6 +132,7 @@
         'responsible': fields.char('Responsible', size=128, required=False, states={'closed': [('readonly',True)], 'cancel': [('readonly',True)]}),
         'date_done': fields.datetime('Date done', readonly=True),
         'date_confirmed': fields.datetime('Date confirmed', readonly=True),
+        # 'inventory_id' and 'product_id' seem to be inverted in product_ids
         'product_ids': fields.many2many('product.product', 'physical_inventory_product_rel',
                                         'product_id', 'inventory_id', string="Product selection", domain=[('type', 'not in', ['service_recep', 'consu'])], order_by="default_code"),
         'discrepancy_line_ids': fields.one2many('physical.inventory.discrepancy', 'inventory_id', 'Discrepancy lines',
@@ -127,6 +147,8 @@
         '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),
+        'type': fields.selection([('full', 'Full Inventory count (planned)'), ('partial', 'Partial Inventory count (planned)'),
+                                  ('correction', 'Stock correction (unplanned)')], 'Inventory Type', required=True, select=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'),
@@ -143,8 +165,9 @@
         'discrepancy_lines_percent_absvalue': fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Percent of absolute value of discrepancies")),
         'bad_stock_msg': fields.text('Bad Stock', readonly=1),
         'has_bad_stock': fields.boolean('Has bad Stock', readonly=1),
-        'max_filter_months': fields.integer('Months selected in "Products with recent movement at location" during Product Selection', readonly=1),
-        'multiple_filter_months': fields.boolean('Multiple Selection', readonly=1),
+        'max_filter_months': fields.integer('Months selected in "Products with recent movement at location" during Product Selection'),
+        'multiple_filter_months': fields.boolean('Multiple Selection'),
+        'products_added': fields.function(_get_products_added, method=True, type='boolean', string='Has products'),
     }
 
     _defaults = {
@@ -152,14 +175,15 @@
         'date': lambda *a: time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
         'state': 'draft',
         'full_inventory': False,
+        'type': 'partial',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'physical.inventory', context=c),
         'has_bad_stock': False,
         'discrepancies_generated': False,
         'max_filter_months': -1,
         'multiple_filter_months': False,
+        'products_added': False,
     }
 
-
     def create(self, cr, uid, values, context):
         context = context is None and {} or context
         values["ref"] = self.pool.get('ir.sequence').get(cr, uid, 'physical.inventory')
@@ -170,7 +194,6 @@
             raise osv.except_osv(_('Warning'), _("Location is inactive"))
         return new_id
 
-
     def copy(self, cr, uid, id_, default=None, context=None):
         default = default is None and {} or default
         context = context is None and {} or context
@@ -178,6 +201,7 @@
 
         default['state'] = 'draft'
         default['date'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        default['type'] = 'partial'
         fields_to_empty = ["ref",
                            "full_inventory",
                            "date_done",
@@ -197,19 +221,14 @@
 
         return super(PhysicalInventory, self).copy(cr, uid, id_, default, context=context)
 
-
     def perm_write(self, cr, user, ids, fields, context=None):
         pass
 
-
-    def set_full_inventory(self, cr, uid, ids, context=None):
-        context = context is None and {} or context
-
-        # Set full inventory as true and unlink all products already selected
-        self.write(cr, uid, ids, {'full_inventory': True,
-                                  'product_ids': [(5)]}, context=context)
-        return {}
-
+    def onchange_products(self, cr, uid, ids, product_ids, context=None):
+        res = {'value': {'products_added': product_ids != [(6, 0, [])]}}
+        if product_ids == [(6, 0, [])]:
+            res['value'].update({'max_filter_months': -1, 'multiple_filter_months': False})
+        return res
 
     def action_select_products(self, cr, uid, ids, context=None):
         """
@@ -229,13 +248,12 @@
         assert len(ids) == 1
         inventory_id = ids[0]
 
-        # Is it a full inventory ?
-        full_inventory = read_single(self._name, inventory_id, 'full_inventory')
-
-        # Create the wizard
+        # Create the wizard, check if it is a full inventory
         wiz_model = 'physical.inventory.select.products'
-        wiz_values = {"inventory_id": inventory_id,
-                      "full_inventory": full_inventory }
+        wiz_values = {
+            "inventory_id": inventory_id,
+            "full_inventory": read_single(self._name, inventory_id, 'type') == 'full'
+        }
         wiz_id = create(wiz_model, wiz_values)
         context['wizard_id'] = wiz_id
 
 
=== modified file 'bin/addons/stock/physical_inventory_view.xml'
--- bin/addons/stock/physical_inventory_view.xml	2020-11-30 15:46:46 +0000
+++ bin/addons/stock/physical_inventory_view.xml	2022-06-27 14:49:29 +0000
@@ -25,18 +25,17 @@
                     <field name="date" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                     <field name="responsible"/>
                     <field name="date_done"/>
-                    <field name="full_inventory"/>
+                    <field name="type" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('products_added', '=', True)]}"/>
                     <field name="discrepancies_generated" invisible="1" readonly="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 ?" 
-                        attrs="{'invisible': [('full_inventory', '=', True)]}"/>
+                    <field name="max_filter_months" invisible="1"/>
+                    <field name="multiple_filter_months" invisible="1"/>
+                    <field name="products_added" invisible="1" readonly="1"/>
                     <notebook colspan="4">
                         <page string="Products" attrs="{'readonly': [('state', 'not in', ['draft'])]}">
                             <button name="action_select_products" states="draft" string="Products Selection" type="object"
-                                    icon="gtk-add"/>
-                                <field colspan="4" name="product_ids" nolabel="1" 
-                                       attrs="{'readonly': ['|', ('full_inventory', '=', True), ('state', 'not in', ['draft'])]}">
+                                    icon="gtk-add" attrs="{'invisible': [('type', '=', 'correction')]}"/>
+                                <field colspan="4" name="product_ids" nolabel="1" on_change="onchange_products(product_ids)"
+                                       attrs="{'readonly': ['|', ('type', '=', 'full'), ('state', '!=', 'draft')]}">
                                 <tree string="Products" noteditable="1">
                                     <field name="default_code"/>
                                     <field name="name"/>
 
=== modified file 'bin/addons/stock/wizard/physical_inventory_select_products.py'
--- bin/addons/stock/wizard/physical_inventory_select_products.py	2021-08-16 15:44:14 +0000
+++ bin/addons/stock/wizard/physical_inventory_select_products.py	2022-06-27 14:49:29 +0000
@@ -393,7 +393,7 @@
         product_ids = self.pool.get("product.product").search(cr, uid, [("id", 'in', product_ids)], context=context)
 
         # '6' is the code for 'replace all'
-        vals = {'product_ids': [(6, 0, product_ids)]}
+        vals = {'product_ids': [(6, 0, product_ids)], 'products_added': True}
 
         # Check if 'recent_movements' has been used
         if wiz_data['products_preview'] and (wiz_data['first_filter'] == 'recent_movements' or wiz_data['full_inventory'] and wiz_data['recent_moves_months_fullinvo']):