Merge PR #73 into 14.0

Signed-off-by andhit-r
open-synergy · Jul 30, 2024 · 1505cec · 1505cec
2 parents ac9e5ae + 35c9d49
commit 1505cec
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/ssi_service/models/service_contract_fix_item.py b/ssi_service/models/service_contract_fix_item.py
@@ -28,6 +28,7 @@ def _select(self):
             a.price_unit AS price_unit,
             a.uom_id AS uom_id,
             SUM(a.quantity) AS quantity,
+            MAX(a.sequence) AS sequence,
             SUM(a.price_subtotal) AS amount_untaxed,
             SUM(a.price_tax) AS amount_tax,
             SUM(a.price_total) AS amount_total

diff --git a/ssi_service/models/service_fix_item_mixin.py b/ssi_service/models/service_fix_item_mixin.py
@@ -8,14 +8,17 @@
 class ServiceFixItemMixin(models.AbstractModel):
     _name = "service.fix_item_mixin"
     _description = "Service Fix Item Mixin"
-    _order = "id"
+    _order = "service_id, sequence, id"
     _auto = False
 
     service_id = fields.Many2one(
         string="Service Object",
         comodel_name="service.mixin",
         ondelete="cascade",
     )
+    sequence = fields.Integer(
+        string="Sequence",
+    )
     product_id = fields.Many2one(
         string="Product",
         comodel_name="product.product",

diff --git a/ssi_service/views/service_contract_views.xml b/ssi_service/views/service_contract_views.xml
@@ -270,6 +270,7 @@
                                                         colspan="1"
                                                         col="2"
                                                     >
+                                                    <field name="sequence" />
                                                     <field
                                                             name="product_id"
                                                             domain="['|',('id','in',parent.fix_item_allowed_product_ids),('categ_id','in',parent.fix_item_allowed_product_categ_ids)]"

diff --git a/ssi_service_quotation/models/service_quotation_fix_item.py b/ssi_service_quotation/models/service_quotation_fix_item.py
@@ -27,6 +27,7 @@ def _select(self):
             a.name AS name,
             a.price_unit AS price_unit,
             a.uom_id AS uom_id,
+            MAX(a.sequence) AS sequence,
             SUM(a.quantity) AS quantity,
             SUM(a.price_subtotal) AS amount_untaxed,
             SUM(a.price_tax) AS amount_tax,

diff --git a/ssi_service_quotation/views/service_quotation_views.xml b/ssi_service_quotation/views/service_quotation_views.xml
@@ -182,6 +182,7 @@
                                                         colspan="1"
                                                         col="2"
                                                     >
+                                                    <field name="sequence" />
                                                     <field
                                                             name="product_id"
                                                             domain="['|',('id','in',parent.fix_item_allowed_product_ids),('categ_id','in',parent.fix_item_allowed_product_categ_ids)]"