diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-10-09 11:16:39 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-10-09 11:16:39 +0700 |
| commit | 070656b5a8c7a304810af193bc79ff324503db01 (patch) | |
| tree | dda2f2859356e04c51478ce51bd2bdbd9f04564f /indoteknik_custom/views | |
| parent | 19e0be70679ed862453fedeba14fb4cdf02232e9 (diff) | |
| parent | a48ae105c865e710227e12b666fa601a326d12a7 (diff) | |
Merge branch 'production' into change/feature/promotion-program
Diffstat (limited to 'indoteknik_custom/views')
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 12 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_monitoring.xml | 2 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 2 | ||||
| -rwxr-xr-x | indoteknik_custom/views/voucher.xml | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 0ad76ae5..e0ec86f9 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -137,4 +137,16 @@ </field> </record> </data> + <data> + <record id="purchase_order_search_inherit" model="ir.ui.view"> + <field name="name">purchase.order.select.inherit</field> + <field name="model">purchase.order</field> + <field name="inherit_id" ref="purchase.view_purchase_order_filter"/> + <field name="arch" type="xml"> + <field name="name" position="after"> + <field name="sale_order_id" string="Sale Order"/> + </field> + </field> + </record> + </data> </odoo>
\ No newline at end of file diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml index 0a9a5aa5..641eb8fb 100755 --- a/indoteknik_custom/views/sale_monitoring.xml +++ b/indoteknik_custom/views/sale_monitoring.xml @@ -25,6 +25,7 @@ decoration-success="status == 'Siap kirim'" decoration-info="status == 'Delivered' or status == 'Invoiced'" /> + <field name="note"/> </tree> </field> </record> @@ -48,6 +49,7 @@ decoration-info="status == 'Delivered' or status == 'Invoiced'" /> <field name="po_number"/> + <field name="note"/> </group> <group> <field name="qty_so"/> diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 0d972ec1..e0e9ac54 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -48,7 +48,7 @@ <field name="customer_type" attrs="{'required': ['|', ('create_date', '>', '2023-06-28'), ('create_date', '=', False)]}"/> <field name="npwp" placeholder='99.999.999.9-999.999' attrs="{'required': ['|', ('create_date', '>', '2023-06-28'), ('create_date', '=', False)]}"/> <field name="sppkp" attrs="{'invisible': [('customer_type','!=','pkp')], 'required': [('customer_type', '=', 'pkp')]}"/> - <field name="email" attrs="{'required': [('create_date', '>', '2023-09-28')]}"/> + <field name="email" required="1"/> <field name="due_id" readonly="1"/> <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" attrs="{'required':[('create_date', '>', '2023-09-10')]}"/> </field> diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml index a2f5557a..b8489942 100755 --- a/indoteknik_custom/views/voucher.xml +++ b/indoteknik_custom/views/voucher.xml @@ -35,7 +35,7 @@ <field name="limit" required="1"/> <field name="limit_user" required="1"/> <field name="apply_type" required="1" /> - <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039])]"/> + <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/> </group> <group string="Discount Settings" attrs="{'invisible': [('apply_type', '!=', 'all')]}"> <field name="min_purchase_amount" widget="monetary" required="1" /> |