diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-10-17 09:31:46 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-10-17 09:31:46 +0200 |
| commit | 23e20e95d41d5435cf3e5bfd136a6f52efa8a80f (patch) | |
| tree | 1969e768754adbcb6976a8b32c3eb5d35e778ac4 /addons/procurement/procurement_view.xml | |
| parent | e8bd522f6be7fdeb1b7c916838193d7516833121 (diff) | |
| parent | 8a38ee944e02d6cd6cb18b87b962b67e510906a9 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121017073146-9m5s2hffeekmj068
Diffstat (limited to 'addons/procurement/procurement_view.xml')
| -rw-r--r-- | addons/procurement/procurement_view.xml | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index bf73b383216..973a09477fc 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -294,6 +294,29 @@ <field name="res_model">stock.warehouse.orderpoint</field> </record> + <record model="ir.ui.view" id="product_template_form_view_procurement"> + <field name="name">product.template.procurement</field> + <field name="model">product.template</field> + <field name="inherit_id" ref="product.product_template_form_view"/> + <field name="arch" type="xml"> + <xpath expr="//field[@name='type']" position="after"> + <field name="procure_method"/> + <field name="supply_method"/> + </xpath> + </field> + </record> + + <record id="product_search_form_view_procurment" model="ir.ui.view"> + <field name="name">product.search.procurment.form</field> + <field name="model">product.product</field> + <field name="inherit_id" ref="product.product_search_form_view"/> + <field name="arch" type="xml"> + <filter name="consumable" position="before"> + <filter string="Products" icon="terp-accessories-archiver" domain="[('type','=','product')]" help="Stockable products"/> + </filter> + </field> + </record> + <record model="ir.ui.view" id="product_form_view_procurement_button"> <field name="name">product.product.procurement</field> <field name="model">product.product</field> @@ -303,6 +326,33 @@ <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/> <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/> </xpath> + <xpath expr="//field[@name='cost_method']" position="before"> + <field name="procure_method" groups="base.group_user"/> + <field name="supply_method" groups="base.group_user"/> + </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 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')]}"> + When you sell this product, OpenERP will <b>use the available + inventory</b> for the delivery order. + <br/><br/> + If there are not enough quantities available, the delivery order + 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')]}"> + 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 + on hand may become negative). + </p> + </group> + </xpath> </field> </record> |