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

feat: refs #8930 add vehicle management to invoice summary and vehicle linking functionality #1736

Open
jtubau wants to merge 14 commits from 8930-createVehicleSectionOnInvoiceIn into dev
pull from: 8930-createVehicleSectionOnInvoiceIn
merge into: verdnatura:dev
Conversation 0 Commits 14 Files Changed 7 +409 -36
jtubau commented 2025-04-23 07:49:25 +00:00
Member
Copy Link

✅PR BACK: verdnatura/salix#3722

✅PR BACK: https://gitea.verdnatura.es/verdnatura/salix/pulls/3722
jtubau added 1 commit 2025-04-23 07:49:25 +00:00
jtubau requested review from jorgep 2025-04-23 07:51:55 +00:00
jorgep requested changes 2025-04-23 08:18:13 +00:00
src/pages/InvoiceIn/Card/InvoiceInSummary.vue Outdated
@ -187,2 +204,4 @@
const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
const getVehicleTotalAmount = (vehicles) =>
vehicles.reduce((acc, cur) => acc + cur.amount, 0);
jorgep commented 2025-04-23 08:11:58 +00:00
Member
Copy Link

Hay un composable para sacar el total, getTotal

Hay un composable para sacar el total, **getTotal**
src/pages/InvoiceIn/Card/InvoiceInSummary.vue Outdated
@ -413,3 +441,3 @@
</QCard>
<!--Intrastat-->
<QCard v-if="entity.invoiceInIntrastat.length">
<QCard v-if="entity.invoiceInIntrastat.length" class="vat">
jorgep commented 2025-04-23 08:10:20 +00:00
Member
Copy Link

porque class vat si la sección es de intrastat? usa otro nombre

porque class vat si la sección es de intrastat? usa otro nombre
src/pages/InvoiceIn/Card/InvoiceInSummary.vue Outdated
@ -450,2 +479,4 @@
</QTable>
</QCard>
<!-- Vehicle -->
<QCard v-if="entity?.vehicleInvoiceIn?.length" class="due-day">
jorgep commented 2025-04-23 08:11:12 +00:00
Member
Copy Link

Cambia el nombre a la clase

Cambia el nombre a la clase
src/pages/InvoiceIn/locale/en.yml
@ -63,10 +63,18 @@ invoiceIn:
net: Net
stems: Stems
country: Country
vehicle: Vehicle
jorgep commented 2025-04-23 08:13:04 +00:00
Member
Copy Link

usar traducción global

usar traducción global
src/pages/InvoiceIn/locale/en.yml Outdated
@ -70,3 +74,4 @@
account: Ledger account
correctingFk: Rectificative
noMatch: No match with the vat({totalTaxableBase})
linkVehicleToInvoiceIn: Link vehicle to invoice
jorgep commented 2025-04-23 08:13:45 +00:00
Member
Copy Link

Creo que esto lo tienes exactamente igual en vehículo. Usa las de vehículo

Creo que esto lo tienes exactamente igual en vehículo. Usa las de vehículo
jtubau commented 2025-04-23 12:00:17 +00:00
Author
Member
Copy Link

las de vehículo desvinculan la factura del vehículo y las de la factura desvinculan el vehículo de la factura, las traducciones son diferentes

las de vehículo desvinculan la factura del vehículo y las de la factura desvinculan el vehículo de la factura, las traducciones son diferentes
src/pages/InvoiceIn/locale/es.yml Outdated
@ -68,3 +72,4 @@
account: Cuenta contable
correctingFk: Rectificativa
noMatch: No cuadra con el iva({totalTaxableBase})
linkVehicleToInvoiceIn: Vincular vehículo a factura
jorgep commented 2025-04-23 08:17:22 +00:00
Member
Copy Link

Lo mismo que en inglés

Lo mismo que en inglés
jtubau commented 2025-04-23 12:00:26 +00:00
Author
Member
Copy Link

mismo que arriba ;)

mismo que arriba ;)
jtubau added 1 commit 2025-04-23 12:35:09 +00:00
jorgep requested changes 2025-04-23 12:43:31 +00:00
src/pages/InvoiceIn/Card/InvoiceInSummary.vue Outdated
@ -463,3 +539,3 @@
@media (min-width: $breakpoint-md) {
.summaryBody {
.vat {
.col-65 {
jorgep commented 2025-04-23 12:43:27 +00:00
Member
Copy Link

col-extend, col-shrink

col-extend, col-shrink
jtubau added 1 commit 2025-04-24 05:13:33 +00:00
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
4287efa700 refactor: refs #8930 update class names for readability
jtubau added 1 commit 2025-04-24 12:35:16 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
f5ba659214 Merge branch 'dev' into 8930-createVehicleSectionOnInvoiceIn
jtubau added 1 commit 2025-04-25 07:52:37 +00:00
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
00ac4305a1 Merge branch 'dev' into 8930-createVehicleSectionOnInvoiceIn
jtubau added 2 commits 2025-04-25 09:11:17 +00:00
jtubau added 1 commit 2025-04-25 11:48:49 +00:00
jtubau added 1 commit 2025-04-25 12:26:03 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
541b9f1b5f Merge branch 'dev' into 8930-createVehicleSectionOnInvoiceIn
jtubau requested review from jorgep 2025-04-25 12:26:04 +00:00
jorgep requested changes 2025-04-28 16:43:23 +00:00
src/pages/InvoiceIn/Card/InvoiceInVehicle.vue
@ -0,0 +102,4 @@
</span>
</template>
<template #more-create-dialog="{ data }">
<VnInputNumber
jorgep commented 2025-04-28 16:42:29 +00:00
Member
Copy Link

No puedes definirlo directamente en la columna? Como tipo number

No puedes definirlo directamente en la columna? Como tipo number
jtubau commented 2025-04-29 07:44:48 +00:00
Author
Member
Copy Link

Cambiado ;)

Cambiado ;)
jtubau added 3 commits 2025-04-29 07:43:55 +00:00
jtubau added 1 commit 2025-04-30 06:06:24 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
103230e869 Merge branch 'dev' into 8930-createVehicleSectionOnInvoiceIn
jtubau requested review from jorgep 2025-05-02 06:03:12 +00:00
jtubau added 1 commit 2025-05-02 06:09:25 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
16a86282fc Merge branch 'dev' into 8930-createVehicleSectionOnInvoiceIn
All checks were successful
gitea/salix-front/pipeline/pr-dev This commit looks good
Required
Details
This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
Sign in to join this conversation.
Reviewers
No reviewers
jorgep
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#1736
No description provided.
Delete Branch "8930-createVehicleSectionOnInvoiceIn"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?