diff options
| author | William Henrotin <whe@odoo.com> | 2018-05-22 11:50:35 +0200 |
|---|---|---|
| committer | William Henrotin <whe@odoo.com> | 2018-05-22 11:58:53 +0200 |
| commit | f7cda99d209c7d8178ed48e33692eb12577d6a4e (patch) | |
| tree | 075f5615377f5ddea1790b74a71c435ecf2295c4 | |
| parent | 0ccf63cae4e66c8e3736e3d2f72f27753e01f7ad (diff) | |
[FIX] stock: correct picking view
The commit ffb7976 introduce a wrong domain in the picking form view.
This commit correct it to the previous value
| -rw-r--r-- | addons/stock/models/stock_picking.py | 2 | ||||
| -rw-r--r-- | addons/stock/views/stock_picking_views.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index b481051a182..0c08bc43a36 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -303,7 +303,7 @@ class Picking(models.Model): show_operations = fields.Boolean(compute='_compute_show_operations') show_lots_text = fields.Boolean(compute='_compute_show_lots_text') has_tracking = fields.Boolean(compute='_compute_has_tracking') - immediate_transfer = fields.Boolean() + immediate_transfer = fields.Boolean(default=False) _sql_constraints = [ ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per company!'), diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml index d3f36d17173..9b1faeea16a 100644 --- a/addons/stock/views/stock_picking_views.xml +++ b/addons/stock/views/stock_picking_views.xml @@ -284,7 +284,7 @@ <page string="Operations"> <field name="id" invisible="1"/> <field name="immediate_transfer" invisible="1"/> - <field name="move_lines" attrs="{'readonly': ['|', ('show_operations', '=', True), '&', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}"> + <field name="move_lines" attrs="{'readonly': ['|', '&', ('show_operations', '=', True), '|', ('is_locked', '=', True), ('state', '=', 'done'), '&', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'picking_type_code': picking_type_code, 'default_picking_id': id, 'form_view_ref':'stock.view_move_picking_form', 'address_in_id': partner_id, 'default_picking_type_id': picking_type_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}"> <tree decoration-danger="not parent.immediate_transfer and state != 'done' and quantity_done > reserved_availability and show_reserved_availability" decoration-muted="scrapped == True or state == 'cancel' or (state == 'done' and is_locked == True)" string="Stock Moves" editable="bottom"> <field name="name" invisible="1"/> <field name="date_expected" invisible="1"/> @@ -304,8 +304,8 @@ <field name="product_id" required="1" attrs="{'readonly': ['|', '&', ('state', '!=', 'draft'), ('additional', '=', False), ('has_move_lines', '=', True)]}"/> <field name="is_initial_demand_editable" invisible="1"/> <field name="is_quantity_done_editable" invisible="1"/> - <field name="product_uom_qty" string="Initial Demand" attrs="{'column_invisible': [('parent.immediate_transfer', '=', True), ('parent.is_locked', '=', True)], 'readonly': [('is_initial_demand_editable', '=', False)]}"/> - <field name="reserved_availability" string="Reserved" attrs="{'column_invisible': (['|','&', ('parent.state','=', 'done'), ('parent.picking_type_code', '=', 'incoming'),('parent.immediate_transfer', '=', True), ('parent.is_locked', '=', True)])}"/> + <field name="product_uom_qty" string="Initial Demand" attrs="{'column_invisible': ['&',('parent.immediate_transfer', '=', True), ('parent.is_locked', '=', True)], 'readonly': [('is_initial_demand_editable', '=', False)]}"/> + <field name="reserved_availability" string="Reserved" attrs="{'column_invisible': (['|','&', ('parent.state','=', 'done'), ('parent.picking_type_code', '=', 'incoming'),'&',('parent.immediate_transfer', '=', True), ('parent.is_locked', '=', True)])}"/> <field name="quantity_done" string="Done" attrs="{'readonly': [('is_quantity_done_editable', '=', False)]}"/> <field name="product_uom" attrs="{'readonly': [('state', '!=', 'draft'), ('additional', '=', False)]}" options="{'no_open': True, 'no_create': True}" string="Unit of Measure" groups="uom.group_uom"/> <button name="action_show_details" string="Register lots, packs, location" type="object" icon="fa-list" attrs="{'invisible': [('show_details_visible', '=', False)]}" options='{"warn": true}'/> |
