[MERGE] merge the branch from Numérigraphe with a better label for the address of direct delivery on PO.
bzr revid: qdp-launchpad@openerp.com-20120222164815-t6qushz6qhpuhe07
This commit is contained in:
commit
b6ee3bddd5
|
@ -163,7 +163,7 @@ class purchase_order(osv.osv):
|
|||
'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
|
||||
'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
|
||||
states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"),
|
||||
'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', domain="[('partner_id', '!=', False)]",
|
||||
'dest_address_id':fields.many2one('res.partner.address', 'Customer Address (Direct Delivery)', domain="[('partner_id', '!=', False)]",
|
||||
states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
|
||||
help="Put an address if you want to deliver directly from the supplier to the customer." \
|
||||
"In this case, it will remove the warehouse link and set the customer location."
|
||||
|
|
Loading…
Reference in New Issue