8355-testToMaster #1177

Merged
alexm merged 326 commits from 8355-testToMaster into master 2025-01-07 06:46:55 +00:00
3 changed files with 3 additions and 8 deletions
Showing only changes of commit 3f2cd62948 - Show all commits

View File

@ -1,10 +1,10 @@
import { toCurrency } from 'src/filters';
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);
return currency
? toCurrency(total, currency == 'default' ? undefined : currency)
: total;
: parseFloat(total).toFixed(decimalPlaces ?? 2);
}

View File

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

View File

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