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

[FIX] point_of_sale: fiscal position with included taxes in POS

Browse Source 
To substract the included tax from the unit price when it's mapped
by a fiscal position in the POS.

To keep the same behavior introduced by this commit odoo@503820a

opw:710437
This commit is contained in:
Goffin Simon
2017-04-24 11:40:25 +02:00
parent 9e6860a228
commit 5b50284127
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/models.js
+30 -2
View File
@@ -1345,7 +1345,7 @@ exports.Orderline = Backbone.Model.extend({
}
return false;
},
compute_all: function(taxes, price_unit, quantity, currency_rounding) {
compute_all: function(taxes, price_unit, quantity, currency_rounding, no_map_tax) {
var self = this;
var list_taxes = [];
var currency_rounding_bak = currency_rounding;
@@ -1356,7 +1356,9 @@ exports.Orderline = Backbone.Model.extend({
var total_included = total_excluded;
var base = total_excluded;
_(taxes).each(function(tax) {
tax = self._map_tax_fiscal_position(tax);
if (!no_map_tax){
tax = self._map_tax_fiscal_position(tax);
}
if (tax.amount_type === 'group'){
var ret = self.compute_all(tax.children_tax_ids, price_unit, quantity, currency_rounding);
total_excluded = ret.total_excluded;
@@ -1813,6 +1815,27 @@ exports.Order = Backbone.Model.extend({
this.orderlines.remove(line);
this.select_orderline(this.get_last_orderline());
},
fix_tax_included_price: function(line){
if(this.fiscal_position){
var unit_price = line.price;
var taxes = line.get_taxes();
var mapped_included_taxes = [];
_(taxes).each(function(tax) {
var line_tax = line._map_tax_fiscal_position(tax);
if(tax.price_include && tax.id != line_tax.id){
mapped_included_taxes.push(tax);
}
})
unit_price = line.compute_all(mapped_included_taxes, unit_price, 1, this.pos.currency.rounding, true).total_excluded;
line.set_unit_price(unit_price);
}
},
add_product: function(product, options){
if(this._printed){
this.destroy();
@@ -1828,9 +1851,14 @@ exports.Order = Backbone.Model.extend({
if(options.quantity !== undefined){
line.set_quantity(options.quantity);
}
if(options.price !== undefined){
line.set_unit_price(options.price);
}
//To substract from the unit price the included taxes mapped by the fiscal position
this.fix_tax_included_price(line);
if(options.discount !== undefined){
line.set_discount(options.discount);
}