diff options
| author | trisusilo48 <tri.susilo@altama.co.id> | 2025-02-24 11:32:06 +0700 |
|---|---|---|
| committer | trisusilo48 <tri.susilo@altama.co.id> | 2025-02-24 11:32:06 +0700 |
| commit | 7df979b8d5312bb90d13d338f2a787dc35373f17 (patch) | |
| tree | 12a5fd7b487781b52900505a2cffa999da692f9f /indoteknik_custom/views/stock_picking.xml | |
| parent | a9c4cd0c5ac694074f0e3a4359182a97f27f542e (diff) | |
| parent | 38f8ddd9aaaad58c8d7ea27235cd109ba288693d (diff) | |
Merge branch 'odoo-production' into feature/integrasi_biteship
# Conflicts:
# indoteknik_custom/models/__init__.py
# indoteknik_custom/models/product_template.py
# indoteknik_custom/models/sale_order.py
# indoteknik_custom/security/ir.model.access.csv
Diffstat (limited to 'indoteknik_custom/views/stock_picking.xml')
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index ae6ae940..1832c31e 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -89,9 +89,9 @@ <field name="partner_id" position="after"> <field name="real_shipping_id"/> </field> - <field name="product_uom_qty" position="attributes"> + <!-- <field name="product_uom_qty" position="attributes"> <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute> - </field> + </field> --> <field name="date_done" position="after"> <field name="arrival_time"/> </field> @@ -135,6 +135,7 @@ <field name="sale_id" attrs="{'readonly': 1}" optional="hide"/> <field name="print_barcode" optional="hide"/> <field name="qr_code_variant" widget="image" optional="hide"/> + <field name="barcode" optional="hide"/> </field> <page name="note" position="after"> <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}"> @@ -194,15 +195,18 @@ </group> </group> </page> - <!-- <page string="Check Product" name="check_product"> + <page string="Check Product" name="check_product"> <field name="check_product_lines"/> - </page> --> + </page> + <page string="Barcode Product" name="barcode_product" attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}"> + <field name="barcode_product_lines"/> + </page> </page> </field> </record> - <!-- <record id="check_product_tree" model="ir.ui.view"> + <record id="check_product_tree" model="ir.ui.view"> <field name="name">check.product.tree</field> <field name="model">check.product</field> <field name="arch" type="xml"> @@ -212,7 +216,18 @@ <field name="status"/> </tree> </field> - </record> --> + </record> + + <record id="barcode_product_tree" model="ir.ui.view"> + <field name="name">barcode.product.tree</field> + <field name="model">barcode.product</field> + <field name="arch" type="xml"> + <tree editable="bottom"> + <field name="product_id"/> + <field name="barcode"/> + </tree> + </field> + </record> <record id="view_stock_move_line_detailed_operation_tree_inherit" model="ir.ui.view"> <field name="name">stock.move.line.operations.tree.inherit</field> |