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

Bugfix Taxes on account_tax_include

Browse Source 
bzr revid: fp@tinyerp.com-19c22d08d7f742fc341335944f6ca74e7c57b7f8
This commit is contained in:
Fabien Pinckaers
2008-05-20 06:27:46 +00:00
parent 5023c32a60
commit 62c25f8fc2
2 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/invoice.py
+2 -4
View File
@@ -854,12 +854,10 @@ class account_invoice_line(osv.osv):
if inv.type in ('out_invoice', 'in_invoice'):
tax_code_id = tax['base_code_id']
tax_amount = tax['price_unit'] * \
line['quantity'] * tax['base_sign']
tax_amount = line.price_subtotal * tax['base_sign']
else:
tax_code_id = tax['ref_base_code_id']
tax_amount = tax['price_unit'] * \
line['quantity'] * tax['ref_base_sign']
tax_amount = line.price_subtotal * tax['ref_base_sign']
if tax_code_found:
if not tax_code_id:
addons/account_tax_include/invoice_tax_incl.py
+1 -27
View File
@@ -142,37 +142,11 @@ class account_invoice_line(osv.osv):
'price_unit': _price_unit_default,
}
#
# Compute a tax amount for each kind of tax :
#
def move_line_get(self, cr, uid, invoice_id, context={}):
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
if inv.price_type=='tax_excluded':
return super(account_invoice_line,self).move_line_get(cr, uid, invoice_id)
res = []
tax_grouped = {}
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
ait_obj = self.pool.get('account.invoice.tax')
cur = inv.currency_id
for line in inv.invoice_line:
res.append( self.move_line_get_item(cr, uid, line, context))
for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
if inv.type in ('out_invoice', 'in_invoice'):
res[-1]['tax_code_id'] = tax['base_code_id']
res[-1]['tax_amount'] = tax['price_unit'] * line['quantity'] * tax['base_sign']
else:
res[-1]['ta_code_id'] = tax['ref_base_code_id']
res[-1]['tax_amount'] = tax['price_unit'] * line['quantity'] * tax['ref_base_sign']
return res
def move_line_get_item(self, cr, uid, line, context={}):
return {
'type':'src',
'name':line.name,
'price_unit':line.price_unit,
'price_unit':line.price_subtotal / line.quantity,
'quantity':line.quantity,
'price':line.price_subtotal,
'account_id':line.account_id.id,