Pablo Natek
|
f40185c2d4
|
refs #4764 hotfix
|
2023-10-05 14:24:52 +02:00 |
Alex Moreno
|
8d7eda5af3
|
refs #5673 fix: add development translation
|
2023-10-05 09:12:54 +02:00 |
Alex Moreno
|
7cd2e290ce
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-10-05 07:22:41 +02:00 |
Alex Moreno
|
d3706733e4
|
Merge branch 'master' into 5929-hotFix_canEdit_weekly
|
2023-10-02 05:06:55 +00:00 |
Alex Moreno
|
53ab694ad4
|
Merge branch 'dev' into 5890--itemShelvingAsignado
|
2023-09-29 10:18:34 +00:00 |
Alex Moreno
|
a0a59b672f
|
refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail
|
2023-09-29 10:04:57 +02:00 |
Alex Moreno
|
542119983b
|
refs #5929 test: fix test after fix ticket_isEditable
|
2023-09-29 09:28:23 +02:00 |
Alex Moreno
|
f3c55cdee9
|
refs #5929 fix(isEditable): can edit if is weekly
|
2023-09-28 16:00:09 +02:00 |
Carlos Andrés
|
52cba80dc8
|
Merge branch 'dev' into 5890--itemShelvingAsignado
|
2023-09-28 15:13:37 +02:00 |
Alex Moreno
|
1d4001f520
|
Merge branch 'dev' into 5673-claim-development
|
2023-09-28 12:04:11 +00:00 |
Alex Moreno
|
28dfb895ca
|
refs #6224 deploy: correct sql folder and fix sql
|
2023-09-28 13:49:58 +02:00 |
Alex Moreno
|
e51df063d3
|
refs #5890 feat: add userId in rawSql
|
2023-09-28 13:26:05 +02:00 |
Alex Moreno
|
75e54bd82f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado
|
2023-09-28 13:21:12 +02:00 |
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
|
2023-09-28 08:18:15 +02:00 |
Sergio De la torre
|
4048627c76
|
refs #5890 fix: format
|
2023-09-28 08:08:40 +02:00 |
Sergio De la torre
|
18de92f9e7
|
refs #5134 fix: format
|
2023-09-28 07:51:54 +02:00 |
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
|
2023-09-28 07:42:44 +02:00 |
Sergio De la torre
|
ac3e9c811d
|
refs #5890 feat: itemShelvingSaleAsignado
|
2023-09-27 14:01:17 +02:00 |
Alex Moreno
|
d313f6ea5c
|
Merge branch 'dev' into 5673-claim-development
|
2023-09-26 12:59:32 +00:00 |
Sergio De la torre
|
2ea2943eca
|
refs #5134 feat: models
|
2023-09-26 13:12:18 +02:00 |
Jorge Penadés
|
db8dc8487b
|
ref #6246 replace name
|
2023-09-25 15:28:08 +02:00 |
Jorge Penadés
|
f4ce5db93b
|
Merge branch 'dev' into 6246-checkTicketSales
|
2023-09-25 11:49:18 +00:00 |
Alex Moreno
|
d05106cc83
|
Merge branch 'dev' into 5673-claim-development
|
2023-09-25 10:10:21 +00:00 |
Alex Moreno
|
d43b70c971
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-09-22 14:30:28 +02:00 |
Alex Moreno
|
cf36b10763
|
refs #4815 feat: add serialNumber in deviceLog
|
2023-09-22 14:29:48 +02:00 |
Alex Moreno
|
d16ae47712
|
Merge branch 'dev' into 5843-quitUserFk2
|
2023-09-22 11:01:25 +00:00 |
Jorge Penadés
|
6fe52ba3e8
|
ref #6246 check sales and update test
|
2023-09-22 12:48:54 +02:00 |
Sergio De la torre
|
ed1d8ca94f
|
refs #5134 feat: models
|
2023-09-22 12:29:56 +02:00 |
Carlos Satorres
|
c7f84ad6db
|
refs #5843 add return
|
2023-09-22 10:36:51 +02:00 |
Pablo Natek
|
c175bcfc97
|
refs #6159 rename spec
|
2023-09-22 09:40:37 +02:00 |
Pablo Natek
|
1357b60b9b
|
refs #6159 fixFixtures
|
2023-09-22 09:14:08 +02:00 |
Carlos Satorres
|
1f1dfae7e3
|
refs #5843 changes models
|
2023-09-21 12:50:07 +02:00 |
Carlos Satorres
|
cd20a2d06d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-21 07:32:19 +02:00 |
Carlos Satorres
|
f60b6b84fe
|
refs #5843 fix back
|
2023-09-20 11:58:36 +02:00 |
Carlos Satorres
|
f92acdfe6f
|
Merge branch 'dev' into 5660-changeRolDeliveryAssistant
|
2023-09-20 09:52:32 +00:00 |
Javi Gallego
|
72a8256aee
|
Merge pull request 'fixes #6241 dbTest fixed' (!1756) from 6241--arreglar--dbTest into dev
Reviewed-on: #1756
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-09-20 06:27:21 +00:00 |
Javi Gallego
|
29a186fa18
|
Merge branch 'dev' into 6241--arreglar--dbTest
|
2023-09-20 08:18:46 +02:00 |
Guillermo Bonet
|
e2229b6762
|
Merge branch 'test' into dev
|
2023-09-20 08:18:24 +02:00 |
Guillermo Bonet
|
4ccb09d057
|
Merge branch 'master' into test
|
2023-09-20 08:18:03 +02:00 |
Javi Gallego
|
45cf1b1ff3
|
fixes #6241 dbTest fixed
|
2023-09-20 08:12:07 +02:00 |
Guillermo Bonet
|
56c1dbc096
|
Merge branch 'master' into 5995-getExternalCmrRouteFk
|
2023-09-19 12:42:46 +00:00 |
Carlos Satorres
|
daf5b343fd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
|
2023-09-19 13:58:13 +02:00 |
Guillermo Bonet
|
2686fd0601
|
refs #6210 Minor change
|
2023-09-19 12:18:46 +02:00 |
Guillermo Bonet
|
77b55e5b09
|
refs #6210 Minor change
|
2023-09-19 12:15:23 +02:00 |
Guillermo Bonet
|
661563a2b6
|
refs #6210 Refactor filter client (zoneFk)
|
2023-09-19 12:14:55 +02:00 |
Alex Moreno
|
656492b9a6
|
Merge branch 'dev' into 5673-claim-development
|
2023-09-18 10:40:26 +00:00 |
Carlos Satorres
|
cfd080530a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-09-18 11:49:03 +02:00 |
Guillermo Bonet
|
6c34421413
|
refs #5995 Requested changes
|
2023-09-18 10:03:31 +02:00 |
Sergio De la torre
|
881a1ee0b8
|
refs #5652 modify: solved Tests
|
2023-09-15 11:24:17 +02:00 |
Sergio De la torre
|
0403c67bad
|
Merge branch 'dev' into 5652-ItemTrash
|
2023-09-15 05:47:00 +00:00 |