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

[MERGE] bom removed name field 

bzr revid: fp@tinyerp.com-20121102084453-olkflm1a7mju0jji
This commit is contained in:
Fabien Pinckaers 2012-11-02 09:44:53 +01:00
parent 8d231cec87 ec1b99dad9
commit 7d68e7d6a9
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/mrp.py
View File

@ -192,7 +192,7 @@ class mrp_bom(osv.osv):
return res
_columns = {
'name': fields.char('Name', size=64, required=True),
'name': fields.char('Name', size=64),
'code': fields.char('Reference', size=16),
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True,

10
addons/mrp/mrp_view.xml
View File

@ -366,7 +366,7 @@
</div>
</group>
<group>
<field name="name" class="oe_inline"/>
<field name="name" groups="base.group_no_one"/>
<field name="code" string="Reference"/>
<field name="type"/>
<p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
@ -442,11 +442,11 @@
<field name="arch" type="xml">
<tree string="Bill of Materials" colors="blue:method">
<field name="sequence" invisible="1"/>
<field name="name"/>
<field name="code"/>
<field name="name" invisible="1"/>
<field name="product_id"/>
<field name="product_qty"/>
<field name="product_uom" groups="product.group_uom"/>
<field name="code"/>
<field name="type"/>
<field name="method"/>
<field name="routing_id" groups="mrp.group_mrp_routings"/>
@ -462,9 +462,9 @@
<field name="arch" type="xml">
<tree string="BoM Structure" colors="blue:method">
<field name="sequence" invisible="1"/>
<field name="name" string="Component Name"/>
<field name="name" groups="base.group_no_one"/>
<field name="code"/>
<field name="product_id" string="Component Product"/>
<field name="product_id"/>
<field name="bom_id"/>
<field name="product_qty"/>
<field name="product_uom" groups="product.group_uom"/>

2
addons/stock/wizard/stock_fill_inventory_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">stock.fill.inventory</field>
<field name="arch" type="xml">
<form string="Import Inventory" version="7.0">
<separator string="Import current product inventory from the following location"/>
<separator string="Import the current inventory"/>
<group>
<field name="location_id" groups="stock.group_locations"/>
<field name="recursive" groups="stock.group_locations"/>

1
addons/stock/wizard/stock_traceability.py
View File

@ -52,7 +52,6 @@ class action_traceability(osv.osv_memory):
value = {
'domain': "[('id','in',["+','.join(map(str, ids))+"])]",
'name': ((type1=='move_history_ids2') and _('Upstream Traceability')) or _('Downstream Traceability'),
'view_type': 'tree',
'view_mode': 'tree',
'res_model': 'stock.move',
'field_parent': type1,