diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-05-10 14:43:15 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-05-10 14:43:15 +0700 |
| commit | 844339e517540826f6990456a63945dc879e37d5 (patch) | |
| tree | a635964dbd0b9729c1d161e16ca7e8dabb02a3c8 /indoteknik_custom/views | |
| parent | 1c0c7be74b11371299bead2626840b3ebc2632f7 (diff) | |
| parent | cb9ae6021dd4858372ed78d16ab491226c95f1d2 (diff) | |
Merge branch 'production' into dev/request-by-abl
# Conflicts:
# indoteknik_custom/models/res_partner.py
Diffstat (limited to 'indoteknik_custom/views')
| -rwxr-xr-x | indoteknik_custom/views/purchase_order.xml | 4 | ||||
| -rw-r--r-- | indoteknik_custom/views/res_partner.xml | 1 | ||||
| -rwxr-xr-x | indoteknik_custom/views/sale_order.xml | 4 | ||||
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 4 |
4 files changed, 13 insertions, 0 deletions
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml index 33603216..bb38715e 100755 --- a/indoteknik_custom/views/purchase_order.xml +++ b/indoteknik_custom/views/purchase_order.xml @@ -28,6 +28,7 @@ </button> <field name="date_order" position="before"> <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/> + <field name="sale_order"/> <field name="approval_status"/> <field name="amount_total_without_service"/> </field> @@ -71,6 +72,7 @@ </field> <field name="price_subtotal" position="after"> <field name="so_line_id" attrs="{'readonly': 1}" optional="hide"/> + <field name="so_id" attrs="{'readonly': 1}" optional="hide"/> <field name="indent" optional="hide"/> </field> <page name="purchase_delivery_invoice" position="after"> @@ -158,6 +160,7 @@ <field name="arch" type="xml"> <field name="name" position="after"> <field name="sale_order_id" string="Sale Order"/> + <field name="sale_order" string="Matches Sale Order"/> </field> </field> </record> @@ -170,6 +173,7 @@ <field name="arch" type="xml"> <field name="name" position="after"> <field name="sale_order_id" string="Sale Order"/> + <field name="sale_order" string="Matches Sale Order"/> </field> </field> </record> diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index f79b684e..59d33f29 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -15,6 +15,7 @@ <field name="company_type_id"/> <field name="group_partner_id"/> <field name="is_potential"/> + <field name="pareto_status"/> <field name="digital_invoice_tax"/> </field> <field name="npwp" position="before"> diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml index 77740dd0..d6738759 100755 --- a/indoteknik_custom/views/sale_order.xml +++ b/indoteknik_custom/views/sale_order.xml @@ -49,6 +49,7 @@ </field> <field name="user_id" position="after"> <field name="helper_by_id" readonly="1"/> + <field name="compute_fullfillment"/> </field> <field name="tag_ids" position="after"> <field name="eta_date" readonly="1"/> @@ -186,6 +187,9 @@ <page string="Matches PO" name="page_matches_po" invisible="1"> <field name="order_sales_match_line" readonly="1"/> </page> + <page string="Fullfillment" name="page_sale_order_fullfillment"> + <field name="fullfillment_line" readonly="1"/> + </page> </page> </field> </record> diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index a8772906..90f662cc 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -61,6 +61,7 @@ <field name="origin" position="after"> <field name="status_printed"/> <field name="purchase_id"/> + <field name="sale_order"/> <field name="date_doc_kirim"/> <field name="summary_qty_operation"/> <field name="count_line_operation"/> @@ -87,6 +88,9 @@ <field name="product_id" position="before"> <field name="line_no" attrs="{'readonly': 1}" optional="hide"/> </field> + <field name="product_uom" position="after"> + <field name="sale_id" attrs="{'readonly': 1}" optional="hide"/> + </field> <page name="note" position="after"> <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}"> <group> |