Merge lp:~unifield-team/unifield-server/us-886 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3735
Proposed branch: lp:~unifield-team/unifield-server/us-886
Merge into: lp:unifield-server
Diff against target: 15 lines (+4/-1)
1 file modified
bin/addons/procurement_request/procurement_request_view.xml (+4/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-886
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+292924@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/procurement_request/procurement_request_view.xml'
2--- bin/addons/procurement_request/procurement_request_view.xml 2016-03-14 10:06:49 +0000
3+++ bin/addons/procurement_request/procurement_request_view.xml 2016-04-26 12:08:48 +0000
4@@ -79,7 +79,10 @@
5 <field name="product_uom_qty" on_change="onchange_uom(product_id, product_uom, product_uom_qty)" />
6 <field name="cost_price" string="Cost Price (FC)" />
7 <field name="notes" />
8- <field name="type" on_change="requested_type_change(product_id, type)"/>
9+ <field name="display_confirm_button" invisible="1" />
10+ <field name="type" on_change="requested_type_change(product_id, type)"
11+ attrs="{'readonly': ['|', ('fake_state', 'not in', ['draft', 'validated']), ('display_confirm_button', '=', False)]}"
12+ />
13 <field name="my_company_id" invisible="1" />
14 <!-- utp-357: the supplier will be selected in the sourcing tool -->
15 <field name="supplier" invisible="1"

Subscribers

People subscribed via source and target branches

to all changes: