diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-10-13 11:55:08 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-10-13 11:55:08 +0200 |
| commit | 368bf1a0c27aff07fa92be1d55a7f1effcae1c8a (patch) | |
| tree | ad70fa18c293c1f64266fdd34f3117d2db02243d | |
| parent | bcfee955da6b9ca8677279d6a01eb2d47f29dd94 (diff) | |
[FIX] notes of products
bzr revid: fp@tinyerp.com-20121013095508-c448sk16rdoc1kxf
| -rw-r--r-- | addons/mrp/mrp_view.xml | 2 | ||||
| -rw-r--r-- | addons/procurement/procurement_view.xml | 6 | ||||
| -rw-r--r-- | addons/project_mrp/project_mrp_view.xml | 2 | ||||
| -rw-r--r-- | addons/purchase/purchase_view.xml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 3ce38e86db6..2bd8534ea16 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -971,7 +971,7 @@ <attribute name="invisible">False</attribute> </xpath> <group name="procurement_help" position="inside"> - <p attrs="{'invisible': [('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}"> + <p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}"> When you sell this product, OpenERP will trigger <b>a manufacturing order</b> using the bill of materials assigned to this product. The delivery order will be ready once the production is done. diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index dcaa5e8d543..5660a148458 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')]}"> + <p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_stock')]}"> When you sell this service, nothing special will be trigered 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 diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml index bf3536d5273..be6bae8ca61 100644 --- a/addons/project_mrp/project_mrp_view.xml +++ b/addons/project_mrp/project_mrp_view.xml @@ -40,7 +40,7 @@ <attribute name="invisible">False</attribute> </xpath> <group name="procurement_help" position="inside"> - <p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}"> + <p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','produce')]}"> When you sell this service to a customer, <b>a task</b> will be created to follow up the job to do. This task will appear in the project related to the contract of the sale order. diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 6d1ad931c71..4d273d90b32 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -608,13 +608,13 @@ <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/> <field name="arch" type="xml"> <group name="procurement_help" position="inside"> - <p attrs="{'invisible': [('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}"> + <p attrs="{'invisible': ['|','|',('type','<>','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}"> When you sell this service to a customer, <b>a draft purchase order</b> will be created in order to subcontract the job <i attrs="{'invisible': [('seller_id','=',False)]}">to <field name="seller_id" class="oe_inline"/></i>. </p> - <p attrs="{'invisible': [('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}"> + <p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','<>','make_to_order'),('supply_method','<>','buy')]}"> When you sell this product, OpenERP will trigger <b>a draft purchase order</b> to buy the required quantities to the supplier. The delivery order will be ready after having received the |