Commit Graph

18582 Commits

Author SHA1 Message Date
Sergio De la torre 57739f4ed4 Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 09:52:58 +00:00
Javier Segarra 8bd9becb74 refs #2687 feat: remove procedure argument
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 07:34:20 +01:00
Javier Segarra 30dbc8a587 refs #2687 feat: fix test suite 2023-12-12 07:33:08 +01:00
Robert Ferrús 9894591aa9 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 17:56:40 +00:00
Javier Segarra c0d2e0511d refs #2687 feat: modify back method 2023-12-11 14:54:12 +01:00
Javier Segarra 64fbbd5dda refs #2687 feat: new transaction procedure utils 2023-12-11 14:53:55 +01:00
Javier Segarra a8dfe8f3bf refs #2687 feat: modify vn.travel_cloneWithEntries 2023-12-11 14:53:29 +01:00
Carlos Satorres 7e6f311a43 refs #6220 address filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:51:11 +01:00
Carlos Satorres 2def2d9ebd Merge branch 'dev' into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 13:50:11 +00:00
Carlos Satorres c81ca94d2e refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:44:33 +01:00
Jorge Penadés 84270587cb refs #6274 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:42:19 +01:00
Javier Segarra f817551a57 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:59:02 +01:00
Jorge Penadés 5f6f13e234 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:48:12 +01:00
Javier Segarra 24c7271dd8 Merge pull request '#6487 - Stop test container when finish' (!1884) from 6487_stop_test_container into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1884
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-12-11 11:47:34 +00:00
Carlos Satorres 2beb1f65f0 refs #6085 findOne
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:45:55 +01:00
Javier Segarra d1f0557923 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:40:16 +01:00
Javier Segarra 10247c744f Merge branch 'dev' into 6487_stop_test_container
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 11:37:15 +00:00
Guillermo Bonet a36f22a414 Merge pull request 'refs #6172 Change' (!1735) from 6172-errorMsg into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1735
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-12-11 10:48:58 +00:00
Guillermo Bonet 95a8646d07 Merge branch 'dev' into 6172-errorMsg
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:27:14 +00:00
Guillermo Bonet 09ad31a92d feat: refs #6172 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:58:48 +01:00
Carlos Satorres 53ff8784ff refs #6085 remove myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:16:46 +01:00
Carlos Satorres 6ac5d28c40 refs #6085 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 09:59:09 +01:00
Carlos Satorres 57ed36cdfc ref #6085 remove console options
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 09:43:38 +01:00
Carlos Satorres 1b78c6dfa7 Merge branch '6085-ACLsMail' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 08:55:01 +01:00
Carlos Satorres 584f3264ed refs #6085 refactor sql trad 2023-12-11 08:54:58 +01:00
Carlos Satorres 866ad7a9f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail 2023-12-11 08:20:19 +01:00
Carlos Satorres 9165995ee5 Merge branch 'dev' into 5971-addressInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 07:07:45 +00:00
Alex Moreno ec66386b44 refs #5914 fix: correct sql folder
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 07:49:44 +01:00
Alex Moreno f874faa921 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 07:47:55 +01:00
Pablo Natek 350fb7d652 Merge pull request 'feat: refs #6548 add buyer department to salesPerson list in client BasicData' (!1885) from 6548-addBuyerToSalesPersonList into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1885
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-11 06:39:33 +00:00
Pablo Natek 5a99408ba7 feat: refs #6548 add buyer department to salesPerson list in client BasicData
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 07:31:57 +01:00
Sergio De la torre f774297321 Merge pull request 'refs #5867 fix: tickets sql' (!1800) from 5867-Driver-Route-Pdf into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1800
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-11 06:05:07 +00:00
Sergio De la torre 64ecf2e229 Merge branch 'dev' into 5867-Driver-Route-Pdf
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 05:48:21 +00:00
Javier Segarra b86c73777f Update back/tests.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 19:05:54 +00:00
Jorge Penadés 810b77d264 Merge branch '6274-loginWorkerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 14:56:22 +01:00
Jorge Penadés b88d61e864 Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl 2023-12-07 14:53:33 +01:00
Jorge Penadés 6fb4e86777 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD 2023-12-07 14:47:31 +01:00
Jorge Penadés 968dc65231 refs #6274 tests created 2023-12-07 14:47:22 +01:00
Carlos Satorres 7e9134ecc3 refs #5971 change sql address
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 13:47:07 +01:00
Sergio De la torre 9937fbed5e REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 11:59:01 +01:00
Sergio De la torre 67994188ee Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 10:42:30 +00:00
Sergio De la torre fa65cc84a9 REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 11:39:22 +01:00
Sergio De la torre 61ed53bd1d REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 10:37:06 +01:00
Carlos Satorres 920b38c929 refs #5525 move sql
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 09:49:15 +01:00
Carlos Satorres f5ef6c66a4 Merge pull request 'refs #6010 remove pending' (!1876) from 6010-testBackPending into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1876
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-07 08:41:03 +00:00
Javier Segarra d37083b3a4 Merge pull request 'Merge dev - test' (!1881) from dev into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1881
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-07 08:28:24 +00:00
Jorge Penadés 76659344fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:30:35 +01:00
Carlos Satorres 3abbae7612 Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 07:16:17 +00:00
Javi Gallego be5df940bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:01:20 +01:00
Javi Gallego 58ba1c10d0 ci: dev-test 2023-12-07 08:01:16 +01:00