From d9b275e181137265bfe499c9cfce643a677d6e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 18 Sep 2024 18:14:58 +0200
Subject: [PATCH] Move "Open Lines" button to product price list module

Closes #13527
---
 modules/product_price_list/CHANGELOG          |  1 +
 modules/product_price_list/__init__.py        |  1 +
 modules/product_price_list/price_list.py      | 18 +++++++++
 modules/product_price_list/price_list.xml     | 28 +++++++++++++
 .../view/price_list_form.xml                  |  1 +
 .../view/price_list_line_context_form.xml}    |  8 ++--
 modules/product_price_list_dates/product.py   | 39 ++++++++++++------
 modules/product_price_list_dates/product.xml  | 40 +------------------
 .../view/price_list_line_context_form.xml     | 12 ++++--
 9 files changed, 88 insertions(+), 60 deletions(-)
 rename modules/{product_price_list_dates/view/price_list_form.xml => product_price_list/view/price_list_line_context_form.xml} (55%)

diff --git a/modules/product_price_list/CHANGELOG b/modules/product_price_list/CHANGELOG
index 97d822783b..f90da410d9 100644
--- a/modules/product_price_list/CHANGELOG
+++ b/modules/product_price_list/CHANGELOG
@@ -1,3 +1,4 @@
+* Add button to open price list lines
 
 Version 7.2.0 - 2024-04-29
 --------------------------
diff --git a/modules/product_price_list/__init__.py b/modules/product_price_list/__init__.py
index 7a82f2dd25..23cbc2447e 100644
--- a/modules/product_price_list/__init__.py
+++ b/modules/product_price_list/__init__.py
@@ -12,4 +12,5 @@ def register():
     Pool.register(
         price_list.PriceList,
         price_list.PriceListLine,
+        price_list.PriceListLineContext,
         module='product_price_list', type_='model')
diff --git a/modules/product_price_list/price_list.py b/modules/product_price_list/price_list.py
index 7a75124afc..f96a2beb33 100644
--- a/modules/product_price_list/price_list.py
+++ b/modules/product_price_list/price_list.py
@@ -66,6 +66,13 @@ class PriceList(DeactivableMixin, ModelSQL, ModelView):
         help="Add price formulas for different criteria.\n"
         "The first matching line is used.")
 
+    @classmethod
+    def __setup__(cls):
+        super().__setup__()
+        cls._buttons.update({
+                'open_lines': {},
+                })
+
     @staticmethod
     def default_company():
         return Transaction().context.get('company')
@@ -102,6 +109,12 @@ class PriceList(DeactivableMixin, ModelSQL, ModelView):
     def get_uom(self, product):
         return product.default_uom
 
+    @classmethod
+    @ModelView.button_action(
+        'product_price_list.act_price_list_line_form')
+    def open_lines(cls, price_lists):
+        return {}
+
     def compute(self, product, quantity, uom, pattern=None):
         Uom = Pool().get('product.uom')
 
@@ -206,3 +219,8 @@ class PriceListLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
         'Return unit price (as Decimal)'
         context.setdefault('functions', {})['Decimal'] = Decimal
         return simple_eval(decistmt(self.formula), **context)
+
+
+class PriceListLineContext(ModelView):
+    "Price List Line Context"
+    __name__ = 'product.price_list.line.context'
diff --git a/modules/product_price_list/price_list.xml b/modules/product_price_list/price_list.xml
index 4795b514d8..79cc0c680a 100644
--- a/modules/product_price_list/price_list.xml
+++ b/modules/product_price_list/price_list.xml
@@ -54,6 +54,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="True"/>
         </record>
 
+        <record model="ir.model.button" id="price_list_open_lines_button">
+            <field name="model">product.price_list</field>
+            <field name="name">open_lines</field>
+            <field name="string">Open Lines</field>
+        </record>
+
         <record model="ir.rule.group" id="rule_group_price_list_companies">
             <field name="name">User in companies</field>
             <field name="model">product.price_list</field>
@@ -85,5 +91,27 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">price_list_line_tree_sequence</field>
         </record>
 
+        <record model="ir.action.act_window" id="act_price_list_line_form">
+            <field name="name">Price List Lines</field>
+            <field name="res_model">product.price_list.line</field>
+            <field name="context_model">product.price_list.line.context</field>
+            <field name="domain" eval="[('price_list', '=', Eval('active_id'))]" pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_price_list_line_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="price_list_line_view_tree_sequence"/>
+            <field name="act_window" ref="act_price_list_line_form"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_price_list_line_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="price_list_line_view_form"/>
+            <field name="act_window" ref="act_price_list_line_form"/>
+        </record>
+
+        <record model="ir.ui.view" id="price_list_line_context_view_form">
+            <field name="model">product.price_list.line.context</field>
+            <field name="type">form</field>
+            <field name="name">price_list_line_context_form</field>
+        </record>
     </data>
 </tryton>
diff --git a/modules/product_price_list/view/price_list_form.xml b/modules/product_price_list/view/price_list_form.xml
index b4806a79bd..e14d9966fb 100644
--- a/modules/product_price_list/view/price_list_form.xml
+++ b/modules/product_price_list/view/price_list_form.xml
@@ -26,6 +26,7 @@ this repository contains the full copyright notices and license terms. -->
         <page name="lines">
             <field name="lines" colspan="4"
                 view_ids="product_price_list.price_list_line_view_tree_sequence"/>
+            <button name="open_lines" colspan="4"/>
         </page>
     </notebook>
 </form>
diff --git a/modules/product_price_list_dates/view/price_list_form.xml b/modules/product_price_list/view/price_list_line_context_form.xml
similarity index 55%
rename from modules/product_price_list_dates/view/price_list_form.xml
rename to modules/product_price_list/view/price_list_line_context_form.xml
index fd7fa5bd25..4b58158419 100644
--- a/modules/product_price_list_dates/view/price_list_form.xml
+++ b/modules/product_price_list/view/price_list_line_context_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<data>
-    <xpath expr="//field[@name='lines']" position="after">
-        <button name="open_lines" colspan="4"/>
-    </xpath>
-</data>
+<form>
+</form>
+
diff --git a/modules/product_price_list_dates/product.py b/modules/product_price_list_dates/product.py
index bc45abaf95..0318457573 100644
--- a/modules/product_price_list_dates/product.py
+++ b/modules/product_price_list_dates/product.py
@@ -6,7 +6,7 @@ import datetime as dt
 from trytond.config import config
 from trytond.model import ModelView, fields
 from trytond.pool import Pool, PoolMeta
-from trytond.pyson import Eval, If
+from trytond.pyson import Date, Eval, If, PYSONDecoder, PYSONEncoder
 from trytond.transaction import Transaction
 
 _cache_days = config.getint(
@@ -16,18 +16,34 @@ _cache_days = config.getint(
 class PriceList(metaclass=PoolMeta):
     __name__ = 'product.price_list'
 
-    @classmethod
-    def __setup__(cls):
-        super(PriceList, cls).__setup__()
-        cls._buttons.update({
-                'open_lines': {},
-                })
-
     @classmethod
     @ModelView.button_action(
-        'product_price_list_dates.act_price_list_line_form')
+        'product_price_list.act_price_list_line_form')
     def open_lines(cls, price_lists):
-        pass
+        encoder = PYSONEncoder()
+        decoder = PYSONDecoder(noeval=True)
+        action = super().open_lines(price_lists)
+        context_domain = [
+            ['OR',
+                ('start_date', '=', None),
+                ('start_date', '<=', Eval('date', Date())),
+                ],
+            ['OR',
+                ('end_date', '=', None),
+                ('end_date', '>=', Eval('date', Date())),
+                ],
+            ]
+        if isinstance(action, dict):
+            if action.get('context_domain'):
+                context_domain = [
+                    decoder.decode(action['context_domain']),
+                    context_domain]
+            action['context_domain'] = encoder.encode(context_domain)
+        else:
+            action = {
+                'context_domain': encoder.encode(context_domain),
+                }
+        return action
 
     def compute(self, product, quantity, uom, pattern=None):
         context = Transaction().context
@@ -93,8 +109,7 @@ class PriceListLine(metaclass=PoolMeta):
         return super(PriceListLine, self).match(pattern)
 
 
-class PriceListLineContext(ModelView):
-    "Price List Line Context"
+class PriceListLineContext(metaclass=PoolMeta):
     __name__ = 'product.price_list.line.context'
 
     date = fields.Date("Date")
diff --git a/modules/product_price_list_dates/product.xml b/modules/product_price_list_dates/product.xml
index 46e7574f75..674db0305f 100644
--- a/modules/product_price_list_dates/product.xml
+++ b/modules/product_price_list_dates/product.xml
@@ -3,18 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-        <record model="ir.ui.view" id="price_list_view_form">
-            <field name="model">product.price_list</field>
-            <field name="inherit"
-                ref="product_price_list.price_list_view_form"/>
-            <field name="name">price_list_form</field>
-        </record>
-        <record model="ir.model.button" id="price_list_open_lines_button">
-            <field name="model">product.price_list</field>
-            <field name="name">open_lines</field>
-            <field name="string">Open Lines</field>
-        </record>
-
         <record model="ir.ui.view" id="price_list_line_view_form">
             <field name="model">product.price_list.line</field>
             <field name="inherit"
@@ -36,35 +24,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">price_list_line_tree_sequence</field>
         </record>
 
-        <record model="ir.action.act_window" id="act_price_list_line_form">
-            <field name="name">Lines</field>
-            <field name="res_model">product.price_list.line</field>
-            <field name="context_model">product.price_list.line.context</field>
-            <field name="domain"
-                eval="[('price_list', '=', Eval('active_id'))]"
-                pyson="1"/>
-            <field name="context_domain"
-                eval="[['OR', ('start_date', '=', None), ('start_date', '&lt;=', Eval('date', Date()))], ['OR', ('end_date', '=', None), ('end_date', '&gt;=', Eval('date', Date()))]]"
-                pyson="1"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_price_list_line_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view"
-                ref="product_price_list.price_list_line_view_tree_sequence"/>
-            <field name="act_window" ref="act_price_list_line_form"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_price_list_line_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view"
-                ref="product_price_list.price_list_line_view_form"/>
-            <field name="act_window" ref="act_price_list_line_form"/>
-        </record>
-
         <record model="ir.ui.view" id="price_list_line_context_view_form">
             <field name="model">product.price_list.line.context</field>
-            <field name="type">form</field>
+            <field name="inherit" ref="product_price_list.price_list_line_context_view_form"/>
             <field name="name">price_list_line_context_form</field>
         </record>
     </data>
diff --git a/modules/product_price_list_dates/view/price_list_line_context_form.xml b/modules/product_price_list_dates/view/price_list_line_context_form.xml
index e65847939d..1049cc20b2 100644
--- a/modules/product_price_list_dates/view/price_list_line_context_form.xml
+++ b/modules/product_price_list_dates/view/price_list_line_context_form.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
-    <label name="date"/>
-    <field name="date"/>
-</form>
+<data>
+    <xpath expr="/form" position="inside">
+        <newline/>
+        <label name="date"/>
+        <field name="date"/>
+        <newline/>
+    </xpath>
+</data>