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

merge

3 files changed, 31 insertions, 4 deletions

diff --git a/indoteknik_custom/models/requisition.py b/indoteknik_custom/models/requisition.py
index 64ef4fc8..748642eb 100644
--- a/indoteknik_custom/models/requisition.py
+++ b/indoteknik_custom/models/requisition.py
@@ -85,7 +85,7 @@ class Requisition(models.Model):
                     ('product_id', '=', prod_line.product_id.id), ('order_id', '=', req.sale_order_id.id)
                 ])
                 if match:
-                    raise UserError ('Product sudah di SO tidak approve/create PO')
+                    raise UserError ('Product sudah ada di SO tidak bisa approve/create PO')
 
 
     def button_approve(self):
@@ -108,7 +108,7 @@ class Requisition(models.Model):
             raise UserError('Tidak ada Lines, belum bisa create PO')
         if self.is_po:
             raise UserError('Sudah pernah di create PO')
-        if not self.sale_order_id:
+        if not self.sale_order_id and (not self.sales_approve or not self.merchandise_approve):
             raise UserError('Tidak ada link dengan Sales Order, tidak bisa dihitung sebagai Plafon Qty di PO')
 
         vendor_ids = self.env['requisition.line'].read_group([
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 278deda5..dd6370c7 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -196,7 +196,6 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="number"/>
-                <field name="user_id" optional='hide'/>
                 <field name="applicant_name"/>
                 <field name="nominal"/>
                 <field name="departement_type" optional='hide'/>
@@ -212,6 +211,7 @@
                     widget="badge"/>
                 <field name="days_remaining" readonly="1" widget="badge" optional="hide"/>
                 <field name="estimated_return_date" widget="badge" optional="hide"/>
+                <field name="user_id" optional="hide"/>
             </tree>
         </field>
     </record>
@@ -222,10 +222,21 @@
         <field name="arch" type="xml">
             <search string="Search APR &amp; Reimburse">
                 <field name="number" string="No. Dokumen"/>
-                <filter string="My Requests" name="my_requests" domain="[('applicant_name','=',uid)]"/>
+                <field name="applicant_name" string="Nama Pemohon"/>
+                <filter string="My Requests" name="my_requests" domain="['|', ('applicant_name', '=', uid), ('user_id', '=', uid)]"/>
                 <separator/>
                 <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
                 <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
+                <separator/>
+                <filter string="Waiting for Approval" name="filter_waiting_approval" domain="[('status','in',['pengajuan1','pengajuan2','pengajuan3'])]"/>
+                <filter string="Approved" name="filter_approved" domain="[('status','=','approved')]"/>
+                <separator/>
+                <filter string="Payment Pending" name="filter_payment_pending" domain="[('status_pay_down_payment','=','pending')]"/>
+                <filter string="Payment Done" name="filter_payment_done" domain="[('status_pay_down_payment','=','payment')]"/>
+                <group expand="0" string="Group By">
+                    <filter string="Pemohon" name="group_by_applicant" context="{'group_by':'applicant_name'}"/>
+                    <filter string="Departement" name="group_by_departement" context="{'group_by':'departement_type'}"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index fbe17093..2e9d5628 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -294,6 +294,22 @@
             </form>
         </field>
     </record>
+
+    <record id="view_refund_sale_order_search" model="ir.ui.view">
+        <field name="name">refund.sale.order.search</field>
+        <field name="model">refund.sale.order</field>
+        <field name="arch" type="xml">
+            <search string="Search Refund Sales Order">
+                <field name="partner_id"/>
+                <field name="name"/>
+                <field name="sale_order_ids"/>
+                <group expand="0" string="Group By">
+                    <filter string="Customer" name="group_by_partner" context="{'group_by': 'partner_id'}"/>
+                    <filter string="Status" name="group_by_status" context="{'group_by': 'status'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
     <!-- Action -->
     <record id="action_refund_sale_order" model="ir.actions.act_window">
         <field name="name">Refund Sales Order</field>