 Alex Moreno
|
c755b1e6fa
|
refs #5914 fix: correct sql version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-15 08:50:22 +01:00 |
|
Alex Moreno
|
21a1dbeae7
|
refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 15:56:49 +01:00 |
|
Alex Moreno
|
1ce1af82fe
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
|
2023-12-14 15:55:21 +01:00 |
|
Alex Moreno
|
d7454cdb19
|
refs #6576 fix: correct version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 11:41:59 +01:00 |
 Jorge Penadés
|
1f2d475f05
|
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-14 08:41:45 +01:00 |
 Javier Segarra
|
485968037b
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 06:22:17 +00:00 |
 Sergio De la torre
|
af83519ee6
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 15:12:39 +00: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
|
1e89ed6cdc
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 14:39:10 +00:00 |
|
Javier Segarra
|
8a66391cd5
|
Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 12:31:53 +00:00 |
 David Domenech
|
9bcd0a3c98
|
Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 11:29:46 +00:00 |
|
Javier Segarra
|
6af99b7669
|
refs #6434 feat: delete records whe !owner
|
2023-12-13 12:07:41 +01:00 |
|
David Domenech
|
d4fa1e9aca
|
refs #6398
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 12:04:07 +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 |
|
Jorge Penadés
|
8d61473d4f
|
refs #6276 fixtures & itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 11:43:19 +01:00 |
|
David Domenech
|
2f61b648f7
|
refs #6398
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 09:49:03 +01:00 |
|
Jorge Penadés
|
a4c3d78e31
|
refs #6276 drop fixtures & fix getSale
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 09:45:01 +01:00 |
|
David Domenech
|
ee6ad55e66
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 09:43:20 +01:00 |
 Pablo Natek
|
69dd34665f
|
refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 08:50:17 +01:00 |
|
Jorge Penadés
|
01fa0b1d36
|
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-13 08:35:11 +01:00 |
|
Javier Segarra
|
074bb2b980
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 06:30:14 +00:00 |
|
Javier Segarra
|
d44cdcbd13
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 06:14:55 +00:00 |
|
Sergio De la torre
|
e22201c840
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 14:50:25 +00: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 |
|
Jorge Penadés
|
3109f7722e
|
refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 13:24:18 +01:00 |
|
Alex Moreno
|
ea39f8b3be
|
remove duplicate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 12:25:51 +01:00 |
|
Jorge Penadés
|
8acd03f115
|
refs #6276 saleTrackingReplace
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 13:01:34 +01:00 |
|
Carlos Satorres
|
584f3264ed
|
refs #6085 refactor sql trad
|
2023-12-11 08:54:58 +01:00 |
|
Jorge Penadés
|
e27bf2ef8b
|
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-11 08:29:35 +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 |
|
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 |
|
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 |
|
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 |
 Javi Gallego
|
58ba1c10d0
|
ci: dev-test
|
2023-12-07 08:01:16 +01:00 |
|
Javi Gallego
|
7ff8ec93ff
|
Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1879
|
2023-12-06 07:54:13 +00:00 |
|
Jorge Penadés
|
b50a6add0d
|
refs #6274 merge renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 15:57:42 +01:00 |
|
Jorge Penadés
|
bb186bafe0
|
Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
|
2023-12-05 14:12:00 +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 |
|
Jorge Penadés
|
25006a938b
|
refs #6274 refactor clockIn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 11:53:27 +01:00 |
|
Jorge Penadés
|
419ab41816
|
refs #6276 Acl addTimeEntry
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 09:55:22 +01:00 |
|
Sergio De la torre
|
3692021b12
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 07:26:22 +00:00 |
|
Sergio De la torre
|
318f7e3c0d
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:20:55 +01:00 |
|
Javier Segarra
|
7a63e527a5
|
refs #5666 perf: remove comments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:50:52 +01:00 |
|
Javier Segarra
|
2fe631f078
|
refs #5666 feat: change models permissions
|
2023-12-05 07:15:22 +01:00 |
|
Jorge Penadés
|
8cb97e2477
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 15:09:44 +01:00 |
|
Javier Segarra
|
a8b0a7a5b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 14:46:21 +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 |
|
Pablo Natek
|
303b6f5240
|
fix(expencefk): refs #6398 expenceFk to expenseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-01 13:48:56 +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 |
|
Jorge Penadés
|
d5f09c2f75
|
refs #6276 saleTrackingDel
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 09:44:49 +01:00 |
|
Alex Moreno
|
e634a5e213
|
refs #5914 feat: create getTaxBases and use in negatives and positives procedures
|
2023-11-30 15:15:40 +01:00 |
|
David Domenech
|
eb0766bafd
|
Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 14:08:47 +00:00 |
|
David Domenech
|
8ab981907d
|
refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:25:00 +01:00 |
|
Pablo Natek
|
c457b5c4d2
|
Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:39:26 +00:00 |
|
Alex Moreno
|
ee7dd66ce9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:49:42 +01:00 |
|
Alex Moreno
|
35e74a7635
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:48:27 +01:00 |
|
Alex Moreno
|
ab69dcd4fe
|
refs #6524 fix: fixtures and feat: new changelog format
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:32:41 +01:00 |
|
Javier Segarra
|
16001099b6
|
refs #5666 feat: update ACLs for role and vnRole
|
2023-11-30 12:15:48 +01:00 |
|
Pablo Natek
|
3f22f48df7
|
fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:13:12 +01:00 |
|
Jorge Penadés
|
25a0ffcfde
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 09:49:50 +01:00 |
|
Javier Segarra
|
7611acb8f2
|
refs #6434 perf rename version folder for sql file
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 08:34:10 +01:00 |
|
Javier Segarra
|
80f8037f58
|
refs #6434 perf remove version folder for sql file
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 08:23:14 +01:00 |
|
Javier Segarra
|
6b354a20ad
|
refs #6434 perf: add sql table description
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-30 08:13:28 +01:00 |
|
Javier Segarra
|
138d11b7b0
|
refs #6434 perf new version folder for sql file
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 08:10:32 +01:00 |
|
Javier Segarra
|
97d7f8356f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
|
2023-11-30 07:08:23 +01:00 |
|
Javier Segarra
|
46774b2e73
|
refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-29 19:35:37 +00:00 |
|
Jorge Penadés
|
27d223cbab
|
refs #6276 machineWorker_add
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 16:25:15 +01:00 |
|
Javi Gallego
|
d246b5f9a8
|
Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 15:26:51 +01:00 |
|
Jorge Penadés
|
877c679273
|
refs #6276 getVersion
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 13:22:44 +01:00 |
|
Jorge Penadés
|
133fe1065a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:44:09 +01:00 |
|
Jorge Penadés
|
c609f6f47f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:27:50 +01:00 |
|
Alex Moreno
|
2e22984e77
|
refs #6197 fix: add salix role in fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:13:54 +01:00 |
|
Jorge Penadés
|
48dd068190
|
refs #6274 upperCase Model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 08:37:56 +01:00 |
|
Carlos Satorres
|
0186c2c806
|
refs #6085 aclMail back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 07:33:49 +01:00 |
|
Jorge Penadés
|
29fb36010c
|
refs #6274 back methods created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 14:48:03 +01:00 |
|
Javier Segarra
|
63533459b0
|
refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 13:22:17 +01:00 |
|
Javi Gallego
|
2fa56cce4b
|
fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 09:22:00 +01:00 |
|
Javier Segarra
|
901a44cc62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 09:48:31 +01:00 |
|
Alex Moreno
|
824ca1d70a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 07:42:50 +01:00 |
 Guillermo Bonet
|
2be1639e9f
|
refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 12:42:25 +01:00 |
|
Jorge Penadés
|
f862ed7d8a
|
refs #6274 refactor updateInTime
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 13:19:59 +01:00 |
|
Jorge Penadés
|
cf3b5efee9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 12:36:19 +01:00 |
|
Javi Gallego
|
f44424dbcf
|
test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 09:44:47 +01:00 |
|
Javi Gallego
|
5b289ec083
|
Merge branch 'dev' into 6028_route_getRouteByWorker
|
2023-11-23 09:21:44 +01:00 |
|
Alex Moreno
|
217aa1ac77
|
refs #6491 deploy(2350) init version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 08:35:08 +01:00 |
|
Javi Gallego
|
e856de0cfd
|
feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:54:38 +01:00 |
|
Jorge Penadés
|
a60a30128c
|
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-11-22 15:40:11 +01:00 |
|
Jorge Penadés
|
fac6aab26c
|
refs #6276 machineWorker_update
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 14:25:19 +01:00 |
|
Javi Gallego
|
e146c0ea46
|
Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 12:42:20 +01:00 |
|
Guillermo Bonet
|
d52c82fb19
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 11:36:07 +00:00 |
|
Jorge Penadés
|
40bbad04c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 10:16:12 +01:00 |
|
Jorge Penadés
|
251578146e
|
refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 12:32:36 +01:00 |
|
Jorge Penadés
|
67fa60ae81
|
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-11-21 12:27:13 +01:00 |
|
Guillermo Bonet
|
b3d1c72adc
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:13:41 +00:00 |
|
Alex Moreno
|
e909c2bc26
|
Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:13:17 +00:00 |
|
Jorge Penadés
|
34e5409533
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 08:19:11 +01:00 |
|
Alex Moreno
|
ee1a0c15ee
|
refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 15:09:55 +01:00 |