 Jon Elias
|
e902a84d10
|
refactor: refs #5447 changed models
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 09:22:19 +02:00 |
 Carlos Satorres
|
4dee90ff57
|
refs #6820 fix pr
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 14:56:46 +02:00 |
|
Carlos Satorres
|
7f1210e712
|
refs #6820 fix back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 10:26:09 +02:00 |
 Sergio De la torre
|
75bb08a0c6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-16 07:08:47 +02:00 |
 Jorge Penadés
|
c6242cc2e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-15 16:41:15 +02:00 |
|
Sergio De la torre
|
e8a30c1df8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-06 10:30:19 +02:00 |
|
Jorge Penadés
|
411933a608
|
feat: refs #6598 acls back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-03 12:17:51 +02:00 |
 Javier Segarra
|
be3ee43b06
|
fix(salix): refs #7272 #7272 Back validateToken endpoint
|
2024-04-30 11:35:30 +02:00 |
 Robert Ferrús
|
d2c3034ec6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 12:07:53 +02:00 |
|
Robert Ferrús
|
2d0d4b5643
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 06:48:01 +00:00 |
 Pablo Natek
|
51c42d09b2
|
fix: refs #4988 agency hook
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 08:39:05 +02:00 |
|
Pablo Natek
|
4693ba13fa
|
Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-26 08:37:51 +02:00 |
|
Pablo Natek
|
4e11e46fff
|
feat: refs #4988 capture error on duplicate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:40:54 +02:00 |
|
Robert Ferrús
|
8153a526ce
|
feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:35:21 +02:00 |
|
Pablo Natek
|
adc3b413f5
|
feat: refs #4988 agency add module
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-22 17:17:17 +02:00 |
 Javi Gallego
|
b0c4f7fd3c
|
feat: moved files to invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 11:45:58 +02:00 |
|
Pablo Natek
|
77f7348acb
|
feat(workcenter): refs #4988 add workcenter config menu
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 09:02:01 +02:00 |
|
Javi Gallego
|
58baa45e09
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 09:47:21 +02:00 |
|
Pablo Natek
|
0418540ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 07:39:13 +02:00 |
|
Pablo Natek
|
336c3274ea
|
feat(agency): refs #4988 add summary
|
2024-04-16 07:38:48 +02:00 |
|
Javi Gallego
|
e8001b72e4
|
feat: minor changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-13 09:05:54 +02:00 |
|
Javi Gallego
|
bb6ea31bf7
|
feat: funcional a falta de test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 10:26:32 +02:00 |
|
Sergio De la torre
|
13415b1ef0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-12 09:49:18 +02:00 |
|
Javi Gallego
|
bc9149ec37
|
feat: tipo de cambio php to js
|
2024-04-11 14:32:26 +02:00 |
|
Pablo Natek
|
aff73a179e
|
remove: refs #6005 remove delay from notification model
|
2024-04-09 13:36:50 +02:00 |
|
Pablo Natek
|
da037c5235
|
refactor: refs #6005 delay on productionConfig
|
2024-04-09 13:34:33 +02:00 |
|
Pablo Natek
|
7cb40f5d89
|
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-04-09 09:42:39 +02:00 |
|
Sergio De la torre
|
d7d47da3e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
|
2024-03-21 11:19:16 +01:00 |
 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 |