odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]:product 

bzr revid: apa@tinyerp.com-20120913050607-q2fmubhops1d6o22
This commit is contained in:
Amit Patel 2012-09-13 10:36:07 +05:30
parent d045cc9b2c 4b198f56da
commit 0e0d66adaf
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/procurement/board_mrp_procurement_view.xml
View File

@ -15,9 +15,9 @@
<field name="model">board.board</field>
<field name="inherit_id" ref="stock.board_warehouse_form"/>
<field name="arch" type="xml">
<xpath expr="//column" position="inside">
<action name="%(procurement_action_board)d" string="Procurements in Exception"/>
</xpath>
<xpath expr="//column" position="inside">
<action name="%(procurement_action_board)d" string="Procurements in Exception"/>
</xpath>
</field>
</record>
</data>

2
addons/product/product.py
View File

@ -346,7 +346,7 @@ class product_template(osv.osv):
for product in self.browse(cr, uid, ids, context=context):
old_uom = product.uom_po_id
if old_uom.category_id.id != new_uom.category_id.id:
raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurements' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
return super(product_template, self).write(cr, uid, ids, vals, context=context)
_defaults = {

6
addons/product/product_view.xml
View File

@ -105,7 +105,7 @@
<page string="Procurements" groups="base.group_user">
<group name="procurement">
<group>
<field name="procure_method" groups="base.group_user" attrs="{'invisible':[('type','=', 'service')]}"/>
<field name="procure_method" groups="base.group_user"/>
<field name="cost_method" groups="product.group_costing_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
</group>
@ -291,9 +291,9 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.product</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,kanban</field>
<field name="view_mode">kanban,tree,form</field>
<field name="context">{"search_default_filter_to_purchase":1}</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="view_id" ref="product_kanban_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
<field name="help" type="html">
<p class="oe_view_nocontent_create">

10
addons/project_mrp/project_mrp_view.xml
View File

@ -31,6 +31,16 @@
</field>
</field>
</record>
<record id="view_product_form" model="ir.ui.view">
<field name="name">product.form.view</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<field name="uom_po_id" position="before">
<field name="supply_method" />
</field>
</field>
</record>
</data>
</openerp>

6
addons/stock/wizard/stock_change_product_qty_view.xml
View File

@ -5,8 +5,8 @@
<field name="name">Change Product Quantity</field>
<field name="model">stock.change.product.qty</field>
<field name="arch" type="xml">
<form string="Change Product Quantity" version="7.0">
<group string="Select Quantity">
<form string="Update Product Quantity" version="7.0">
<group>
<field name="new_quantity" />
<field name="product_id" invisible="1"/>
<field name="location_id" groups="stock.group_locations"/>
@ -22,7 +22,7 @@
</record>
<record id="action_view_change_product_quantity" model="ir.actions.act_window">
<field name="name">Change Product Quantity</field>
<field name="name">Update Product Quantity</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.change.product.qty</field>
<field name="view_type">form</field>