Commit Graph

22790 Commits

Author SHA1 Message Date
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Sergio De la torre a180f54390 refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 08:59:12 +02:00
Sergio De la torre f4767728bc refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 08:20:57 +02:00
Sergio De la torre f2225b49a7 refs #6275 hotFix fix:getExpeditionSummary 2024-04-29 08:19:18 +02:00
Pako Natek bb4f97102e Merge pull request 'hotFix' (!2380) from hotFix-GET_LOCK into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2380
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-27 11:14:59 +00:00
Pako Natek 9aa6e3f80a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 13:09:15 +02:00
Pako Natek 97142bf976 Merge pull request 'hotFix' (!2379) from hotFix-GET_LOCK-TEST into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2379
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-27 10:57:04 +00:00
Pako Natek 3440bb1725 hotFix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-27 12:43:15 +02:00
Pako Natek 9e87b055b7 hotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 12:36:21 +02:00
Jorge Penadés b9d3684db2 feat: refs #6600 add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 15:48:30 +02:00
Jorge Penadés 7ee279cb31 Merge pull request '#7019 warmfix e2e' (!2376) from 7019-warmfix-createInvoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2376
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-26 12:21:16 +00:00
Jorge Penadés 30e927d722 feat: refs #6202 dbWatcher script
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:10:05 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Robert Ferrús b129d25230 Merge pull request 'fix: refs #177968 restore restriction' (!2375) from 177968-hotFixSale_replaceItem into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2375
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-26 08:54:36 +00:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Jorge Penadés 1e5c90e921 fix: refs #7019 e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 09:30:20 +02:00
Robert Ferrús c819b92141 fix: refs #177968 restore restriction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-26 09:09:22 +02:00
Pablo Natek 17ed4b7f08 Merge pull request '#4988 - new-module-agency' (!2303) from 4988-new-module-agency into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2303
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:06:55 +00:00
Carlos Satorres dab69cc9a3 Merge pull request '6976-supplierConsumption' (!2365) from 6976-supplierConsumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2365
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:04:53 +00:00
Carlos Satorres e2696cd883 Merge branch 'dev' into 6976-supplierConsumption
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:58:36 +00:00
Carlos Satorres bc94850cc8 refs #6976 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:59:00 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Pablo Natek 51c42d09b2 fix: refs #4988 agency hook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:39:05 +02:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Carlos Satorres e78b23a849 refs #6976 remove css
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:31:33 +02:00
Robert Ferrús 2cdc64cbe7 Merge pull request 'feat: refs #6223 ticketCalculateClon' (!2360) from 6223-ticketCalculateClon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2360
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-26 05:23:11 +00:00
Robert Ferrús 30a905f40b Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 05:08:26 +00:00
Javi Gallego 63320af4c7 Merge pull request '#7108 - exchange-rate' (!2295) from 7108-exchange-rate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2295
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 05:00:05 +00:00
Javi Gallego 94e04c1c2f Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:45:43 +02:00
Carlos Andrés a4417dde6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-25 19:23:48 +02:00
Carlos Andrés e07655bcf3 Merge pull request 'Hotfix test farmingDeliveryNote' (!2372) from HotFix-test-farmingDeliveryNote into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2372
Reviewed-by: Ivan Mas <ivanm@verdnatura.es>
2024-04-25 17:10:03 +00:00
Carlos Andrés f25d3c14c6 Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-25 19:06:06 +02:00
Carlos Andrés 326c5c97bd Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-04-25 19:02:05 +02:00
Jorge Penadés 86d8bc877a Merge pull request '#7019 fix(createManualInvoice): add throw error' (!2175) from 7019_fix_createManualInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-25 15:30:17 +00:00
Jorge Penadés dd4762ad6e Merge pull request '#7211 check if there's available clockIn' (!2368) from 7211-fixWorkerTimeControl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2368
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-25 15:23:16 +00:00
Jorge Penadés b09fa1e2fb feat: refs #7019 changelog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:22:30 +02:00
Pablo Natek d25c5eb327 fix: refs #4988 translates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:22:22 +02:00
Pablo Natek af1abe934f fix: refs #4988 translates 2024-04-25 17:21:59 +02:00
Jorge Penadés b9de2b3ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:18:37 +02:00
Jorge Penadés 32da39899a fix: refs #7211 test e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:16:43 +02:00
Pablo Natek 5c45dd6c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 16:18:18 +02:00
Sergio De la torre 611f907ef0 refs #6861 feat:reserveWithReservation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 16:15:53 +02:00
Jorge Penadés 180a484c55 fix: refs #7211 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:14:34 +02:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Jorge Penadés edeed037a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl 2024-04-25 15:38:40 +02:00
Jorge Penadés 4e864fed52 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 15:38:21 +02:00
Javi Gallego 2e2bc3d594 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:31:06 +00:00
Javi Gallego 4f20224acc Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 14:28:53 +02:00
Javi Gallego 7d3870e4a1 feat: refs#6382 test fixed 2024-04-25 14:28:47 +02:00
Javier Casado 89ffdbfdf7 Merge pull request '#6697 - removeClaimQuantity' (!2363) from 6697-removeClaimQuantity into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2363
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-25 11:55:33 +00:00