diff options
| author | Nimesh (Open ERP) <nco@tinyerp.com> | 2012-10-15 10:24:34 +0530 |
|---|---|---|
| committer | Nimesh (Open ERP) <nco@tinyerp.com> | 2012-10-15 10:24:34 +0530 |
| commit | 99bf2fb663d4d2e50c7c04ebcd050b2dee8c093d (patch) | |
| tree | a9f4c4d1483c5e3471bc0f906eda357f2ea55f62 /addons/procurement | |
| parent | a7773f3f3a947aac73c0c9b64cd9683b3d324a9a (diff) | |
| parent | 7f23ad5de563eacfcae958d0011637800b097d4a (diff) | |
[MERGE] merge with lp:openobject-addons
bzr revid: nco@tinyerp.com-20121015045434-kp7a7h2l1mqa1x01
Diffstat (limited to 'addons/procurement')
| -rw-r--r-- | addons/procurement/procurement_view.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index dcaa5e8d543..973a09477fc 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -332,12 +332,12 @@ </xpath> <xpath expr="//group[@name='general']" position="after" > <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user"> - <p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_stock')]}"> - When you sell this service, nothing special will be trigered + <p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_stock')]}"> + When you sell this service, nothing special will be triggered to deliver the customer, as you set the procurement method as 'Make to Stock'. </p> - <p attrs="{'invisible': [('type','<>','product'),('procure_method','<>','make_to_stock')]}"> + <p attrs="{'invisible': ['|','|',('type','<>','product'),('procure_method','<>','make_to_stock')]}"> When you sell this product, OpenERP will <b>use the available inventory</b> for the delivery order. <br/><br/> @@ -345,7 +345,7 @@ will wait for new products. To fulfill the inventory, you should create others rules like orderpoints. </p> - <p attrs="{'invisible': [('type','<>','consu'),('procure_method','<>','make_to_stock')]}"> + <p attrs="{'invisible': ['|','|',('type','<>','consu'),('procure_method','<>','make_to_stock')]}"> When you sell this product, a delivery order will be created. OpenERP will consider that the <b>required quantities are always available</b> as it's a consumable (as a result of this, the quantity |