diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-05-15 09:32:46 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-05-15 09:32:46 +0200 |
| commit | 91d00a198021b86e95a4d034243d64b8528c0bc5 (patch) | |
| tree | 58a0fd3f3388a0773c1f5510b755a993859b6b14 /addons/procurement | |
| parent | a6c455e5ab93b8f62da41336e1b5d999c38e39aa (diff) | |
| parent | acd27e307a3439de8524172f12518ef37e5c7cca (diff) | |
[MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120515073246-73t1llk8rmt2z4a7
Diffstat (limited to 'addons/procurement')
| -rw-r--r-- | addons/procurement/procurement.py | 3 | ||||
| -rw-r--r-- | addons/procurement/procurement_view.xml | 29 |
2 files changed, 6 insertions, 26 deletions
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 164314c4573..81bfe58947f 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -571,8 +571,9 @@ stock_warehouse_orderpoint() class product_product(osv.osv): _inherit="product.product" _columns = { - 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rule') + 'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'), } + product_product() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index b3e90ab4e6e..37a0b2c48d2 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -251,15 +251,6 @@ src_model="stock.warehouse" groups="stock.group_stock_user"/> - <!-- add product_uom to context to be the default value when adding new orderpoints --> - <act_window - context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id], 'default_product_id': active_id}" - id="act_product_product_2_stock_warehouse_orderpoint" - name="Minimum Stock Rules" - res_model="stock.warehouse.orderpoint" - src_model="product.product" - groups="stock.group_stock_user"/> - <act_window context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}" id="act_procurement_2_stock_warehouse_orderpoint" @@ -275,30 +266,18 @@ <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/> <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/> - <record id="product_normal_form_view" model="ir.ui.view"> <field name="name">product.normal.form.orderpoint.inherit</field> <field name="model">product.product</field> <field name="type">form</field> <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> - <group name="misc" position="after"> - <group col="2" colspan="2" attrs="{'invisible':[('type', '=', 'service')]}"> - <separator string="Minimum Stock Rules" colspan="2"/> - <field name="orderpoint_ids" context="{'default_product_uom': uom_id}" nolabel="1"> - <tree string="Minimum Stock Rule" editable="bottom"> - <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/> - <field name="location_id"/> - <field name="product_min_qty"/> - <field name="product_max_qty"/> - <field name="product_uom" groups="product.group_uom"/> - </tree> - </field> - </group> - </group> + <group name="misc" position="after"> + <separator string="Minimum Stock Rules" colspan="4"/> + <field name="orderpoint_ids" nolabel="1" colspan="4" context="{'default_product_id': active_id}"/> + </group> </field> </record> - </data> </openerp> |