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

[FIX] account: Allow to select sale taxes in bank statement reconciliation process. Courtesy of adrienpeiffer. PR #11673

This commit is contained in:
Adrien Peiffer (ACSONE) 2016-04-22 15:25:10 +02:00 committed by qdp-odoo
parent 7c584d3ebb
commit 600f884524
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_move_line.py
View File

@ -1378,7 +1378,7 @@ class account_move_line(osv.osv):
account_id = 'account_collected_id'
base_sign = 'base_sign'
tax_sign = 'tax_sign'
if journal.type in ('purchase_refund', 'sale_refund') or (journal.type in ('cash', 'bank') and total < 0):
if journal.type in ('purchase_refund', 'sale_refund') or (journal.type in ('cash', 'bank') and total < 0 and tax_id.type_tax_use != 'sale'):
base_code = 'ref_base_code_id'
tax_code = 'ref_tax_code_id'
account_id = 'account_paid_id'

2
addons/account/static/src/js/account_widgets.js
View File

@ -93,7 +93,7 @@ openerp.account = function (instance) {
relation: "account.tax",
string: _t("Tax"),
type: "many2one",
domain: [['type_tax_use','in',['purchase', 'all']], ['parent_id', '=', false]],
domain: [['parent_id', '=', false]],
},
},
amount: {