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

[IMP] multi_company in mrp 

bzr revid: fp@tinyerp.com-20091201085403-mu2upxs4ljgl7d57
This commit is contained in:
Fabien Pinckaers 2009-12-01 09:54:03 +01:00
parent 90336e2e4e
commit 9577f9a58e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/mrp/mrp.py
View File

@ -202,7 +202,7 @@ class mrp_bom(osv.osv):
'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
'company_id': fields.many2one('res.company','Company',required=True),
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
'active': lambda *a: 1,
@ -1117,6 +1117,7 @@ class mrp_procurement(osv.osv):
'location_id': procurement.location_id.id,
'pricelist_id': pricelist_id,
'order_line': [(0,0,line)],
'company_id': procurement.company_id.id,
'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
})
self.write(cr, uid, [procurement.id], {'state':'running', 'purchase_id':purchase_id})

1
addons/stock/stock.py
View File

@ -487,7 +487,6 @@ class stock_picking(osv.osv):
'invoice_state': lambda *a: 'none',
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock_picking', c)
}
def copy(self, cr, uid, id, default=None, context={}):