[MIG] stock_removal_by_location_priority: Migration to 17.0

closes #501 Signed-off-by: Matias Velazquez <[email protected]>
ingadhoc · Jul 31, 2024 · 969ae4c · 969ae4c
1 parent 3c1c079
commit 969ae4c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/stock_removal_by_location_priority/__manifest__.py b/stock_removal_by_location_priority/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Stock Removal by Location priority',
-    'version': "16.0.1.0.0",
+    'version': "17.0.1.0.0",
     'category': 'Warehouse Management',
     'sequence': 14,
     'summary': '',
@@ -18,7 +18,7 @@
     ],
     'demo': [
     ],
-    'installable': False,
+    'installable': True,
     'auto_install': False,
     'application': False,
     'pre_init_hook': 'pre_init_hook',

diff --git a/stock_removal_by_location_priority/init_hook.py b/stock_removal_by_location_priority/init_hook.py
@@ -6,41 +6,41 @@
 logger = logging.getLogger(__name__)
 
 
-def pre_init_hook(cr):
+def pre_init_hook(env):
     """
     The objective of this hook is to speed up the installation
     of the module on an existing Odoo instance.
 
     Without this script, big databases can take a long time to install this
     module.
     """
-    set_stock_location_removal_priority_default(cr)
-    set_stock_quant_removal_priority_default(cr)
+    set_stock_location_removal_priority_default(env)
+    set_stock_quant_removal_priority_default(env)
 
 
-def set_stock_location_removal_priority_default(cr):
-    cr.execute("""SELECT column_name
+def set_stock_location_removal_priority_default(env):
+    env.cr.execute("""SELECT column_name
     FROM information_schema.columns
     WHERE table_name='stock_location' AND
     column_name='removal_priority'""")
-    if not cr.fetchone():
+    if not env.cr.fetchone():
         logger.info('Creating field removal_priority on stock_location')
-        cr.execute(
+        env.cr.execute(
             """
             ALTER TABLE stock_location
             ADD COLUMN removal_priority integer
             DEFAULT 10;
             """)
 
 
-def set_stock_quant_removal_priority_default(cr):
-    cr.execute("""SELECT column_name
+def set_stock_quant_removal_priority_default(env):
+    env.cr.execute("""SELECT column_name
     FROM information_schema.columns
     WHERE table_name='stock_quant' AND
     column_name='removal_priority'""")
-    if not cr.fetchone():
+    if not env.cr.fetchone():
         logger.info('Creating field removal_priority on stock_quant')
-        cr.execute(
+        env.cr.execute(
             """
             ALTER TABLE stock_quant
             ADD COLUMN removal_priority integer

diff --git a/stock_removal_by_location_priority/models/stock_quant.py b/stock_removal_by_location_priority/models/stock_quant.py
@@ -8,9 +8,14 @@ class StockQuant(models.Model):
         related='location_id.removal_priority',
         store=True,
     )
-
+    
     @api.model
-    def _get_removal_strategy_order(self, removal_strategy=None):
+    def _get_removal_strategy_domain_order(self, domain, removal_strategy, qty):
+        if removal_strategy == 'priority':
+            return domain, 'removal_priority ASC, id'
+        return super()._get_removal_strategy_domain_order(domain, removal_strategy, qty)
+
+    def _get_removal_strategy_sort_key(self, removal_strategy):
         if removal_strategy == 'priority':
-            return 'removal_priority ASC, id'
-        return super()._get_removal_strategy_order(removal_strategy)
+            return lambda q: (q.removal_priority, q.id), False
+        return super()._get_removal_strategy_sort_key(removal_strategy)
diff --git a/stock_removal_by_location_priority/views/stock_location_views.xml b/stock_removal_by_location_priority/views/stock_location_views.xml
@@ -5,10 +5,12 @@
         <field name="model">stock.location</field>
         <field name="inherit_id" ref="stock.view_location_form"/>
         <field name="arch" type="xml">
-            <field name="removal_strategy_id" position="after">
-                <field name="removal_strategy_method" invisible="1"/>
-                <field name="removal_priority" attrs="{'invisible': [('removal_strategy_method', '!=', 'priority')]}"/>
-            </field>
+            <xpath expr="//group[@name='additional_info']" position="after">
+                <group string="Logistica" name="logistics">
+                    <field name="removal_strategy_method" invisible="1"/>
+                    <field name="removal_priority"/>
+                </group>
+            </xpath>
         </field>
     </record>