From 80c56615d5c605f6e96cc3567a6b3d0332152957 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Feb 2025 13:16:20 +0700
Subject: <iman> CR customer commision

---
 indoteknik_custom/views/customer_commision.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 0b72587e..55736b0d 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -12,6 +12,10 @@
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
+                <field name="payment_status" readonly="1"
+                decoration-success="payment_status == 'payment'"
+                decoration-danger="payment_status == 'pending'"
+                widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
@@ -43,6 +47,10 @@
                     <button name="action_confirm_customer_commision" 
                     string="Confirm" type="object"
                     options="{}"/>
+                    <button name="action_confirm_customer_payment"
+                    string="Konfirmasi Pembayaran" type="object"
+                    options="{}"
+                    attrs="{'invisible': [('status', '!=', 'approved'),]}"/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -68,6 +76,7 @@
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
                                 <field name="status" readonly="1"/>
+                                <field name="payment_status" readonly="1" />
                                 <field name="total_dpp"/>
                             </group>
                         </group>
-- 
cgit v1.2.3


From b7580b1590fc3259aa028c0c909b0ee564e801d5 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 19 Feb 2025 14:49:40 +0700
Subject: <iman> update customer

---
 indoteknik_custom/views/customer_commision.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 55736b0d..09031274 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -48,9 +48,9 @@
                     string="Confirm" type="object"
                     options="{}"/>
                     <button name="action_confirm_customer_payment"
-                    string="Konfirmasi Pembayaran" type="object"
-                    options="{}"
-                    attrs="{'invisible': [('status', '!=', 'approved'),]}"/>
+                        string="Konfirmasi Pembayaran" type="object"
+                        options="{}"
+                        attrs="{'invisible': [('status', '!=', 'approved')], 'readonly': [('payment_status', '=', 'payment')]}"/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
-- 
cgit v1.2.3


From 141bfb3a32e73d5b8557a70867d957d5ed3d485b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 25 Feb 2025 13:31:31 +0700
Subject: <iman> update code

---
 indoteknik_custom/views/customer_commision.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 09031274..51172b1c 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -13,9 +13,9 @@
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
                 <field name="payment_status" readonly="1"
-                decoration-success="payment_status == 'payment'"
-                decoration-danger="payment_status == 'pending'"
-                widget="badge"/>
+                    decoration-success="payment_status == 'payment'"
+                    decoration-danger="payment_status == 'pending'"
+                    widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
@@ -50,7 +50,7 @@
                     <button name="action_confirm_customer_payment"
                         string="Konfirmasi Pembayaran" type="object"
                         options="{}"
-                        attrs="{'invisible': [('status', '!=', 'approved')], 'readonly': [('payment_status', '=', 'payment')]}"/>
+                        attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
-- 
cgit v1.2.3


From e9836504e2c814652165cd1a7055e91a8b6ea854 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 3 Mar 2025 13:15:17 +0700
Subject: <iman> CR customer commision jasper

---
 indoteknik_custom/views/customer_commision.xml | 50 ++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 51172b1c..dddefed4 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -11,7 +11,7 @@
                 <field name="partner_ids" widget="many2many_tags"/>
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
-                <field name="status" readonly="1"/>
+                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge" optional="show"/>
                 <field name="payment_status" readonly="1"
                     decoration-success="payment_status == 'payment'"
                     decoration-danger="payment_status == 'pending'"
@@ -28,6 +28,7 @@
             <tree editable="top" create="false">
                 <field name="partner_id" readonly="1"/>
                 <field name="invoice_id" readonly="1"/>
+                <field name="sale_order_id" readonly="1"/>
                 <field name="state" readonly="1"/>
                 <field name="product_id" readonly="1" optional="hide"/>
                 <field name="dpp" readonly="1"/>
@@ -43,14 +44,28 @@
         <field name="model">customer.commision</field>
         <field name="arch" type="xml">
             <form>
+<!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
                 <header>
-                    <button name="action_confirm_customer_commision" 
+                    <button name="action_confirm_customer_commision"
                     string="Confirm" type="object"
+                    attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
                     options="{}"/>
+                    <button name="action_reject"
+                        string="Reject"
+                        attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                        type="object"
+                        class="oe_highlight"/>
+                <button name="button_draft"
+                        string="Reset to Draft"
+                        attrs="{'invisible': [('status', '!=', 'reject')]}"
+                        type="object"/>
                     <button name="action_confirm_customer_payment"
                         string="Konfirmasi Pembayaran" type="object"
                         options="{}"
                         attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
+                    <field name="status" widget="statusbar"
+                       statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
+                    statusbar_colors='{"reject":"red"}'/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -75,7 +90,7 @@
                                 <field name="commision_type"/>
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
-                                <field name="status" readonly="1"/>
+<!--                                <field name="status" readonly="1"/>-->
                                 <field name="payment_status" readonly="1" />
                                 <field name="total_dpp"/>
                             </group>
@@ -92,6 +107,11 @@
                                     <field name="note_transfer"/>
                                 </group>
                             </page>
+                            <page string="Finance Notes">
+                                <group>
+                                    <field name="note_finnance"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
@@ -102,6 +122,30 @@
         </field>
     </record>
 
+        <!-- Wizard for Reject Reason -->
+    <record id="view_reject_reason_wizard_form" model="ir.ui.view">
+        <field name="name">reject.reason.commision.form</field>
+        <field name="model">reject.reason.commision</field>
+        <field name="arch" type="xml">
+            <form string="Reject Reason">
+                <group>
+                    <field name="reason_reject" widget="text"/>
+                </group>
+                <footer>
+                    <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_reject_reason_wizard" model="ir.actions.act_window">
+        <field name="name">Reject Reason</field>
+        <field name="res_model">reject.reason.commision</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
     <record id="view_customer_commision_filter" model="ir.ui.view">
         <field name="name">customer.commision.list.select</field>
         <field name="model">customer.commision</field>
-- 
cgit v1.2.3


From 731a47bee9925d65afe45f870880e9a42104fe7f Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 13 Mar 2025 08:54:55 +0700
Subject: add grouped so number and invoice number on customer commision

---
 indoteknik_custom/views/customer_commision.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 51172b1c..bb1628bc 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -17,6 +17,8 @@
                     decoration-danger="payment_status == 'pending'"
                     widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
+                <field name="grouped_so_number" readonly="1"/>
+                <field name="grouped_invoice_number" readonly="1"/>
             </tree>
         </field>
     </record>
@@ -62,6 +64,8 @@
                                 <field name="description"/>
                                 <field name="commision_percent"/>
                                 <field name="commision_amt"/>
+                                <field name="grouped_so_number" readonly="1"/>
+                                <field name="grouped_invoice_number" readonly="1"/>
                             </group>
                             <group>
                                 <div>
-- 
cgit v1.2.3


From 2b34ec96718d693d7a322939b23bda2fe64d8c80 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 18 Mar 2025 15:25:34 +0700
Subject: push

---
 indoteknik_custom/views/customer_commision.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 7cdf3117..1d3f48fc 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -79,8 +79,10 @@
                                 <field name="description"/>
                                 <field name="commision_percent"/>
                                 <field name="commision_amt"/>
+                                <field name="commision_amt_text"/>
                                 <field name="grouped_so_number" readonly="1"/>
                                 <field name="grouped_invoice_number" readonly="1"/>
+                                <field name="approved_by" readonly="1"/>
                             </group>
                             <group>
                                 <div>
-- 
cgit v1.2.3


From 459790b31fac1a789efcb946f26938b60b123aab Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 25 Mar 2025 15:15:05 +0700
Subject: add field date_approve and position

---
 indoteknik_custom/views/customer_commision.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 1d3f48fc..a5f0e07f 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -55,8 +55,7 @@
                     <button name="action_reject"
                         string="Reject"
                         attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
-                        type="object"
-                        class="oe_highlight"/>
+                        type="object"/>
                 <button name="button_draft"
                         string="Reset to Draft"
                         attrs="{'invisible': [('status', '!=', 'reject')]}"
-- 
cgit v1.2.3


From aada0aa508549c9357cdee1a16cd7a23d6a38b22 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 26 Mar 2025 11:33:57 +0700
Subject: push

---
 indoteknik_custom/views/customer_commision.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index a5f0e07f..5df494f3 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -35,6 +35,7 @@
                 <field name="product_id" readonly="1" optional="hide"/>
                 <field name="dpp" readonly="1"/>
                 <field name="total_percent_margin" readonly="1"/>
+                <field name="total_margin_excl_third_party" readonly="1"/>
                 <field name="tax" readonly="1" optional="hide"/>
                 <field name="total" readonly="1" optional="hide"/>
             </tree>
-- 
cgit v1.2.3


From a9eed02ec4f14c368fc98accd25ae8acdc67323b Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 27 Mar 2025 09:39:53 +0700
Subject: cr cc

---
 indoteknik_custom/views/customer_commision.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 5df494f3..a78f8a9f 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -93,6 +93,7 @@
                                 />
                                 </div>
                                 <field name="date_to"/>
+                                <field name="sales_id"/>
                                 <field name="commision_type"/>
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
-- 
cgit v1.2.3


From 10e3915bccc758ffc2f6e0e1d2e19f590605339e Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 10 Apr 2025 14:37:06 +0700
Subject: add optional hide on commision tree

---
 indoteknik_custom/views/customer_commision.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index a78f8a9f..9f0e1e8a 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -17,8 +17,8 @@
                     decoration-danger="payment_status == 'pending'"
                     widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
-                <field name="grouped_so_number" readonly="1"/>
-                <field name="grouped_invoice_number" readonly="1"/>
+                <field name="grouped_so_number" readonly="1" optional="hide"/>
+                <field name="grouped_invoice_number" readonly="1" optional="hide"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From 10d6ffad06f2dd89eca972257c2b9326d002949a Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 9 May 2025 13:35:42 +0700
Subject: <miqdad> add partner group by in tree view

---
 indoteknik_custom/views/customer_commision.xml | 234 +++++++++++++------------
 1 file changed, 120 insertions(+), 114 deletions(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 9f0e1e8a..37df16ff 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -11,11 +11,12 @@
                 <field name="partner_ids" widget="many2many_tags"/>
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
-                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge" optional="show"/>
+                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge"
+                       optional="show"/>
                 <field name="payment_status" readonly="1"
-                    decoration-success="payment_status == 'payment'"
-                    decoration-danger="payment_status == 'pending'"
-                    widget="badge"/>
+                       decoration-success="payment_status == 'payment'"
+                       decoration-danger="payment_status == 'pending'"
+                       widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
                 <field name="grouped_so_number" readonly="1" optional="hide"/>
                 <field name="grouped_invoice_number" readonly="1" optional="hide"/>
@@ -47,89 +48,89 @@
         <field name="model">customer.commision</field>
         <field name="arch" type="xml">
             <form>
-<!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
+                <!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
                 <header>
                     <button name="action_confirm_customer_commision"
-                    string="Confirm" type="object"
-                    attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
-                    options="{}"/>
+                            string="Confirm" type="object"
+                            attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                            options="{}"/>
                     <button name="action_reject"
-                        string="Reject"
-                        attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
-                        type="object"/>
-                <button name="button_draft"
-                        string="Reset to Draft"
-                        attrs="{'invisible': [('status', '!=', 'reject')]}"
-                        type="object"/>
+                            string="Reject"
+                            attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                            type="object"/>
+                    <button name="button_draft"
+                            string="Reset to Draft"
+                            attrs="{'invisible': [('status', '!=', 'reject')]}"
+                            type="object"/>
                     <button name="action_confirm_customer_payment"
-                        string="Konfirmasi Pembayaran" type="object"
-                        options="{}"
-                        attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
+                            string="Konfirmasi Pembayaran" type="object"
+                            options="{}"
+                            attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
                     <field name="status" widget="statusbar"
-                       statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
-                    statusbar_colors='{"reject":"red"}'/>
+                           statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
+                           statusbar_colors='{"reject":"red"}'/>
                 </header>
                 <sheet string="Customer Commision">
-                        <div class="oe_button_box" name="button_box"/>
+                    <div class="oe_button_box" name="button_box"/>
+                    <group>
                         <group>
+                            <field name="number"/>
+                            <field name="date_from"/>
+                            <field name="partner_ids" widget="many2many_tags"/>
+                            <field name="description"/>
+                            <field name="commision_percent"/>
+                            <field name="commision_amt"/>
+                            <field name="commision_amt_text"/>
+                            <field name="grouped_so_number" readonly="1"/>
+                            <field name="grouped_invoice_number" readonly="1"/>
+                            <field name="approved_by" readonly="1"/>
+                        </group>
+                        <group>
+                            <div>
+                                <button name="generate_customer_commision"
+                                        string="Generate Line"
+                                        type="object"
+                                        class="mr-2 oe_highlight"
+                                />
+                            </div>
+                            <field name="date_to"/>
+                            <field name="sales_id"/>
+                            <field name="commision_type"/>
+                            <field name="brand_ids" widget="many2many_tags"/>
+                            <field name="notification" readonly="1"/>
+                            <!--                                <field name="status" readonly="1"/>-->
+                            <field name="payment_status" readonly="1"/>
+                            <field name="total_dpp"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Lines">
+                            <field name="commision_lines"/>
+                        </page>
+                        <page string="Other Info" name="customer_commision_info">
                             <group>
-                                <field name="number"/>
-                                <field name="date_from"/>
-                                <field name="partner_ids" widget="many2many_tags"/>
-                                <field name="description"/>
-                                <field name="commision_percent"/>
-                                <field name="commision_amt"/>
-                                <field name="commision_amt_text"/>
-                                <field name="grouped_so_number" readonly="1"/>
-                                <field name="grouped_invoice_number" readonly="1"/>
-                                <field name="approved_by" readonly="1"/>
+                                <field name="bank_name"/>
+                                <field name="account_name"/>
+                                <field name="bank_account"/>
+                                <field name="note_transfer"/>
                             </group>
+                        </page>
+                        <page string="Finance Notes">
                             <group>
-                                <div>
-                                <button name="generate_customer_commision"
-                                    string="Generate Line"
-                                    type="object"
-                                    class="mr-2 oe_highlight"
-                                />
-                                </div>
-                                <field name="date_to"/>
-                                <field name="sales_id"/>
-                                <field name="commision_type"/>
-                                <field name="brand_ids" widget="many2many_tags"/>
-                                <field name="notification" readonly="1"/>
-<!--                                <field name="status" readonly="1"/>-->
-                                <field name="payment_status" readonly="1" />
-                                <field name="total_dpp"/>
+                                <field name="note_finnance"/>
                             </group>
-                        </group>
-                        <notebook>
-                            <page string="Lines">
-                                <field name="commision_lines"/>
-                            </page>
-                            <page string="Other Info" name="customer_commision_info">
-                                <group>
-                                    <field name="bank_name"/>
-                                    <field name="account_name"/>
-                                    <field name="bank_account"/>
-                                    <field name="note_transfer"/>
-                                </group>
-                            </page>
-                            <page string="Finance Notes">
-                                <group>
-                                    <field name="note_finnance"/>
-                                </group>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
             </form>
         </field>
     </record>
 
-        <!-- Wizard for Reject Reason -->
+    <!-- Wizard for Reject Reason -->
     <record id="view_reject_reason_wizard_form" model="ir.ui.view">
         <field name="name">reject.reason.commision.form</field>
         <field name="model">reject.reason.commision</field>
@@ -160,7 +161,12 @@
         <field name="arch" type="xml">
             <search string="Search Customer Commision">
                 <field name="partner_ids"/>
-           </search>
+                <group expand="0" string="Group By">
+                    <filter string="Partner" name="group_partner"
+                            domain="[]"
+                            context="{'group_by':'partner_ids'}"/>
+                </group>
+            </search>
         </field>
     </record>
 
@@ -173,17 +179,17 @@
     </record>
 
     <menuitem id="menu_customer_commision_acct"
-        name="Customer Commision"
-        action="customer_commision_action"
-        parent="account.menu_finance_entries"
-        sequence="113"
+              name="Customer Commision"
+              action="customer_commision_action"
+              parent="account.menu_finance_entries"
+              sequence="113"
     />
 
     <menuitem id="menu_customer_commision_sales"
-        name="Customer Commision"
-        action="customer_commision_action"
-        parent="sale.product_menu_catalog"
-        sequence="101"
+              name="Customer Commision"
+              action="customer_commision_action"
+              parent="sale.product_menu_catalog"
+              sequence="101"
     />
 
     <record id="customer_rebate_tree" model="ir.ui.view">
@@ -217,34 +223,34 @@
         <field name="arch" type="xml">
             <form>
                 <sheet string="Customer Rebate">
-                        <div class="oe_button_box" name="button_box"/>
+                    <div class="oe_button_box" name="button_box"/>
+                    <group>
                         <group>
-                            <group>
-                                <field name="date_from"/>
-                                <field name="partner_id"/>
-                                <field name="target_1st"/>
-                                <field name="target_2nd"/>
-                                <field name="dpp_q1"/>
-                                <field name="dpp_q2"/>
-                                <field name="dpp_q3"/>
-                                <field name="dpp_q4"/>
-                            </group>
-                            <group>
-                                <field name="date_to"/>
-                                <field name="description"/>
-                                <field name="achieve_1"/>
-                                <field name="achieve_2"/>
-                                <field name="status_q1"/>
-                                <field name="status_q2"/>
-                                <field name="status_q3"/>
-                                <field name="status_q4"/>
-                            </group>
+                            <field name="date_from"/>
+                            <field name="partner_id"/>
+                            <field name="target_1st"/>
+                            <field name="target_2nd"/>
+                            <field name="dpp_q1"/>
+                            <field name="dpp_q2"/>
+                            <field name="dpp_q3"/>
+                            <field name="dpp_q4"/>
+                        </group>
+                        <group>
+                            <field name="date_to"/>
+                            <field name="description"/>
+                            <field name="achieve_1"/>
+                            <field name="achieve_2"/>
+                            <field name="status_q1"/>
+                            <field name="status_q2"/>
+                            <field name="status_q3"/>
+                            <field name="status_q4"/>
                         </group>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
             </form>
         </field>
     </record>
@@ -257,16 +263,16 @@
     </record>
 
     <menuitem id="menu_customer_rebate_acct"
-                name="Customer Rebate"
-                action="customer_rebate_action"
-                parent="account.menu_finance_entries"
-                sequence="114"
+              name="Customer Rebate"
+              action="customer_rebate_action"
+              parent="account.menu_finance_entries"
+              sequence="114"
     />
 
     <menuitem id="menu_customer_rebate_sales"
-        name="Customer Rebate"
-        action="customer_rebate_action"
-        parent="sale.product_menu_catalog"
-        sequence="102"
+              name="Customer Rebate"
+              action="customer_rebate_action"
+              parent="sale.product_menu_catalog"
+              sequence="102"
     />
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3