verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 76 Releases Wiki Activity

#7936 improve InvoiceIn #1004

Merged
jorgep merged 55 commits from 7936-improveInvoiceIn into dev 2024-12-18 09:22:09 +00:00
Conversation 0 Commits 55 Files Changed 36 +3 -8
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f2cd62948 - Show all commits

4
src/composables/getTotal.js
View File

@ -1,10 +1,10 @@
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
export function getTotal(rows, key, opts = {}) { export function getTotal(rows, key, opts = {}) {
const { currency, cb } = opts; const { currency, cb, decimalPlaces } = opts;
const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0); const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
return currency return currency
? toCurrency(total, currency == 'default' ? undefined : currency) ? toCurrency(total, currency == 'default' ? undefined : currency)
: total; : parseFloat(total).toFixed(decimalPlaces ?? 2);
} }

2
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -261,7 +261,7 @@ const formatOpt = (row, { model, options }, prop) => {
country: Country country: Country
es: es:
Code: Código Code: Código
amount: Cantidad amount: Valor mercancía
net: Neto net: Neto
stems: Tallos stems: Tallos
country: País country: País

5
src/pages/InvoiceIn/Card/InvoiceInVat.vue
View File

@ -188,11 +188,6 @@ const formatOpt = (row, { model, options }, prop) => {
<template #body-cell-taxablebase="{ row }"> <template #body-cell-taxablebase="{ row }">
<QTd> <QTd>
<VnInputNumber <VnInputNumber
:class="{
'no-pointer-events': isNotEuro(currency),
}"
:disable="isNotEuro(currency)"
label=""
clear-icon="close" clear-icon="close"
v-model="row.taxableBase" v-model="row.taxableBase"
clearable clearable