 Javier Segarra
|
294c2f832e
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 14:53:19 +01:00 |
 Guillermo Bonet
|
482fe77159
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 14:03:50 +01:00 |
|
Javier Segarra
|
dfcfd34202
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 13:42:36 +01:00 |
 Robert Ferrús
|
7292ac48b2
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-21 08:48:24 +00:00 |
 Javi Gallego
|
8e21ca5293
|
Merge branch 'dev' into 8381-thermographTravel
|
2025-01-21 07:53:38 +01:00 |
|
Guillermo Bonet
|
477646ba31
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-20 14:43:14 +01:00 |
|
Robert Ferrús
|
316a17304f
|
feat: refs #8401 restriction itemFk
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 12:26:29 +01:00 |
|
Robert Ferrús
|
4b78c12ee4
|
Merge branch 'master' into 8401-itemTaxCountryTrigger
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 10:26:14 +00:00 |
|
Robert Ferrús
|
cb065f42cd
|
feat: refs #8401 change request
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 11:19:24 +01:00 |
|
Guillermo Bonet
|
04180bf8da
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-20 07:52:04 +01:00 |
|
Guillermo Bonet
|
934507569e
|
feat: refs #7531 Added comment
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 07:48:43 +01:00 |
|
Guillermo Bonet
|
e6abb1d759
|
feat: refs #7531 Minor change
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 07:41:41 +01:00 |
|
Guillermo Bonet
|
044a22bc3e
|
feat: refs #7531 Deleted address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-20 07:13:04 +01:00 |
|
Robert Ferrús
|
ce96b0a819
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-19 07:58:16 +00:00 |
|
Robert Ferrús
|
6c2071742c
|
Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-19 07:38:25 +00:00 |
|
Robert Ferrús
|
5fe032ac75
|
feat: refs #8401 create triggers to itemTaxCountry
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-19 08:30:14 +01:00 |
|
Javi Gallego
|
4f68a7d262
|
feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-17 15:36:11 +01:00 |
|
Guillermo Bonet
|
e636d43f04
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-17 09:42:15 +01:00 |
|
Guillermo Bonet
|
a666cfa4cd
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-17 09:40:07 +01:00 |
|
Javi Gallego
|
d4b7d54052
|
Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3345
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-17 08:30:44 +00:00 |
|
Guillermo Bonet
|
1aa1fbda6c
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-17 08:10:26 +01:00 |
|
Guillermo Bonet
|
69b78b6bf1
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2025-01-16 15:04:21 +01:00 |
|
Javi Gallego
|
125b7730e7
|
feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-16 12:56:04 +01:00 |
|
Robert Ferrús
|
4853e45051
|
feat: refs #8398 change merge.spec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-16 07:29:40 +01:00 |
|
Guillermo Bonet
|
c2ca9cfbe5
|
feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-15 12:26:16 +01:00 |
|
Robert Ferrús
|
277cd80f50
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-14 07:13:52 +00:00 |
|
Javier Segarra
|
9bfc2a01c5
|
perf: refs #7134 sql style
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 23:09:13 +01:00 |
|
Javier Segarra
|
f207222b47
|
Merge branch 'dev' into 7134-supplierBalance
|
2025-01-13 11:56:25 +01:00 |
 Alex Moreno
|
951376af2f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-13 09:19:03 +01:00 |
|
Robert Ferrús
|
1c30de5eee
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-10 09:36:09 +00:00 |
|
Robert Ferrús
|
bdaaffbbd7
|
feat: refs #7584 changes request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-10 10:33:19 +01:00 |
|
Guillermo Bonet
|
886383b82d
|
Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-10 10:01:40 +01:00 |
 Sergio De la torre
|
1ac75d87ad
|
fix: refs #6861 refs#6861 addPrevOK
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-01-10 08:55:45 +01:00 |
|
Guillermo Bonet
|
2f0a79da3f
|
Merge branch 'test' into dev
|
2025-01-09 11:34:53 +01:00 |
|
Guillermo Bonet
|
1787cd3102
|
Merge branch 'master' into test
|
2025-01-09 11:34:41 +01:00 |
|
Guillermo Bonet
|
2141d7d95d
|
fix: refs #7912 Major corrections waste_addSales
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 11:29:07 +01:00 |
|
Guillermo Bonet
|
6b39e5c651
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 07:30:14 +01:00 |
|
Guillermo Bonet
|
15ac9bfd0a
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 07:30:04 +01:00 |
|
Guillermo Bonet
|
d0d1950e75
|
fix: refs #7912 Changed week num param to to be similar vn.time
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-09 07:28:14 +01:00 |
|
Javi Gallego
|
1816b6de67
|
feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables
|
2025-01-08 10:24:18 +01:00 |
|
Robert Ferrús
|
5d337c4def
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 06:34:24 +00:00 |
|
Robert Ferrús
|
94ccdabe89
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 06:23:04 +00:00 |
|
Robert Ferrús
|
8417030438
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-07 12:43:57 +00:00 |
|
Robert Ferrús
|
823be8e0ea
|
Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-07 12:02:35 +01:00 |
|
Robert Ferrús
|
c4c9b5640e
|
feat: refs #6822 modify transaction
|
2025-01-07 12:02:32 +01:00 |
|
Guillermo Bonet
|
065f13557b
|
feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-07 11:58:36 +01:00 |
|
Robert Ferrús
|
65aa931738
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-07 09:39:36 +00:00 |
|
Robert Ferrús
|
5c42130495
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-07 06:15:15 +00:00 |
|
Robert Ferrús
|
31aa7f9915
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer
|
2025-01-03 08:35:17 +01:00 |
|
Robert Ferrús
|
02d77324b1
|
feat: refs #6822 crear test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-03 08:27:34 +01:00 |
 Jon Elias
|
5221b9254a
|
Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn
|
2025-01-02 08:39:57 +01:00 |
|
Alex Moreno
|
7092226c01
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-02 07:51:54 +01:00 |
|
Alex Moreno
|
bf80cbbf4a
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-02 07:50:28 +01:00 |
|
Javier Segarra
|
3691daded4
|
feat: refs #7134 add bank name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-27 13:26:38 +01:00 |
|
Javier Segarra
|
ca90d6ecd7
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-27 11:57:28 +01:00 |
 Carlos Andrés
|
94136d35ff
|
Actualizar db/routines/vn/triggers/route_afterUpdate.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-18 12:22:59 +00:00 |
 Ivan Mas
|
ab5cf0f497
|
Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-18 11:17:14 +00:00 |
 Jorge Penadés
|
7a3339b623
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-18 10:18:43 +01:00 |
|
Ivan Mas
|
af86bb24c4
|
Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-17 15:06:00 +00:00 |
|
Jorge Penadés
|
b4c8e16019
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-17 12:31:27 +01:00 |
|
Jorge Penadés
|
6476eb28e6
|
Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-17 10:51:52 +01:00 |
|
Robert Ferrús
|
68715a8c36
|
Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-16 13:25:38 +00:00 |
|
Guillermo Bonet
|
fda2c5725a
|
refactor: refs #8262 Deprecated inventoryFailure
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-16 12:23:02 +01:00 |
|
Robert Ferrús
|
e7e6c88ec5
|
Merge branch 'dev' into 8190-entry_getCommission
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-16 10:18:53 +00:00 |
|
Jorge Penadés
|
d9eab36160
|
fix: refs #7936 conflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-16 09:35:41 +01:00 |
|
Jorge Penadés
|
4612bf2e9b
|
Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
|
2024-12-16 09:35:23 +01:00 |
|
Robert Ferrús
|
1d7e69cb25
|
feat: refs #7584 workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-16 07:40:49 +01:00 |
|
Guillermo Bonet
|
3cdb6c438b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-13 13:06:26 +01:00 |
|
Robert Ferrús
|
ab1eed66df
|
feat: refs #6822 changes required
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-13 12:29:03 +01:00 |
|
Guillermo Bonet
|
452ec3d731
|
fix: refs #247552 ticket 247552 claimRatio_add
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-12-13 08:29:14 +01:00 |
|
Carlos Andrés
|
20cf3e0d19
|
Merge pull request 'fix: refs #8087 refs#8087 errores travel_moveRaids' (!3264) from 8087-erroresTravel_moveRaid into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3264
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-12-12 18:21:42 +00:00 |
|
Carlos Andrés
|
fbd6178c06
|
fix: refs #8149 taxableBase invoiceIn
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-12-11 13:16:39 +01:00 |
|
Robert Ferrús
|
4f370dbaea
|
Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer
|
2024-12-11 11:54:44 +01:00 |
|
Robert Ferrús
|
43bbdfd421
|
feat: refs #6822
|
2024-12-11 11:54:40 +01:00 |
|
Robert Ferrús
|
b681585ad5
|
Merge branch 'dev' into 6822-entryTransfer
|
2024-12-11 10:21:00 +00:00 |
|
Robert Ferrús
|
7886adb8f5
|
Merge branch 'dev' into 8190-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-11 10:20:31 +00:00 |
|
Jorge Penadés
|
f69dfbd5aa
|
refactor: refs #7936 remove schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-09 14:03:45 +01:00 |
|
Jorge Penadés
|
db8ab307ab
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-05 10:10:40 +01:00 |
|
Robert Ferrús
|
6ac30dcb0c
|
feat: refs #6822 fix conflict
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-04 13:32:10 +01:00 |
|
Jorge Penadés
|
ea5bf85b55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-04 13:31:54 +01:00 |
|
Ivan Mas
|
41a3f9ae94
|
refactor: refs #8272 delete bi.rotacion
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-04 13:19:14 +01:00 |
|
Robert Ferrús
|
47cb1ff722
|
Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-04 13:18:26 +01:00 |
|
Robert Ferrús
|
b97b61c7dd
|
feat: refs #6822 fix
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-04 09:40:28 +01:00 |
|
Robert Ferrús
|
c518352bf7
|
feat: refs #6822 changes required
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-12-04 08:12:47 +01:00 |
|
Alex Moreno
|
fb13a9ff38
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-12-03 13:11:09 +01:00 |
|
Guillermo Bonet
|
6ae2853c4d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-03 12:09:16 +01:00 |
|
Guillermo Bonet
|
c52e03c677
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-03 12:09:05 +01:00 |
|
Guillermo Bonet
|
01d8f15d2f
|
fix: refs #4948 expedition_selfConsumptionPackaging
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-03 12:07:55 +01:00 |
|
Jorge Penadés
|
9d26a9df7d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-02 17:11:21 +01:00 |
|
Ivan Mas
|
1b2987494a
|
Merge branch 'dev' into 7146-route.createdToDated
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-02 14:04:36 +00:00 |
|
Guillermo Bonet
|
947812e9f1
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-02 13:07:08 +01:00 |
|
Guillermo Bonet
|
b67585137a
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-12-02 13:06:47 +01:00 |
|
Guillermo Bonet
|
508908bf85
|
fix: refs #7266 Minor changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-12-02 13:01:12 +01:00 |
|
Guillermo Bonet
|
4a74015fc5
|
fix: refs #7266 Minor changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-12-02 12:57:34 +01:00 |
|
Guillermo Bonet
|
fb58ab5bd2
|
fix: refs #7266 Created buy_getLastWihoutInventory proc
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-12-02 12:54:36 +01:00 |
|
Javier Segarra
|
22dc1e22f4
|
Merge branch 'dev' of https: refs #7134//gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-12-02 10:18:21 +01:00 |
|
Carlos Andrés
|
202ed47963
|
fix: refs #8087 refs#8087 errores travel_moveRaids
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-29 17:20:14 +01:00 |
|
Carlos Andrés
|
b0ee1f3e24
|
fix: refs #8087 refs#8087 errores travel_moveRaids
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-29 17:18:25 +01:00 |
|
Jorge Penadés
|
163c6ddd20
|
feat: refs #7936 add currency handling in invoiceIn trigger
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-29 13:44:42 +01:00 |
|
Carlos Andrés
|
fc1e0672a4
|
fix: refs #8087 refs#8087 errores travel_moveRaids
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-11-29 11:59:36 +01:00 |