diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2023-06-27 14:22:09 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2023-06-27 14:22:09 +0700 |
| commit | 57c571c40de1acfdcf23132782ec8c7fcbb8c6bd (patch) | |
| tree | 58eccafc69927796ea93c13f70dc0bbf3f47eca3 /indoteknik_custom/views | |
| parent | feb55333e94aaec783bce85d36667912b3e90f86 (diff) | |
| parent | 45dc1483342d9ec195c53711b5194e7ddf88b343 (diff) | |
Merge branch 'release' into real-stock
Diffstat (limited to 'indoteknik_custom/views')
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 1 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 1 | ||||
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 28 | ||||
| -rw-r--r-- | indoteknik_custom/views/users.xml | 1 |
4 files changed, 21 insertions, 10 deletions
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 4bbdc7b8..99f0d7c0 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -27,10 +27,15 @@ type="object" attrs="{'invisible': [('is_internal_use', '=', False)]}" /> + <button name="ask_receipt_approval" + string="Received" + type="object" + attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}" + /> <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" @@ -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,8 +62,19 @@ }" /> </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 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]]}"> 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> |