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

[REM] removed references of res.partner.address from mrp and its related modules 

bzr revid: bde@tinyerp.com-20120307072214-3wtnnehygrjik457
This commit is contained in:
Bharat Devnani (OpenERP) 2012-03-07 12:52:14 +05:30
parent 0caf002088
commit 49a985f4cf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/mrp/security/ir.model.access.csv
View File

@ -37,7 +37,6 @@ access_product_product_user,product.product user,product.model_product_product,m
access_product_template_user,product.template user,product.model_product_template,mrp.group_mrp_user,1,0,0,0
access_product_uom_user,product.uom user,product.model_product_uom,mrp.group_mrp_user,1,0,0,0
access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1
access_res_partner_address,res.partner.address,base.model_res_partner_address,mrp.group_mrp_user,1,0,0,0
access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0
access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0
access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
37 access_product_template_user product.template user product.model_product_template mrp.group_mrp_user 1 0 0 0
38 access_product_uom_user product.uom user product.model_product_uom mrp.group_mrp_user 1 0 0 0
39 access_product_supplierinfo_user product.supplierinfo user product.model_product_supplierinfo mrp.group_mrp_user 1 1 1 1
access_res_partner_address res.partner.address base.model_res_partner_address mrp.group_mrp_user 1 0 0 0
40 access_stock_tracking stock.tracking stock.model_stock_tracking mrp.group_mrp_user 1 1 1 0
41 access_res_partner res.partner base.model_res_partner mrp.group_mrp_user 1 0 0 0
42 access_workcenter_user mrp.production.workcenter.line.user model_mrp_production_workcenter_line mrp.group_mrp_user 1 1 1 1

10
addons/mrp_repair/mrp_repair.py
View File

@ -117,8 +117,8 @@ class mrp_repair(osv.osv):
'name': fields.char('Repair Reference',size=24, required=True),
'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner.address"),
'address_id': fields.many2one('res.partner', 'Delivery Address'),
'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"),
'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
'state': fields.selection([
('draft','Quotation'),
@ -142,7 +142,7 @@ class mrp_repair(osv.osv):
'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'),
'partner_invoice_id':fields.many2one('res.partner.address', 'Invoicing Address', domain="[('partner_id','=',partner_id)]"),
'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'),
'invoice_method':fields.selection([
("none","No Invoice"),
("b4repair","Before Repair"),
@ -230,7 +230,7 @@ class mrp_repair(osv.osv):
data['value']['location_id'] = move.location_dest_id.id
data['value']['location_dest_id'] = move.location_dest_id.id
if move.address_id:
data['value']['partner_id'] = move.address_id.partner_id and move.address_id.partner_id.id
data['value']['partner_id'] = move.address_id and move.address_id.id
else:
data['value']['partner_id'] = False
data['value']['address_id'] = move.address_id and move.address_id.id
@ -261,7 +261,7 @@ class mrp_repair(osv.osv):
partner = part_obj.browse(cr, uid, part)
pricelist = partner.property_product_pricelist and partner.property_product_pricelist.id or False
return {'value': {
'address_id': address_id or addr['delivery'],
'address_id': addr['delivery'] or addr['default'],
'partner_invoice_id': addr['invoice'],
'pricelist_id': pricelist
}