Merge branch 'nathan-dev' of bitbucket.org:altafixco/indoteknik-addons into nathan-dev

1 files changed, 25 insertions, 8 deletions

diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml
index b3b186e9..0a9a5aa5 100755
--- a/indoteknik_custom/views/sale_monitoring.xml
+++ b/indoteknik_custom/views/sale_monitoring.xml
@@ -13,16 +13,17 @@
                 <field name="partner_id"/>
                 <field name="user_id"/>
                 <field name="qty_so"/>
+                <field name="qty_reserved"/>
                 <field name="qty_po"/>
                 <field name="qty_po_received"/>
                 <field name="qty_so_delivered"/>
                 <field name="qty_so_invoiced"/>
                 <field name="status"
                        widget="badge"
-                       decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                       decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                       decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                       decoration-info="status == 'Belum Invoiced'"
+                       decoration-danger="status == 'Belum/Kurang PO'"
+                        decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                        decoration-success="status == 'Siap kirim'"
+                        decoration-info="status == 'Delivered' or status == 'Invoiced'"
                 />
             </tree>
         </field>
@@ -41,15 +42,16 @@
                             <field name="user_id"/>
                             <field name="status"
                                    widget="badge"
-                                   decoration-danger="status == 'Belum PO sama sekali' or status == 'Belum PO full'"
-                                   decoration-warning="status == 'Belum Received sama sekali' or status == 'Belum Received full'"
-                                   decoration-success="status == 'SIAP KIRIM' or status == 'KIRIM SISANYA'"
-                                   decoration-info="status == 'Belum Invoiced'"
+                                   decoration-danger="status == 'Belum/Kurang PO'"
+                                   decoration-warning="status == 'Belum terima' or status == 'Terima sebagian'"
+                                   decoration-success="status == 'Siap kirim'"
+                                   decoration-info="status == 'Delivered' or status == 'Invoiced'"
                             />
                             <field name="po_number"/>
                         </group>
                         <group>
                             <field name="qty_so"/>
+                            <field name="qty_reserved"/>
                             <field name="qty_po"/>
                             <field name="qty_po_received"/>
                             <field name="qty_so_delivered"/>
@@ -61,10 +63,25 @@
         </field>
     </record>
 
+    <record id="view_monitoring_filter" model="ir.ui.view">
+        <field name="name">sale.monitoring.list.select</field>
+        <field name="model">sale.monitoring</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Monitoring">
+                <field name="sale_order_id"/>
+                <field name="partner_id"/>
+                <field name="user_id"/>
+                <field name="status"/>
+           </search>
+        </field>
+    </record>
+
     <record id="sale_monitoring_action" model="ir.actions.act_window">
         <field name="name">Sale Monitoring</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.monitoring</field>
+        <field name="search_view_id" ref="view_monitoring_filter"/>
         <field name="view_mode">tree,form</field>
     </record>