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

[FIX] account: fix use of group of tax in reconciliation widget

Browse Source 
when having a tax with multiple children (grouped tax) if we use it in the reconciliation
widget while creating a new line, not all taxes children were taken into account.
This commit is contained in:
Cedric Snauwaert
2017-09-30 14:40:22 +02:00
committed by qdp-odoo
parent 511fd5995c
commit 6cefff4bf4
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/static/src/js/reconciliation/reconciliation_model.js
+20 -19
View File
@@ -714,26 +714,27 @@ var StatementModel = BasicModel.extend({
args: args,
})
.then(function (result) {
var tax = result.taxes[0];
var tax_prop = self._formatQuickCreate(line, {
'link': prop.id,
'tax_id': tax.id,
'amount': tax.amount,
'label': tax.name,
'account_id': tax.account_id ? [tax.account_id, null] : prop.account_id,
'analytic': tax.analytic,
'is_tax': true,
'__focus': false
_.each(result.taxes, function(tax){
var tax_prop = self._formatQuickCreate(line, {
'link': prop.id,
'tax_id': tax.id,
'amount': tax.amount,
'label': tax.name,
'account_id': tax.account_id ? [tax.account_id, null] : prop.account_id,
'analytic': tax.analytic,
'is_tax': true,
'__focus': false
});
prop.amount = tax.base;
prop.amount_str = field_utils.format.monetary(Math.abs(prop.amount), {}, formatOptions);
prop.invalid = !self._isValid(prop);
tax_prop.amount_str = field_utils.format.monetary(Math.abs(tax_prop.amount), {}, formatOptions);
tax_prop.invalid = prop.invalid;
reconciliation_proposition.push(tax_prop);
});
prop.amount = tax.base;
prop.amount_str = field_utils.format.monetary(Math.abs(prop.amount), {}, formatOptions);
prop.invalid = !self._isValid(prop);
tax_prop.amount_str = field_utils.format.monetary(Math.abs(tax_prop.amount), {}, formatOptions);
tax_prop.invalid = prop.invalid;
reconciliation_proposition.push(tax_prop);
}));
} else {
var currencyData = {