Commit Graph

21691 Commits

Author SHA1 Message Date
Jorge Penadés b902a1a7f7 Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:02:17 +00:00
Jorge Penadés 1f39330041 fix: refs #5919 drop focus 2024-05-13 14:00:19 +02:00
Carlos Satorres 585a0c68a8 Merge pull request 'refs #7360 fix error weekly' (!2431) from 7360-errorWeeklyHourEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2431
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-13 12:00:18 +00:00
Guillermo Bonet 6c325fccef refactor: refs #7373 Deleted proc packageInvoicing
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:41:47 +02:00
Carlos Andrés f89ca786df eat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:31:58 +02:00
Jorge Penadés 5d5f1ef7c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 13:20:32 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Robert Ferrús 5e3fa1be8b Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:33:37 +00:00
Carlos Andrés b1af625937 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:32:46 +02:00
Pablo Natek db9c20fb22 Merge pull request 'fix: refs #4988 insert into agencyWorkCenter' (!2442) from 4988-fixInsert-into-agencyWorkCenter into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2442
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 10:31:55 +00:00
Pablo Natek bde7fc9972 fix: refs #4988 no task id on table comment
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 12:30:17 +02:00
Carlos Satorres ac4cc1506b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:18:03 +02:00
Guillermo Bonet 799108f041 fix: refs #7345 Fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 11:23:29 +02:00
Pablo Natek c7eeaf238a fix: refs #4988 add schema
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 11:04:50 +02:00
Pablo Natek 48392879cb fix: refs #4988 insert into agencyWorkCenter
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-05-13 10:59:22 +02:00
Carlos Andrés 057121582e feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:06:00 +02:00
Carlos Andrés 6d3f00ec95 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 09:54:27 +02:00
Jorge Penadés 29e3f934af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 09:35:08 +02:00
Alex Moreno 6ac664a139 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-13 09:06:57 +02:00
Pablo Natek 7301657a3a Merge pull request 'fix: duplicate version' (!2441) from fixTestDeploy into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2441
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-13 07:03:30 +00:00
Jorge Penadés 562aefecdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 08:56:54 +02:00
Pablo Natek 1e956bb0f8 fix: duplicate version
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 08:53:25 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 08:30:20 +02:00
Robert Ferrús c706f1cc2b Merge pull request 'feat: refs #7363 item_getBalance saleTracking no mostrar duplicados' (!2438) from 7363-item_getBalance into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2438
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 05:05:37 +00:00
Robert Ferrús 56906963de Merge branch 'dev' into 7363-item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:03:45 +00:00
Jorge Penadés cbb7cb18eb fix: refs #5919 delete locker field 2024-05-10 16:02:50 +02:00
Ivan Mas dfa2d67642 Merge pull request 'refs #7342 Modify decimal item plastic' (!2440) from 7342-IntToDec-Item-Plastic into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2440
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-10 13:50:51 +00:00
Alex Moreno a7910d9894 hotFix(invoiceInPdf): fix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 14:58:52 +02:00
Carlos Andrés 85aa4fae08 Merge pull request 'Ticket 180571 No se ven las ubicaciones' (!2439) from Hotfix-productionConfig-defaultSectorFk-adelantamos-cambio into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2439
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-10 12:52:17 +00:00
Ivan Mas 473f261cf1 refs #7342 Modify decimal item plastic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 14:11:29 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés 1996a00af1 feat: refs #5919 drop version 2024-05-10 13:31:21 +02:00
Carlos Andrés 349c3d71dd Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:14:23 +02:00
Robert Ferrús 32b339ffdf Merge branch 'dev' into 7363-item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:13:09 +00:00
Robert Ferrús e7df3fefc6 feat: refs #7363
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 13:11:41 +02:00
Carlos Andrés 56815e4b1a Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:10:54 +02:00
Robert Ferrús 9163d3db74 feat: refs #7363 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 13:05:44 +02:00
Jorge Penadés 8876a7ea8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 13:05:22 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Guillermo Bonet ba72408e84 refactor: refs #7345 Deprecated isFarmer__
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 12:45:53 +02:00
Guillermo Bonet 365c3fe588 Merge pull request 'refactor: refs #7345 Renamed column of invoiceInConfig' (!2437) from 7345-byeIsFarmer into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2437
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-10 10:04:25 +00:00
Robert Ferrús cb9cacc1ea feat: refs #7363 item_getBalance saleTracking no mostrar duplicados
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 11:51:54 +02:00
Guillermo Bonet 6b7a529b55 refactor: refs #7345 Renamed column of invoiceInConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:39:14 +02:00
Robert Ferrús 35f69b8692 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 07:21:05 +00:00
Jorge Penadés 4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 08:28:06 +02:00
Robert Ferrús b03fe4e6d3 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:23:07 +00:00
Pako Natek c048389412 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:13:35 +00:00
Jon Elias 6207d79244 Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2412
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-10 04:51:41 +00:00
Pako Natek 6b10f81add Merge pull request 'done' (!2435) from hotFix-collection_assign into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2435
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 17:06:25 +00:00
Pako Natek ec060209aa done
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-09 18:53:32 +02:00