Skip to content

Commit

Permalink
Merge PR #2080 into 15.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Jun 20, 2024
2 parents f9b99e8 + 6ad1831 commit 8a9cef9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions stock_secondary_unit/views/stock_move_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
name="secondary_uom_qty"
attrs="{'readonly': [('state', 'in', ('done', 'cancel')), ('is_locked', '=', True)]}"
force_save="1"
optional="show"
/>
<field
name="secondary_uom_id"
Expand All @@ -21,6 +22,7 @@
('product_id', '=', False)]"
attrs="{'readonly': [('state', '!=', 'draft'), ('id', '!=', False)]}"
options="{'no_create': True}"
optional="show"
/>
</field>
</field>
Expand All @@ -39,6 +41,7 @@
name="secondary_uom_qty"
attrs="{'readonly': [('state', 'in', ('done', 'cancel')), ('is_locked', '=', True)]}"
force_save="1"
optional="show"
/>
<field
name="secondary_uom_id"
Expand All @@ -47,6 +50,7 @@
('product_id', '=', False)]"
attrs="{'readonly': [('state', '!=', 'draft'), ('id', '!=', False)]}"
options="{'no_create': True}"
optional="show"
/>
</field>
</field>
Expand Down
2 changes: 2 additions & 0 deletions stock_secondary_unit/views/stock_picking_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<field
name="secondary_uom_qty"
attrs="{'column_invisible': [('parent.immediate_transfer', '=', True)], 'readonly': ['|', ('is_initial_demand_editable', '=', False), '&amp;', '&amp;', ('show_operations', '=', True), ('is_locked', '=', True), ('is_initial_demand_editable', '=', False)]}"
optional="show"
/>
<field
name="secondary_uom_id"
Expand All @@ -23,6 +24,7 @@
('product_id', '=', False)]"
options="{'no_create': True}"
attrs="{'column_invisible': [('parent.immediate_transfer', '=', True)], 'readonly': ['|', ('is_initial_demand_editable', '=', False), '&amp;', '&amp;', ('show_operations', '=', True), ('is_locked', '=', True), ('is_initial_demand_editable', '=', False)]}"
optional="show"
/>
</xpath>
<xpath
Expand Down

0 comments on commit 8a9cef9

Please sign in to comment.