Merge remote-tracking branch 'origin/master' into frontend-performance-improvements

This commit is contained in:
Darko Gjorgjijoski
2025-08-28 11:13:45 +02:00
51 changed files with 651 additions and 165 deletions

View File

@@ -191,7 +191,7 @@ const taxes = computed({
return {
...tax,
tax_type_id: tax.id,
tax_name: `${tax.name} (${tax.calculation_type === 'fixed'
tax_name: `${tax.name} (${tax.calculation_type === 'fixed'
? new Intl.NumberFormat(undefined, {
style: 'currency',
currency: companyStore.selectedCompanyCurrency.code
@@ -216,7 +216,7 @@ const getTaxTypes = computed(() => {
return {
...tax,
tax_type_id: tax.id,
tax_name: `${tax.name} (${tax.calculation_type === 'fixed'
tax_name: `${tax.name} (${tax.calculation_type === 'fixed'
? new Intl.NumberFormat(undefined, {
style: 'currency',
currency: companyStore.selectedCompanyCurrency.code
@@ -299,7 +299,7 @@ async function submitItem() {
tax_type_id: tax.tax_type_id,
calculation_type: tax.calculation_type,
fixed_amount: tax.fixed_amount,
amount: tax.calculation_type === 'fixed' ? tax.fixed_amount : price.value * tax.percent,
amount: tax.calculation_type === 'fixed' ? tax.fixed_amount : Math.round(price.value * tax.percent),
percent: tax.percent,
name: tax.name,
collective_tax: 0,