pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] lp: 816138

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20111018144123-7z5etdughul5tr0h
This commit is contained in:
Quentin (OpenERP)
2011-10-18 16:41:23 +02:00
parent 57a4d1feb9 486a4fc319
commit 828aebd1ea
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/stock.py
+14 -10
View File
@@ -118,16 +118,20 @@ class stock_picking(osv.osv):
account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
taxes_ids = self.pool.get('account.fiscal.position').map_tax(cursor, user, partner.property_account_position, taxes)
invoice_line_obj.create(cursor, user, {
'name': picking.carrier_id.name,
'invoice_id': invoice.id,
'uos_id': picking.carrier_id.product_id.uos_id.id,
'product_id': picking.carrier_id.product_id.id,
'account_id': account_id,
'price_unit': price,
'quantity': 1,
'invoice_line_tax_id': [(6, 0,taxes_ids)],
})
if any(inv_line.product_id.id == picking.carrier_id.product_id.id for inv_line in invoice.invoice_line):
continue
else:
invoice_line_obj.create(cursor, user, {
'name': picking.carrier_id.name,
'invoice_id': invoice.id,
'uos_id': picking.carrier_id.product_id.uos_id.id,
'product_id': picking.carrier_id.product_id.id,
'account_id': account_id,
'price_unit': price,
'quantity': 1,
'invoice_line_tax_id': [(6, 0,taxes_ids)],
})
invoice_obj.button_compute(cursor, user, [invoice.id], context=context)
return result
stock_picking()