shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed document item change tax ( #363ax08 )

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-07-27 12:53:25 +03:00
parent 9c2a472357
commit 5cf2961998
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/assets/js/views/common/documents.js vendored
View File

@ -163,10 +163,17 @@ const app = new Vue({
sub_total += item.total; sub_total += item.total;
grand_total += item.grand_total; grand_total += item.grand_total;
let item_tax_ids = [];
item.tax_ids.forEach(function(item_tax, item_tax_index) {
item_tax_ids.push(item_tax.id);
});
this.form.items[index].name = item.name; this.form.items[index].name = item.name;
this.form.items[index].description = item.description; this.form.items[index].description = item.description;
this.form.items[index].quantity = item.quantity; this.form.items[index].quantity = item.quantity;
this.form.items[index].price = item.price; this.form.items[index].price = item.price;
this.form.items[index].tax_ids = item_tax_ids;
this.form.items[index].discount = item.discount; this.form.items[index].discount = item.discount;
this.form.items[index].discount_type = item.discount_type; this.form.items[index].discount_type = item.discount_type;
this.form.items[index].total = item.total; this.form.items[index].total = item.total;
@ -263,6 +270,7 @@ const app = new Vue({
if (inclusives.length) { if (inclusives.length) {
inclusives.forEach(function(inclusive) { inclusives.forEach(function(inclusive) {
item.tax_ids[inclusive.tax_index].name = inclusive.tax_name;
item.tax_ids[inclusive.tax_index].price = item.grand_total - (item.grand_total / (1 + inclusive.tax_rate / 100)); item.tax_ids[inclusive.tax_index].price = item.grand_total - (item.grand_total / (1 + inclusive.tax_rate / 100));
inclusive_tax_total += item.tax_ids[inclusive.tax_index].price; inclusive_tax_total += item.tax_ids[inclusive.tax_index].price;
@ -275,6 +283,7 @@ const app = new Vue({
if (fixed.length) { if (fixed.length) {
fixed.forEach(function(fixed) { fixed.forEach(function(fixed) {
item.tax_ids[fixed.tax_index].name = fixed.tax_name;
item.tax_ids[fixed.tax_index].price = fixed.tax_rate * item.quantity; item.tax_ids[fixed.tax_index].price = fixed.tax_rate * item.quantity;
total_tax_amount += item.tax_ids[fixed.tax_index].price; total_tax_amount += item.tax_ids[fixed.tax_index].price;
@ -291,6 +300,7 @@ const app = new Vue({
if (normal.length) { if (normal.length) {
normal.forEach(function(normal) { normal.forEach(function(normal) {
item.tax_ids[normal.tax_index].name = normal.tax_name;
item.tax_ids[normal.tax_index].price = price_for_tax * (normal.tax_rate / 100); item.tax_ids[normal.tax_index].price = price_for_tax * (normal.tax_rate / 100);
total_tax_amount += item.tax_ids[normal.tax_index].price; total_tax_amount += item.tax_ids[normal.tax_index].price;
@ -301,6 +311,7 @@ const app = new Vue({
if (withholding.length) { if (withholding.length) {
withholding.forEach(function(withholding) { withholding.forEach(function(withholding) {
item.tax_ids[withholding.tax_index].name = withholding.tax_name;
item.tax_ids[withholding.tax_index].price = -(price_for_tax * (withholding.tax_rate / 100)); item.tax_ids[withholding.tax_index].price = -(price_for_tax * (withholding.tax_rate / 100));
total_tax_amount += item.tax_ids[withholding.tax_index].price; total_tax_amount += item.tax_ids[withholding.tax_index].price;
@ -313,6 +324,7 @@ const app = new Vue({
if (compounds.length) { if (compounds.length) {
compounds.forEach(function(compound) { compounds.forEach(function(compound) {
item.tax_ids[compound.tax_index].name = compound.tax_name;
item.tax_ids[compound.tax_index].price = (item.grand_total / 100) * compound.tax_rate; item.tax_ids[compound.tax_index].price = (item.grand_total / 100) * compound.tax_rate;
totals_taxes = this.calculateTotalsTax(totals_taxes, compound.tax_id, compound.tax_name, item.tax_ids[compound.tax_index].price); totals_taxes = this.calculateTotalsTax(totals_taxes, compound.tax_id, compound.tax_name, item.tax_ids[compound.tax_index].price);
@ -449,6 +461,7 @@ const app = new Vue({
}, },
onSelectedTax(item_index) { onSelectedTax(item_index) {
if (! this.tax_id) { if (! this.tax_id) {
return; return;
} }
@ -477,6 +490,7 @@ const app = new Vue({
} }
this.tax_id = ''; this.tax_id = '';
this.items[item_index].add_tax = false;
this.onCalculateTotal(); this.onCalculateTotal();
}, },