diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 4032c022f..e1a399f93 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -12,6 +12,7 @@ import InvoiceIntoBook from '../InvoiceInToBook.vue';
import VnTitle from 'src/components/common/VnTitle.vue';
import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
import VehicleDescriptorProxy from 'src/pages/Route/Vehicle/Card/VehicleDescriptorProxy.vue';
+import { getTotal } from 'src/composables/getTotal';
const props = defineProps({ id: { type: [Number, String], default: 0 } });
const { t } = useI18n();
@@ -165,7 +166,7 @@ const intrastatColumns = ref([
const vehicleColumns = ref([
{
name: 'numberPlate',
- label: 'invoiceIn.summary.vehicle',
+ label: 'globals.vehicle',
field: (row) => row.vehicleInvoiceIn?.numberPlate,
format: (value) => value,
align: 'left',
@@ -203,8 +204,6 @@ const getTotalTax = (tax) =>
tax.reduce((acc, cur) => acc + taxRate(cur.taxableBase, cur.taxTypeSage?.rate), 0);
const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
-const getVehicleTotalAmount = (vehicles) =>
- vehicles.reduce((acc, cur) => acc + cur.amount, 0);
:value="entity.expenseDeductible?.name"
/>
-
+
currency,
)
}}
+
-
+
@@ -440,10 +440,10 @@ const getVehicleTotalAmount = (vehicles) =>
-
+
-
+
@@ -517,7 +517,7 @@ const getVehicleTotalAmount = (vehicles) =>
{{
toCurrency(
- getVehicleTotalAmount(entity.vehicleInvoiceIn),
+ getTotal(entity.vehicleInvoiceIn, 'amount'),
)
}}
@@ -538,15 +538,15 @@ const getVehicleTotalAmount = (vehicles) =>
@media (min-width: $breakpoint-md) {
.summaryBody {
- .vat {
+ .col-65 {
flex: 65%;
}
- .due-day {
+ .col-30 {
flex: 30%;
}
- .vat,
- .due-day {
+ .col-65,
+ .col-30 {
.q-table th {
padding-right: 0;
}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVehicle.vue b/src/pages/InvoiceIn/Card/InvoiceInVehicle.vue
index 4853b166c..a02673459 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVehicle.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVehicle.vue
@@ -24,7 +24,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'vehicleFk',
- label: t('invoiceIn.summary.vehicle'),
+ label: t('globals.vehicle'),
component: 'select',
attrs: {
url: 'vehicles',
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index f809d8ff2..0a320a9df 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -34,14 +34,6 @@ invoiceIn:
originalInvoice: Original invoice
entry: Entry
emailEmpty: The email can't be empty
- card:
- client: Client
- company: Company
- customerCard: Customer card
- ticketList: Ticket List
- vat: Vat
- dueDay: Due day
- intrastat: Intrastat
summary:
currency: Currency
issued: Expedition date
@@ -63,11 +55,7 @@ invoiceIn:
net: Net
stems: Stems
country: Country
- vehicle: Vehicle
params:
- invoiceInFk: Invoice nº
- vehicleFk: Vehicle
- amount: Amount
search: Id or supplier name
correctedFk: Corrected
isBooked: Is booked
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 7f7de6e6d..34ad62986 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -33,13 +33,6 @@ invoiceIn:
originalInvoice: Factura origen
entry: Entrada
emailEmpty: El email no puede estar vacío
- card:
- client: Cliente
- company: Empresa
- customerCard: Ficha del cliente
- ticketList: Listado de tickets
- vat: Iva
- dueDay: Fecha de vencimiento
summary:
currency: Divisa
docNumber: Número documento
@@ -52,7 +45,7 @@ invoiceIn:
expense: Gasto
taxableBase: Base imp.
rate: Tasa
- sageTransaction: Sage transación
+ sageTransaction: Sage transacción
dueDay: Fecha
bank: Caja
foreignValue: Divisa
@@ -61,11 +54,7 @@ invoiceIn:
net: Neto
stems: Tallos
country: País
- vehicle: Vehículo
params:
- invoiceInFk: Factura nº
- vehicleFk: Vehículo
- amount: Importe
search: Id o nombre proveedor
correctedFk: Rectificada
isBooked: Contabilizada