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

[MERGE] lp:856402 

bzr revid: qdp-launchpad@openerp.com-20111010101655-jre6xpqfspsb5vps
This commit is contained in:
Quentin (OpenERP) 2011-10-10 12:16:55 +02:00
parent 8569fc7422 f69ee9a9e0
commit 994935b124
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addons/sale/wizard/sale_make_invoice_advance.py
View File

@ -65,15 +65,22 @@ class sale_advance_payment_inv(osv.osv_memory):
that is defined as 'Automatic Invoice after delivery'."))
val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
res = val['value']
if not res.get('account_id'):
raise osv.except_osv(_('Configuration Error !'),
_('There is no income account defined ' \
'for this product: "%s" (id:%d)') % \
(sale_adv_obj.product_id.name, sale_adv_obj.product_id.id,))
line_id = obj_lines.create(cr, uid, {
'name': val['value']['name'],
'account_id': val['value']['account_id'],
'name': res.get('name'),
'account_id': res['account_id'],
'price_unit': sale_adv_obj.amount,
'quantity': sale_adv_obj.qtty,
'discount': False,
'uos_id': val['value']['uos_id'],
'uos_id': res.get('uos_id'),
'product_id': sale_adv_obj.product_id.id,
'invoice_line_tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
'invoice_line_tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
'account_analytic_id': sale.project_id.id or False,
#'note':'',
})
@ -109,15 +116,15 @@ class sale_advance_payment_inv(osv.osv_memory):
if sale.order_policy == 'picking':
self.pool.get('sale.order.line').create(cr, uid, {
'order_id': sale.id,
'name': val['value']['name'],
'name': res.get('name'),
'price_unit': -sale_adv_obj.amount,
'product_uom_qty': sale_adv_obj.qtty,
'product_uos_qty': sale_adv_obj.qtty,
'product_uos': val['value']['uos_id'],
'product_uom': val['value']['uos_id'],
'product_uos': res.get('uos_id'),
'product_uom': res.get('uos_id'),
'product_id': sale_adv_obj.product_id.id,
'discount': False,
'tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
'tax_id': [(6, 0, res.get('invoice_line_tax_id'))],
}, context)
context.update({'invoice_id':list_inv})