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

[jftempo]

=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2016-03-14 10:06:49 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2016-04-26 12:08:48 +0000
@@ -79,7 +79,10 @@
                                     <field name="product_uom_qty" on_change="onchange_uom(product_id, product_uom, product_uom_qty)" />
                                     <field name="cost_price" string="Cost Price (FC)" />
                                     <field name="notes" />
-                                    <field name="type" on_change="requested_type_change(product_id, type)"/>
+                                    <field name="display_confirm_button" invisible="1" />
+                                    <field name="type" on_change="requested_type_change(product_id, type)"
+                                           attrs="{'readonly': ['|', ('fake_state', 'not in', ['draft', 'validated']), ('display_confirm_button', '=', False)]}"
+                                    />
                                     <field name="my_company_id" invisible="1" />
                                     <!-- utp-357: the supplier will be selected in the sourcing tool -->
                                     <field name="supplier" invisible="1"