Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

merge

5 files changed, 19 insertions, 2 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 8e731307..14b66d87 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -398,7 +398,7 @@ class SaleOrder(models.Model):
         compute="_compute_partner_is_cbd_locked"
     )
     internal_notes_contact = fields.Text(related='partner_id.comment', string="Internal Notes", readonly=True, help="Internal Notes dari contact utama customer.")
-    is_so_fiktif = fields.Boolean('SO Fiktif?')
+    is_so_fiktif = fields.Boolean('SO Fiktif?', tracking=3)
 
     def action_set_shipping_id(self):
         for rec in self:
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 49001974..7c4cea8b 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -200,7 +200,7 @@ class StockPicking(models.Model):
         ('full', 'Full'),
     ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
     so_num = fields.Char('SO Number', compute='_get_so_num')
-    is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif')
+    is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3)
 
     @api.depends('sale_id.is_so_fiktif')
     def _compute_is_so_fiktif(self):
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index b498b8a8..4e73bb28 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -214,11 +214,26 @@
         </field>
     </record>
 
+    <record id="view_advance_payment_request_filter" model="ir.ui.view">
+        <field name="name">advance.payment.request.filter</field>
+        <field name="model">advance.payment.request</field>
+        <field name="arch" type="xml">
+            <search string="Search APR &amp; Reimburse">
+                <filter string="My Requests" name="my_requests" domain="[('applicant_name','=',uid)]"/>
+                <separator/>
+                <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
+                <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="action_advance_payment_request" model="ir.actions.act_window">
         <field name="name">Pengajuan Uang Muka &amp; Reimburse</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">advance.payment.request</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_my_requests': 1}</field>
+        <field name="search_view_id" ref="view_advance_payment_request_filter"/> 
     </record>
 
     <menuitem id="menu_advance_payment_request_acct"
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 3e424788..9495c7ce 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -487,6 +487,7 @@
                     <field name="pareto_status" optional="hide"/>
                     <field name="shipping_method_picking" optional="hide"/>
                     <field name="hold_outgoing" optional="hide"/>
+                    <field name="is_so_fiktif" optional="hide" readonly="1"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 84eafbaf..f3abb11e 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -23,6 +23,7 @@
                     <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'"
                            decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
+                    <field name="is_so_fiktif" optional="hide" readonly="1"/>
                     <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'"
                            decoration-warning="state_approve_md == 'pending'" optional="hide"/>
                     <!-- <field name="countdown_hours" optional="hide"/>