From aa59f0f8f3edfc0aa1e257b35d5c6e83b8f6978c Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Mon, 19 Jun 2023 16:48:16 +0700
Subject: receipt approval in logistic

---
 indoteknik_custom/views/stock_picking.xml | 2 +-
 indoteknik_custom/views/users.xml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 4bbdc7b8..02003e05 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -30,7 +30,7 @@
                     <button name="ask_return_approval"
                             string="Ask Return/Acc"
                             type="object"
-                            attrs="{'invisible': ['|', ('state', '=', 'draft'), ('state', '=', 'cancel'), ('approval_return_status', '=', 'pengajuan1')]}"
+                            attrs="{'invisible': ['|', ('state', 'in', ['draft', 'cancel', 'assigned']), ('approval_return_status', '=', 'pengajuan1')]}"
                     />
                     <button name="action_create_invoice_from_mr"
                             string="Create Bill"
diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml
index 29d455d4..25e7f90c 100644
--- a/indoteknik_custom/views/users.xml
+++ b/indoteknik_custom/views/users.xml
@@ -11,6 +11,7 @@
                     <field name="is_purchasing_manager"/>
                     <field name="is_sales_manager"/>
                     <field name="is_leader"/>
+                    <field name="is_logistic_approver"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From 837228a2b4b799de182e52096f638ee5f491137a Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Tue, 20 Jun 2023 18:00:42 +0700
Subject: fix code receipt approval

---
 indoteknik_custom/views/stock_picking.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 02003e05..f95db854 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -27,6 +27,11 @@
                             type="object"
                             attrs="{'invisible': [('is_internal_use', '=', False)]}"
                     />
+                    <button name="ask_receipt_approval"
+                            string="Ask Receipt"
+                            type="object"
+                            attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}"
+                    />
                     <button name="ask_return_approval"
                             string="Ask Return/Acc"
                             type="object"
@@ -39,12 +44,6 @@
                     />
                 </button>
                 <field name="backorder_id" position="after">
-                    <field name="is_internal_use"
-                           string="Internal Use"
-                           type="object"
-                           attrs="{'readonly': True}"
-                           force_save="1"
-                    />
                     <field name="summary_qty_detail"/>
                     <field name="count_line_detail"/>
                 </field>
@@ -53,8 +52,6 @@
                 </field>
                 <field name="origin" position="after">
                     <field name="date_doc_kirim"/>
-                    <field name="approval_status" attrs="{'invisible': [('is_internal_use', '=', False)]}"/>
-                    <field name="approval_return_status" attrs="{'invisible': [('approval_return_status', '=', False)]}"/>
                     <field name="summary_qty_operation"/>
                     <field name="count_line_operation"/>
                     <field name="account_id"
@@ -65,6 +62,17 @@
                            }"
                     />
                 </field>
+                <field name="group_id" position="before">
+                    <field name="is_internal_use"
+                           string="Internal Use"
+                           type="object"
+                           attrs="{'readonly': True}"
+                           force_save="1"
+                    />
+                    <field name="approval_status"/>
+                    <field name="approval_receipt_status"/>
+                    <field name="approval_return_status"/>
+                </field>
                 <field name="product_id" position="before">
                     <field name="line_no" attrs="{'readonly': 1}"/>
                 </field>
-- 
cgit v1.2.3


From c1a0d0e48ef64241c92947a8800f93af4ff109d0 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 21 Jun 2023 10:25:26 +0700
Subject: fix approval receipt and hide uneccesary column

---
 indoteknik_custom/views/purchase_order.xml | 1 +
 indoteknik_custom/views/sale_order.xml     | 1 +
 indoteknik_custom/views/stock_picking.xml  | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 7a397ff6..5b0c99ef 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -24,6 +24,7 @@
                     <button name="po_approve"
                             string="Ask Approval"
                             type="object"
+                            attrs="{'invisible': [('approval_status', '=', 'approved')]}"
                     />
                     <button name="indoteknik_custom.action_view_uangmuka_pembelian" string="UangMuka"
                         type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index ea84eb00..85f687c1 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -14,6 +14,7 @@
                     <button name="sale_order_approve"
                             string="Ask Approval"
                             type="object"
+                            attrs="{'invisible': [('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved'])]}"
                     />
                     <button name="indoteknik_custom.action_view_uangmuka_penjualan" string="UangMuka"
                         type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index f95db854..99f0d7c0 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -28,7 +28,7 @@
                             attrs="{'invisible': [('is_internal_use', '=', False)]}"
                     />
                     <button name="ask_receipt_approval"
-                            string="Ask Receipt"
+                            string="Received"
                             type="object"
                             attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}"
                     />
@@ -74,7 +74,7 @@
                     <field name="approval_return_status"/>
                 </field>
                 <field name="product_id" position="before">
-                    <field name="line_no" attrs="{'readonly': 1}"/>
+                    <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
                 </field>
                 <page name="note" position="after">
                     <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}">
-- 
cgit v1.2.3