Commit Graph

356 Commits

Author SHA1 Message Date
Carlos Andrés fb0764bc1f feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-25 14:34:51 +02:00
Carlos Andrés 1bf900f81b feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-24 12:33:47 +02:00
Sergio De la torre 3da08e3a23 feat: refs #8020 machineWorkerDeprecated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-23 11:33:45 +02:00
Alex Moreno f47043cae4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 15:07:24 +02:00
Jorge Penadés ee0c0996f6 feat: refs #7524 add e2e
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-22 12:16:26 +02:00
Carlos Satorres f9360e2453 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 10:39:47 +02:00
Carlos Satorres 417305bf82 fix: refs #4774 translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 10:38:18 +02:00
Javi Gallego da772cf504 Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:29:17 +00:00
Ivan Mas 7dc35458e8 refactor: refs #7865 delete client.gestdocFk from TPV
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-17 17:05:08 +02:00
Javi Gallego 4a88ba5078 feat: refs #7744 closeAll Test 2024-10-15 15:43:12 +02:00
Jorge Penadés 295c31a5f0 feat: refs #7874 add finance obs type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 11:01:25 +02:00
Jorge Penadés 70a2189e30 Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-04 07:46:18 +00:00
Jorge Penadés 23d2d2b1ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 15:39:37 +02:00
Pablo Natek 46e2ffd6c2 fix: refs #7404 add fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 14:39:58 +02:00
Robert Ferrús 47ed9a8f4e Merge pull request 'test' (!3056) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3056
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 09:22:26 +00:00
Robert Ferrús e51dd897c3 Merge pull request 'master' (!3055) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #3055
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 09:13:09 +00:00
Robert Ferrús 6e4244866c feat: refs #8012 create column 2024-10-02 07:53:53 +02:00
Javi Gallego 4c9a199418 Merge branch 'dev' into 9722-travelThermographTrigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 12:29:55 +02:00
Alex Moreno f54a9a1348 fix(fixtures): revert bad merge master to test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:27:16 +02:00
Alex Moreno 61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 14:40:35 +02:00
Pablo Natek f858674c8a Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit f6c5f41d44, reversing
changes made to 5ee5da24e1.
2024-09-27 12:01:54 +02:00
Javi Gallego c825191823 feat: refs #9722 fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-26 15:22:40 +02:00
Javi Gallego 6ce4ff1311 Merge branch 'dev' into 6722-thermograph
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-25 13:31:12 +02:00
Javi Gallego 9ef44d8d8d feat: refs #6722 refactor createThermograph 2024-09-25 13:23:31 +02:00
Jorge Penadés 0f8db9ee7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 14:38:58 +02:00
Jorge Penadés c6a3004d12 feat: refs #7207 allocate new queue on dept change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 10:15:01 +02:00
Jorge Penadés 6ff76fd74b feat: refs #7207 show queue in worker summary
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 14:40:38 +02:00
Pablo Natek ab89c8f3ba Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 08:16:16 +00:00
Pablo Natek fb1e77f9c4 fix: refs #7404 fix back data source 2024-09-20 11:06:38 +02:00
Alex Moreno ccb60eee87 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-09-19 12:42:12 +02:00
Javier Segarra 96159224a4 Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 16:48:09 +02:00
Javi Gallego 06d06d7b1a Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2970
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-17 13:09:18 +00:00
Javier Segarra 7f6bd55eaa Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-17 13:07:25 +00:00
Javier Segarra 3e5442c40b Merge branch 'dev' into 7677_vnLocation_perf 2024-09-17 11:42:04 +02:00
Pako Natek 019d855fbf fix: refs #7969 new plantTray restriction 2024-09-17 11:22:07 +02:00
Pablo Natek d308f185bc Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 08:11:17 +00:00
Javi Gallego 06efa8be94 Merge branch 'dev' into 3505-closureTests 2024-09-17 07:12:01 +02:00
Javi Gallego e4a74ba0e9 feat: refs #3505 testBack closure 2024-09-16 13:24:33 +02:00
Guillermo Bonet 5c7a537275 feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:32:52 +02:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Pablo Natek cc1cd0563f feat: refs #7404 fixtures and translates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:00:46 +02:00
Ivan Mas dc5691fce7 Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 11:49:28 +00:00
Javier Segarra 0d47d58b71 Merge branch '7677_vnLocation_perf' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-13 09:45:09 +02:00
Jon Elias d36ce6bf99 Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 05:43:17 +00:00
Guillermo Bonet 728c40916c refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 14:38:58 +02:00
Jon Elias b3aa263cea Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:32:11 +02:00
Jorge Penadés b277ae2d92 Merge branch 'dev' into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 12:01:18 +00:00
Guillermo Bonet a718b6e81f Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:52:10 +02:00
Jorge Penadés af929c1ee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:45:35 +02:00
Ivan Mas 900e840eec Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 07:43:06 +00:00
Jorge Penadés 78a851336f chore: refs #7323 worker changes wip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 09:11:20 +02:00
Jorge Penadés cff5bef54b fix: refs #7524 add fixture orm config
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 15:47:45 +02:00
Jorge Penadés 03d711b694 chore: refs #7524 add select limit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:12:52 +02:00
Jon Elias 26876fd0a6 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 14:35:59 +02:00
Ivan Mas d330529bf2 feat: refs #7819 Delete obsolete objects
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 12:33:26 +02:00
Pablo Natek e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 07:50:41 +02:00
Carlos Satorres 28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 14:07:01 +02:00
Guillermo Bonet 9d35cbfae4 Merge branch 'dev' into 7650-triggerInv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 07:31:04 +02:00
Guillermo Bonet 79e2424a41 Merge branch 'dev' into 7844-changeProblemsCalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 08:04:21 +00:00
Ivan Mas 94461cff58 feat: refs #7758 Modify code lowerCamelCase and UNIQUE
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 11:34:26 +02:00
Ivan Mas 9806265030 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 06:25:06 +00:00
Ivan Mas d9d2ae2f7b feat: refs #7758 Add code mandateType and accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 16:45:46 +02:00
Javier Segarra b594011433 feat(salix): refs #7677 #7677 return more postcode fields 2024-08-20 07:01:13 +02:00
Javi Gallego 575577d29b feat: refs #7346 add multiple feature
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-16 10:08:58 +02:00
Pablo Natek b636b5429a fix: refs #7404 refactor fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-09 08:20:42 +02:00
Guillermo Bonet cf13aa917e feat: refs #7126 saleQuantity to saleWasteQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 08:18:30 +02:00
Guillermo Bonet 4cbea3bf7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 13:51:00 +02:00
Guillermo Bonet 8aa06e12b3 refs #7844 Fix tests part 1/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 12:39:18 +02:00
Pablo Natek 323ab638d7 fix: refs #7404 fix fixtures and back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 15:55:44 +02:00
Pablo Natek f148635c68 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed 2024-08-05 15:41:41 +02:00
Pablo Natek 961fafb33e feat: refs #7404 stockBought add and calculate 2024-08-05 15:32:36 +02:00
Guillermo Bonet 0451e4bb2a feat: refs #7650 Fix tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 10:20:04 +02:00
Guillermo Bonet 18dc3873b8 feat: refs #7650 Added no transfer lines to inventory entry and fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 09:54:43 +02:00
Jon Elias 9cf5f8759f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule 2024-07-24 07:34:44 +02:00
Jon Elias 2568ac4e92 feat: refs #6346 new wagon type section
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 13:24:43 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Javier Segarra fb8b31b397 perf: refs #7648 #7648 clean fixtures and SQL filter 2024-07-15 09:59:52 +02:00
Javier Segarra c70824535a feat(ssalix): refs #7648 clean fixtures 2024-07-12 20:52:00 +02:00
Guillermo Bonet 1e264c2102 fix: refs #7704 Warehouse priority 2024-07-12 14:04:49 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Guillermo Bonet 0d30331c9a feat: refs #7704 Fixtures hedera
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:25:26 +02:00
Guillermo Bonet ca1933cb83 feat: refs #7704 Fixtures hedera
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 13:04:19 +02:00
Guillermo Bonet 7ba2e8d4c5 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:48:31 +02:00
Guillermo Bonet 46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 07:46:18 +02:00
Guillermo Bonet 1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:02:15 +02:00
Javier Segarra 8355d544c3 Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 09:54:56 +02:00
Javier Segarra 9f57e50f89 feat(salix): refs #7380 #7380 add value to fixtures 2024-07-08 09:54:40 +02:00
Javier Segarra 3c2a44eb53 feat(salix): refs #7380 #7380 add value to fixtures 2024-07-07 23:47:00 +02:00
Guillermo Bonet fb07cdccc3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:51:09 +02:00
Guillermo Bonet 5712fbd782 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:50:43 +02:00
Carlos Satorres cf621071d0 refs #5525 fixear sql, fixtures, js 2024-07-04 16:50:54 +02:00
Javier Segarra 3710c7c9c8 Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:55:01 +02:00
Javier Segarra beff905e02 perf(salix): refs #7648 #7648 remove change role for user 2 2024-07-03 08:54:58 +02:00
Javier Segarra 5c73a20f43 Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:17:34 +00:00
Javier Segarra 08612fc70c perf(salix): refs #7648 #7648 fixtures and firstScript
gitea/salix/pipeline/pr-dev Build started... Details
2024-07-02 10:07:23 +02:00
Guillermo Bonet 9e5f416d55 refactor: refs #7418 Item type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:06:30 +02:00
Alex Moreno a26f6eaf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:32:21 +02:00
Guillermo Bonet df4e5deae6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-28 13:33:43 +02:00
Pablo Natek 478a38b0ab Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 05:14:37 +00:00