Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-3086 into lp:unifield-server

  1. US-3086
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4868
Proposed branch: lp:~dorian-kemps/unifield-server/US-3086
Merge into: lp:unifield-server
Diff against target: 35 lines (+4/-4)
1 file modified
bin/addons/stock_override/stock_view.xml (+4/-4)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-3086
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+342561@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/stock_override/stock_view.xml'
2--- bin/addons/stock_override/stock_view.xml 2017-12-01 11:16:48 +0000
3+++ bin/addons/stock_override/stock_view.xml 2018-04-03 10:30:46 +0000
4@@ -648,19 +648,19 @@
5 context="{'location': location_id, 'prodlot_id': prodlot_id, 'compute_child': True, 'available_for_restriction': 'picking', 'search_default_not_restricted': 1}"
6 on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id, parent.type, purchase_line_id)"
7 colspan="4"
8- attrs="{'readonly': [('from_wkf_line', '=', True)]}"
9+ attrs="{'readonly': ['|', ('from_wkf_line', '=', True), ('state', '=', 'assigned')]}"
10 />
11 <field name="purchase_line_id" invisible="1"/>
12 <field name="change_reason" colspan="4"/>
13 <field name="product_qty"
14 on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"
15- attrs="{'readonly': [('from_wkf_line', '=', True)]}"
16+ attrs="{'readonly': ['|', ('from_wkf_line', '=', True), ('state', '=', 'assigned')]}"
17 colspan="2"
18 />
19 <field name="product_uom"
20 on_change="onchange_uom(product_uom, product_qty)"
21 string="Unit Of Measure"
22- attrs="{'readonly': [('from_wkf_line', '=', True)]}"
23+ attrs="{'readonly': ['|', ('from_wkf_line', '=', True), ('state', '=', 'assigned')]}"
24 colspan="2"
25 domain="[('uom_by_product', '=', product_id)]"/>
26 <field name="comment" colspan="4" />
27@@ -674,7 +674,7 @@
28 <field name="location_id"
29 domain="[('filter_partner_ext_cu', 'in', [parent.partner_id2, parent.ext_cu]), ('usage', '!=', 'view'), ('id', '!=', location_dest_id), '|', '&amp;', ('usage', '=', 'customer'), ('location_category', '=', 'consumption_unit'), ('usage', '=', 'supplier')]"
30 context="{'specific_rules_tree_view': True, 'prodlot_id': prodlot_id, 'product_id': product_id, 'compute_child': False}"
31- attrs="{'readonly': ['|', ('from_wkf_line', '=', True), ('is_ext_cu', '=', True)]}"
32+ attrs="{'readonly': ['|', '|', ('from_wkf_line', '=', True), ('is_ext_cu', '=', True), ('state', '=', 'assigned')]}"
33 />
34 <field name="product_type" invisible="1"/>
35 <field name="location_dest_id"

Subscribers

People subscribed via source and target branches