[MERGE] [FIX] sale_crm: add payment_term to sale order
bzr revid: mat@openerp.com-20130604144618-midnzv5x0418amkf
This commit is contained in:
commit
7a5b5e89f9
|
@ -78,11 +78,13 @@ class crm_make_sale(osv.osv_memory):
|
||||||
['default', 'invoice', 'delivery', 'contact'])
|
['default', 'invoice', 'delivery', 'contact'])
|
||||||
pricelist = partner.property_product_pricelist.id
|
pricelist = partner.property_product_pricelist.id
|
||||||
fpos = partner.property_account_position and partner.property_account_position.id or False
|
fpos = partner.property_account_position and partner.property_account_position.id or False
|
||||||
|
payment_term = partner.property_payment_term and partner.property_payment_term.id or False
|
||||||
new_ids = []
|
new_ids = []
|
||||||
for case in case_obj.browse(cr, uid, data, context=context):
|
for case in case_obj.browse(cr, uid, data, context=context):
|
||||||
if not partner and case.partner_id:
|
if not partner and case.partner_id:
|
||||||
partner = case.partner_id
|
partner = case.partner_id
|
||||||
fpos = partner.property_account_position and partner.property_account_position.id or False
|
fpos = partner.property_account_position and partner.property_account_position.id or False
|
||||||
|
payment_term = partner.property_payment_term and partner.property_payment_term.id or False
|
||||||
partner_addr = partner_obj.address_get(cr, uid, [partner.id],
|
partner_addr = partner_obj.address_get(cr, uid, [partner.id],
|
||||||
['default', 'invoice', 'delivery', 'contact'])
|
['default', 'invoice', 'delivery', 'contact'])
|
||||||
pricelist = partner.property_product_pricelist.id
|
pricelist = partner.property_product_pricelist.id
|
||||||
|
@ -100,6 +102,7 @@ class crm_make_sale(osv.osv_memory):
|
||||||
'partner_shipping_id': partner_addr['delivery'],
|
'partner_shipping_id': partner_addr['delivery'],
|
||||||
'date_order': fields.date.context_today(self,cr,uid,context=context),
|
'date_order': fields.date.context_today(self,cr,uid,context=context),
|
||||||
'fiscal_position': fpos,
|
'fiscal_position': fpos,
|
||||||
|
'payment_term':payment_term,
|
||||||
}
|
}
|
||||||
if partner.id:
|
if partner.id:
|
||||||
vals['user_id'] = partner.user_id and partner.user_id.id or uid
|
vals['user_id'] = partner.user_id and partner.user_id.id or uid
|
||||||
|
|
Loading…
Reference in New Issue