 Guillermo Bonet
|
5b546079b0
|
Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 12:38:34 +01:00 |
|
Guillermo Bonet
|
0867211573
|
refs #6403 Fix model mrwConfig
|
2024-03-15 12:38:33 +01:00 |
 Javier Segarra
|
6989299593
|
Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-15 08:26:45 +00:00 |
 Pablo Natek
|
e3b7c7bb60
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-14 09:39:13 +00:00 |
 Sergio De la torre
|
bfcfd2245b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
|
2024-03-14 07:40:30 +01:00 |
|
Javier Segarra
|
c84e86270c
|
refs #6930 perf: remove logoutMultimedia method
|
2024-03-12 13:30:32 +01:00 |
|
Javier Segarra
|
486b51bcfa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia
|
2024-03-12 12:46:46 +01:00 |
|
Sergio De la torre
|
375b690063
|
Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-12 09:12:45 +00:00 |
|
Sergio De la torre
|
61de81254a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
|
2024-03-11 08:11:00 +01:00 |
|
Pablo Natek
|
2421cc7c68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-08 08:23:08 +01:00 |
|
Sergio De la torre
|
69ad44c0bd
|
Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-07 07:18:16 +01:00 |
|
Guillermo Bonet
|
39b4e5db28
|
Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-07 06:17:26 +00:00 |
|
Javier Segarra
|
6c06f70121
|
Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-06 18:18:34 +00:00 |
|
Sergio De la torre
|
cf181521d6
|
refs #6078 feat:add workeractivity
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-05 11:53:57 +01:00 |
|
Guillermo Bonet
|
e0732835d0
|
refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-05 10:25:23 +01:00 |
|
Javier Segarra
|
23b3fb81f9
|
refs 6930 feat: implements logout remoteMethod
|
2024-02-28 10:43:19 +01:00 |
|
Sergio De la torre
|
fd077ae60f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
|
2024-02-28 07:45:39 +01:00 |
|
Javier Segarra
|
f2ad069186
|
refs 6930 feat: get multimediaToken from new method
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-27 14:26:54 +01:00 |
 Jorge Penadés
|
c875abf5e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-27 09:42:14 +01:00 |
|
Sergio De la torre
|
96abdd4630
|
refs #6078 feat:add workeractivity
|
2024-02-26 12:52:34 +01:00 |
|
Javier Segarra
|
a078de9521
|
refs #6930 feat: return multimediaToken when login
|
2024-02-26 06:51:19 +01:00 |
 Juan Ferrer
|
3f0d301870
|
Merge pull request 'refs #6915 master into test' (!2092) from master into test
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2092
|
2024-02-23 18:02:07 +00:00 |
|
Pablo Natek
|
18da27179d
|
merge(dev): refs #6005 traduction conflict
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-02-23 09:40:58 +01:00 |
 Alex Moreno
|
01f1bd0088
|
Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good
Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
|
2024-02-21 14:44:34 +01:00 |
|
Pablo Natek
|
1c40e01fcb
|
refactor: refs #6005 move the logic to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-20 13:49:42 +01:00 |
|
Pablo Natek
|
ab7eb88913
|
merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-20 09:34:08 +01:00 |
|
Jorge Penadés
|
d5a3413307
|
fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-19 14:46:42 +01:00 |
|
Jorge Penadés
|
8d1dea8a00
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-19 11:19:59 +01:00 |
|
Sergio De la torre
|
f4ea220578
|
Merge branch 'dev' into 6559_getSectors
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-16 12:54:45 +00:00 |
|
Jorge Penadés
|
63c615655b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-16 08:34:05 +01:00 |
|
Pablo Natek
|
94fe0220e5
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration
|
2024-02-16 08:30:06 +01:00 |
|
Sergio De la torre
|
0ad8306dd9
|
refs#5890 feat: delete trigger and modify getTickets
|
2024-02-16 07:00:08 +01:00 |
|
Alex Moreno
|
625922275c
|
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-02-15 10:14:19 +01:00 |
|
Alex Moreno
|
fddbf6451b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-02-15 07:52:08 +01:00 |
|
Sergio De la torre
|
36683597ec
|
refs #6559 feat:quit call get_sectors
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-02-09 07:02:00 +01:00 |
|
Jorge Penadés
|
2940c68516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-08 08:36:05 +01:00 |
|
Pablo Natek
|
d2d28889b6
|
merge(master): refs #6403 merge master fix conflicts
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-02-07 16:55:09 +01:00 |
|
Alex Moreno
|
87864593b2
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-02-07 06:17:35 +00:00 |
|
Sergio De la torre
|
844bab3cc8
|
#refs 5890 feat:add assignCollection
|
2024-02-06 16:17:53 +01:00 |
|
Javier Segarra
|
b4bb9a4849
|
refs #5834 feat: new validation
|
2024-01-31 10:46:16 +01:00 |
|
Javier Segarra
|
7ebdf59d97
|
Merge branch 'dev' into 5834-billingDataAutoFillBic
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-01-30 14:06:27 +00:00 |
|
Jorge Penadés
|
e17fc91415
|
fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-30 14:58:11 +01:00 |
|
Juan Ferrer
|
194262a93e
|
fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-29 13:48:02 +01:00 |
|
Jorge Penadés
|
72e5050d93
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-29 08:37:55 +01:00 |
|
Guillermo Bonet
|
49a08a96da
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-26 11:56:43 +00:00 |
|
Pablo Natek
|
3848503853
|
fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-25 14:58:48 +01:00 |
|
Jorge Penadés
|
65e5c6dac5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-22 12:45:25 +01:00 |
|
Guillermo Bonet
|
6701f70a33
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-22 09:07:31 +00:00 |
|
Jorge Penadés
|
d41d57143f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 13:53:26 +01:00 |
|
Pablo Natek
|
854447f7c1
|
feat: refs #6403 mrw cancelShipment
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 07:36:21 +01:00 |
|
Guillermo Bonet
|
1a52e58eaa
|
feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 14:18:31 +01:00 |
|
Javier Segarra
|
d2db0661e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6694_postcode_location_filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 14:16:50 +01:00 |
|
Javier Segarra
|
71f387f626
|
refs #6694 feat: move filter remote method to own file
|
2024-01-17 14:15:21 +01:00 |
|
Guillermo Bonet
|
45fd96cee6
|
feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 13:07:26 +01:00 |
|
Guillermo Bonet
|
2f67056dbf
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 09:44:32 +01:00 |
|
Javier Segarra
|
30b505aa8f
|
refs #6694 feat: add filter for postcodes
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 08:34:15 +01:00 |
|
Jorge Penadés
|
53a10dda58
|
feat: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 08:17:55 +01:00 |
|
Pablo Natek
|
7e3660aece
|
feat(cancelShipment): refs #6403 mrwintegration
|
2024-01-16 15:04:06 +01:00 |
|
Guillermo Bonet
|
5bbeda4014
|
feat: refs #4734 Added viaexpress interdia
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-16 13:05:16 +01:00 |
|
Pablo Natek
|
73c0ca5382
|
feat(mrwXml): refs #6403 render and transmEnvio integrated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 15:00:36 +01:00 |
|
Javier Segarra
|
3ace078705
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-12 12:53:49 +01:00 |
|
Jorge Penadés
|
c61f5a67b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-11 09:28:24 +01:00 |
|
Guillermo Bonet
|
08aaf660e2
|
Merge branch 'dev' into 6410-dmsTypePath
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 13:33:01 +00:00 |
|
Guillermo Bonet
|
81ffc122fc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 14:09:47 +01:00 |
|
Guillermo Bonet
|
9a82fbea05
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 14:07:32 +01:00 |
|
Guillermo Bonet
|
d5ca47ea2a
|
refactor: refs #6410 Deleted dmsType.path
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 09:51:12 +01:00 |
|
Alex Moreno
|
4e823593b5
|
refs #6067 fix(Mailer): await send email
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 14:35:01 +01:00 |
|
Jorge Penadés
|
7a64b57a2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 15:07:33 +01:00 |
|
Jorge Penadés
|
6d0e1cc47c
|
refactor: fix conficts refs #6276
|
2024-01-04 08:51:18 +01:00 |
|
Javier Segarra
|
4d7f0329ee
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 12:46:26 +00:00 |
|
Jorge Penadés
|
b086da1936
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 08:57:46 +01:00 |
 Carlos Satorres
|
12165ab382
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 08:31:07 +01:00 |
|
Jorge Penadés
|
767894b128
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2024-01-02 09:41:47 +01:00 |
|
Jorge Penadés
|
2e1715a968
|
refactor renewToken & replace ACL: refs #6274
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-22 15:19:45 +01:00 |
|
Javier Segarra
|
4d2cf87f49
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-22 09:37:53 +00:00 |
|
Javier Segarra
|
8d08adca21
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-22 09:36:02 +00:00 |
|
Javier Segarra
|
ec1befcfb0
|
Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-22 09:25:57 +00:00 |
|
Javier Segarra
|
6b37f23349
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 13:06:52 +01:00 |
|
Alex Moreno
|
9951e911ae
|
refs #5925 feat(docuware_upload): use userConfig.tabletFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 10:39:46 +01:00 |
|
Alex Moreno
|
d30dcd7d70
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet
|
2023-12-21 09:22:49 +01:00 |
|
Javier Segarra
|
57b3d96628
|
refs #6434 fix: bad throw error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-20 09:27:25 +00:00 |
|
Javier Segarra
|
c3b91e1719
|
Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-20 09:25:15 +00:00 |
|
Pablo Natek
|
3e2cac5544
|
Merge branch 'dev' into 6005-backupLabeler
|
2023-12-19 14:05:45 +01:00 |
|
Pablo Natek
|
f68529960e
|
fix(notification): refs #6005 notification changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 10:51:18 +01:00 |
|
Jorge Penadés
|
779cbd2c0a
|
refs #6276 collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-18 11:43:15 +01:00 |
|
Jorge Penadés
|
36a9b0eee4
|
refs #6276 collectionAddItem
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 16:00:07 +01:00 |
|
Javier Segarra
|
d364a50ec4
|
refs #6264 feat: remove validateToken endpoint
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 13:39:43 +01:00 |
|
Javier Segarra
|
5a36fabf05
|
refs #6434 feat: insert record just when fail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 12:07:57 +01:00 |
|
Javier Segarra
|
5f93b8c440
|
refs #6434 fix: bad merge
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 12:01:18 +01:00 |
|
Javier Segarra
|
5b3645a641
|
refs #6434 fix: bad merge
gitea/salix/pipeline/head Build queued...
Details
|
2023-12-13 11:59:00 +01:00 |
|
Javier Segarra
|
d69b59b63e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 11:54:28 +01:00 |
|
Carlos Satorres
|
2393625a48
|
refs #5925 Tablet
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 08:22:58 +01:00 |
|
Carlos Satorres
|
412cac7e94
|
refs #5925 models table docuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 14:42:36 +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
|
866ad7a9f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
|
2023-12-11 08:20:19 +01:00 |
|
Javier Segarra
|
a7c48b6ddc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 13:02:34 +01:00 |
|
Carlos Satorres
|
051c93a42c
|
remove fdescribe
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 09:41:24 +01:00 |
|
Carlos Satorres
|
c0ce7e542f
|
refs #6085 solve testback
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 09:40:57 +01:00 |
|
Carlos Satorres
|
6d486fbec9
|
refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:58:45 +01:00 |
|
Jorge Penadés
|
30b63f577f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 09:49:49 +01:00 |