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

bugfix 

bzr revid: fp@tinyerp.com-20090122230436-s75nco22cskwkroo
This commit is contained in:
Fabien Pinckaers 2009-01-23 00:04:36 +01:00
parent 0bb1d799ca
commit 199b2f437d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp/mrp.py
View File

@ -251,7 +251,7 @@ class mrp_bom(osv.osv):
result = bom.id
return result
def _bom_explode(self, cr, uid, bom, factor, properties, addthis=False, level=10):
def _bom_explode(self, cr, uid, bom, factor, properties, addthis=False, level=0):
factor = factor / (bom.product_efficiency or 1.0)
factor = rounding(factor, bom.product_rounding)
if factor<bom.product_rounding:
@ -287,7 +287,7 @@ class mrp_bom(osv.osv):
result2.append({
'name': bom.routing_id.name,
'workcenter_id': wc.id,
'sequence': level,
'sequence': level+(wc_use.sequence or 0),
'cycle': cycle,
'hour': float(wc_use.hour_nbr + (wc.time_start+wc.time_stop+cycle*wc.time_cycle) * (wc.time_efficiency or 1.0)),
})

4
addons/product/pricelist.py
View File

@ -73,7 +73,7 @@ class product_pricelist_type(osv.osv):
_name = "product.pricelist.type"
_description = "Pricelist Type"
_columns = {
'name': fields.char('Name',size=64, required=True),
'name': fields.char('Name',size=64, required=True, translate=True),
'key': fields.char('Key', size=64, required=True, help="Used in the code to select specific prices based on the context. Keep unchanged."),
}
product_pricelist_type()
@ -250,7 +250,7 @@ class product_pricelist_version(osv.osv):
_columns = {
'pricelist_id': fields.many2one('product.pricelist', 'Price List',
required=True, select=True),
'name': fields.char('Name', size=64, required=True),
'name': fields.char('Name', size=64, required=True, translate=True),
'active': fields.boolean('Active'),
'items_id': fields.one2many('product.pricelist.item',
'price_version_id', 'Price List Items', required=True),

2
addons/product/product.py
View File

@ -163,7 +163,7 @@ class product_ul(osv.osv):
_name = "product.ul"
_description = "Shipping Unit"
_columns = {
'name' : fields.char('Name', size=64,select=True, required=True),
'name' : fields.char('Name', size=64,select=True, required=True, translate=True),
'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('palet', 'Palet')], 'Type', required=True),
}
product_ul()