audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ADD] Support for fiscal positions

Browse Source 
[FIX] Remove faulty calls to abs()
This commit is contained in:
Stefan Rijnhart
2013-10-05 16:52:58 +02:00
parent 63a3bf45ae
commit e117d11152
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
account_bank_statement_tax/model/account_bank_statement.py
View File

@@ -48,14 +48,25 @@ class AccountBankStatement(orm.Model):
move_lines = [] move_lines = []
update_move_line = {} update_move_line = {}
base_amount = -defaults['credit'] or defaults['debit'] base_amount = -defaults['credit'] or defaults['debit']
tax_obj = self.pool.get('account.tax')
fiscal_position = (
st_line.partner_id.property_account_position
if st_line.partner_id and
st_line.partner_id.property_account_position
else False)
tax_ids = self.pool.get('account.fiscal.position').map_tax(
cr, uid, fiscal_position, [st_line.tax_id])
taxes = tax_obj.browse(cr, uid, tax_ids, context=context)
computed_taxes = tax_obj.compute_all( computed_taxes = tax_obj.compute_all(
cr, uid, [st_line.tax_id], base_amount, 1.00) cr, uid, taxes, base_amount, 1.00)
for tax in computed_taxes['taxes']: for tax in computed_taxes['taxes']:
if tax['tax_code_id']: if tax['tax_code_id']:
if not update_move_line.get('tax_code_id'): if not update_move_line.get('tax_code_id'):
update_move_line['tax_code_id'] = tax['base_code_id'] update_move_line['tax_code_id'] = tax['base_code_id']
update_move_line['tax_amount'] = tax['base_sign'] * abs( update_move_line['tax_amount'] = tax['base_sign'] * (
computed_taxes.get('total', 0.0)) computed_taxes.get('total', 0.0))
# As the tax is inclusive, we need to correct the amount on the # As the tax is inclusive, we need to correct the amount on the
# original move line # original move line
@@ -71,7 +82,7 @@ class AccountBankStatement(orm.Model):
'ref': defaults.get('ref', False), 'ref': defaults.get('ref', False),
'statement_id': defaults.get('statement_id'), 'statement_id': defaults.get('statement_id'),
'tax_code_id': tax['tax_code_id'], 'tax_code_id': tax['tax_code_id'],
'tax_amount': tax['tax_sign'] * abs(tax.get('amount', 0.0)), 'tax_amount': tax['tax_sign'] * tax.get('amount', 0.0),
'account_id': tax.get('account_collected_id', defaults['account_id']), 'account_id': tax.get('account_collected_id', defaults['account_id']),
'credit': tax['amount'] < 0 and - tax['amount'] or 0.0, 'credit': tax['amount'] < 0 and - tax['amount'] or 0.0,
'debit': tax['amount'] > 0 and tax['amount'] or 0.0, 'debit': tax['amount'] > 0 and tax['amount'] or 0.0,