From f0a7895b46bf7ab823fdb8e3ab5a274467848456 Mon Sep 17 00:00:00 2001
From: Miftahussalam <miftah_salam@ymail.com>
Date: Sat, 16 Mar 2024 19:49:24 +0700
Subject: [PATCH 1/2] [UPD] ssi_service

---
 ssi_service/README.rst                       |  1 +
 ssi_service/views/service_contract_views.xml | 28 ++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/ssi_service/README.rst b/ssi_service/README.rst
index 8e85f1b..7767e24 100644
--- a/ssi_service/README.rst
+++ b/ssi_service/README.rst
@@ -35,6 +35,7 @@ Contributors
 ------------
 
 * Andhitia Rama <andhitia.r@gmail.com>
+* Miftahussalam <miftahussalam08@gmail.com>
 
 Maintainer
 ----------
diff --git a/ssi_service/views/service_contract_views.xml b/ssi_service/views/service_contract_views.xml
index 524a62c..9e193bc 100644
--- a/ssi_service/views/service_contract_views.xml
+++ b/ssi_service/views/service_contract_views.xml
@@ -36,6 +36,34 @@
         />
     <field name="arch" type="xml">
         <data>
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="partner_id"/>
+                <field name="contact_partner_id"/>
+                <field name="sale_team_id"/>
+                <field name="salesperson_id"/>
+                <field name="source_document_id"/>
+                <field name="type_id"/>
+                <field name="manager_id"/>
+                <field name="date"/>
+                <field name="date_start"/>
+                <field name="date_end"/>
+                <field name="currency_id"/>
+                <field name="pricelist_id"/>
+                <field name="title"/>
+            </xpath>
+            <xpath expr="//filter[@name='grp_responsible']" position="after">
+                <filter name="grp_partner" string="Partner" context="{'group_by':'partner_id'}"/>
+                <filter name="grp_contact" string="Contact" context="{'group_by':'contact_partner_id'}"/>
+                <filter name="grp_sale_team" string="Sale Team" context="{'group_by':'sale_team_id'}"/>
+                <filter name="grp_salesperson" string="Salesperson" context="{'group_by':'salesperson_id'}"/>
+                <filter name="grp_type" string="Type" context="{'group_by':'type_id'}"/>
+                <filter name="grp_manager" string="Manager" context="{'group_by':'manager_id'}"/>
+                <filter name="grp_date" string="Date" context="{'group_by':'date'}"/>
+                <filter name="grp_date_start" string="Date Start" context="{'group_by':'date_start'}"/>
+                <filter name="grp_date_end" string="Date End" context="{'group_by':'date_end'}"/>
+                <filter name="grp_currency" string="Currency" context="{'group_by':'currency_id'}"/>
+                <filter name="grp_pricelist" string="Pricelist" context="{'group_by':'pricelist_id'}"/>
+            </xpath>
         </data>
     </field>
 </record>

From 2742589deef3ab55fc2701dee41213896294fc63 Mon Sep 17 00:00:00 2001
From: mikevhe18 <viriyananda.michael@gmail.com>
Date: Wed, 3 Apr 2024 08:58:41 +0700
Subject: [PATCH 2/2] [FIX] pre-commit

---
 ssi_service/views/service_contract_views.xml  | 88 ++++++++++++++-----
 .../views/service_quotation_views.xml         | 18 ++--
 2 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/ssi_service/views/service_contract_views.xml b/ssi_service/views/service_contract_views.xml
index 9e193bc..d4a0179 100644
--- a/ssi_service/views/service_contract_views.xml
+++ b/ssi_service/views/service_contract_views.xml
@@ -37,32 +37,72 @@
     <field name="arch" type="xml">
         <data>
             <xpath expr="//field[@name='name']" position="after">
-                <field name="partner_id"/>
-                <field name="contact_partner_id"/>
-                <field name="sale_team_id"/>
-                <field name="salesperson_id"/>
-                <field name="source_document_id"/>
-                <field name="type_id"/>
-                <field name="manager_id"/>
-                <field name="date"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-                <field name="currency_id"/>
-                <field name="pricelist_id"/>
-                <field name="title"/>
+                <field name="partner_id" />
+                <field name="contact_partner_id" />
+                <field name="sale_team_id" />
+                <field name="salesperson_id" />
+                <field name="source_document_id" />
+                <field name="type_id" />
+                <field name="manager_id" />
+                <field name="date" />
+                <field name="date_start" />
+                <field name="date_end" />
+                <field name="currency_id" />
+                <field name="pricelist_id" />
+                <field name="title" />
             </xpath>
             <xpath expr="//filter[@name='grp_responsible']" position="after">
-                <filter name="grp_partner" string="Partner" context="{'group_by':'partner_id'}"/>
-                <filter name="grp_contact" string="Contact" context="{'group_by':'contact_partner_id'}"/>
-                <filter name="grp_sale_team" string="Sale Team" context="{'group_by':'sale_team_id'}"/>
-                <filter name="grp_salesperson" string="Salesperson" context="{'group_by':'salesperson_id'}"/>
-                <filter name="grp_type" string="Type" context="{'group_by':'type_id'}"/>
-                <filter name="grp_manager" string="Manager" context="{'group_by':'manager_id'}"/>
-                <filter name="grp_date" string="Date" context="{'group_by':'date'}"/>
-                <filter name="grp_date_start" string="Date Start" context="{'group_by':'date_start'}"/>
-                <filter name="grp_date_end" string="Date End" context="{'group_by':'date_end'}"/>
-                <filter name="grp_currency" string="Currency" context="{'group_by':'currency_id'}"/>
-                <filter name="grp_pricelist" string="Pricelist" context="{'group_by':'pricelist_id'}"/>
+                <filter
+                        name="grp_partner"
+                        string="Partner"
+                        context="{'group_by':'partner_id'}"
+                    />
+                <filter
+                        name="grp_contact"
+                        string="Contact"
+                        context="{'group_by':'contact_partner_id'}"
+                    />
+                <filter
+                        name="grp_sale_team"
+                        string="Sale Team"
+                        context="{'group_by':'sale_team_id'}"
+                    />
+                <filter
+                        name="grp_salesperson"
+                        string="Salesperson"
+                        context="{'group_by':'salesperson_id'}"
+                    />
+                <filter
+                        name="grp_type"
+                        string="Type"
+                        context="{'group_by':'type_id'}"
+                    />
+                <filter
+                        name="grp_manager"
+                        string="Manager"
+                        context="{'group_by':'manager_id'}"
+                    />
+                <filter name="grp_date" string="Date" context="{'group_by':'date'}" />
+                <filter
+                        name="grp_date_start"
+                        string="Date Start"
+                        context="{'group_by':'date_start'}"
+                    />
+                <filter
+                        name="grp_date_end"
+                        string="Date End"
+                        context="{'group_by':'date_end'}"
+                    />
+                <filter
+                        name="grp_currency"
+                        string="Currency"
+                        context="{'group_by':'currency_id'}"
+                    />
+                <filter
+                        name="grp_pricelist"
+                        string="Pricelist"
+                        context="{'group_by':'pricelist_id'}"
+                    />
             </xpath>
         </data>
     </field>
diff --git a/ssi_service_quotation/views/service_quotation_views.xml b/ssi_service_quotation/views/service_quotation_views.xml
index 97db0b8..e9a47ca 100644
--- a/ssi_service_quotation/views/service_quotation_views.xml
+++ b/ssi_service_quotation/views/service_quotation_views.xml
@@ -37,15 +37,15 @@
     <field name="arch" type="xml">
         <data>
             <xpath expr="//field[@name='user_id']" position="after">
-                <field name="partner_id"/>
-                <field name="contact_partner_id"/>
-                <field name="type_id"/>
-                <field name="manager_id"/>
-                <field name="currency_id"/>
-                <field name="pricelist_id"/>
-                <field name="salesperson_id"/>
-                <field name="source_document_id"/>
-                <field name="title"/>
+                <field name="partner_id" />
+                <field name="contact_partner_id" />
+                <field name="type_id" />
+                <field name="manager_id" />
+                <field name="currency_id" />
+                <field name="pricelist_id" />
+                <field name="salesperson_id" />
+                <field name="source_document_id" />
+                <field name="title" />
             </xpath>
         </data>
     </field>