Commit Graph

1175 Commits

Author SHA1 Message Date
Carlos Satorres 869c7ab598 fix: refs #6644 email and translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 07:37:42 +01:00
Guillermo Bonet 4c9682e107 Merge branch 'dev' into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-24 05:16:16 +00:00
Guillermo Bonet 0af58b20be feat: refs #7266 Item label QR finished
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-22 12:02:04 +02:00
Guillermo Bonet bf2d7541a5 feat: refs #7266 Item label QR
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-21 14:57:55 +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
Carlos Satorres 46e657675b fix: refs #7906 remake method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-16 08:26:39 +02:00
Javi Gallego 4a88ba5078 feat: refs #7744 closeAll Test 2024-10-15 15:43:12 +02:00
Jorge Penadés 2071518f57 fix: refs #7874 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 10:35:04 +02:00
Jorge Penadés fd877119a9 chore: refs #7874 drop useless locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 10:34:01 +02:00
Jorge Penadés 546bb85484 Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 09:27:51 +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
Alex Moreno 75d0c298a1 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-master This commit looks good Details
2024-09-30 14:38:17 +02:00
Alex Moreno dbbd2c7947 feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-30 08:04:01 +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
Jorge Penadés f3bf0b7432 feat: refs #7874 validate required field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-26 17:20:50 +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 80c6497d3c feat: refs #6722 traduccion 2024-09-25 13:29:11 +02:00
Javi Gallego 9ef44d8d8d feat: refs #6722 refactor createThermograph 2024-09-25 13:23:31 +02:00
Alex Moreno 326c1755d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-25 12:07:57 +02:00
Alex Moreno aadce7971b fix: translation
gitea/salix/pipeline/head This commit looks good Details
2024-09-25 12:06:50 +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
Jorge Penadés a6168e61f1 refactor: refs #7323 improve role resolver
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-18 12:19:49 +02:00
Pablo Natek 0c259b7a81 fix: refs #7404 remove duplicate translate 2024-09-17 10:32:26 +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
Jon Elias a73bdfe18f Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule 2024-09-12 07:36:55 +02:00
Guillermo Bonet 6b5f59a09b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:27 +02:00
Guillermo Bonet 4c6aba96e5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:16 +02:00
Jorge Penadés e3b51c81f9 refactor: refs #7524 wrap it up in a fn
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 16:37:46 +02:00
Jorge Penadés 1ff1a97f29 feat: refs #7524 check noLimit method key
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 13:21:56 +02:00
Jorge Penadés b16c2bed2b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 13:09:33 +02:00
Jorge Penadés 91abf2eefe refactor: refs #7663 accurate error
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-10 09:50:02 +02:00
Jorge Penadés e2ef3472b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 09:41:46 +02:00
Jon Elias 125c0c9b3b refactor: refs #6346 requested changes 2024-09-10 07:50:40 +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
Guillermo Bonet 0ad4d3a959 feat: refs #7905 getBuysCsv
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:50:49 +02:00
Jorge Penadés 26d47b3f38 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 11:29:53 +02:00
Jorge Penadés 18d93d93a6 chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:40:16 +02:00
Guillermo Bonet b0abe829b1 fix: refs ##7905 Handle error
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 10:10:41 +02:00
Guillermo Bonet 620ce5d45e Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2900
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:44:38 +00:00
Javi Gallego 40a1b24403 Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:07:24 +00:00
Guillermo Bonet f6e585433a Merge branch '7905-getBuysCsv' of https://gitea.verdnatura.es/verdnatura/salix into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:21:02 +02:00
Guillermo Bonet 2aeff19578 fix: refs #7905 added comments to flatten.js 2024-09-05 09:21:00 +02:00
Guillermo Bonet 2b465d0d23 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 07:18:37 +00:00
Javier Segarra d49707828b fix(salix): refs #7905 #7905 use right fn to flatten data
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 09:13:33 +02:00
Robert Ferrús 4c96d57491 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-05 06:06:22 +00:00
Jorge Penadés e3015a6559 feat: refs #7524 no apply limit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-04 14:52:53 +02:00
Guillermo Bonet 2bb73af47d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:12:50 +02:00