 Alex Moreno
|
ba26237998
|
refs #5914 refactor: getTaxBases
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 12:19:28 +01:00 |
 Jorge Penadés
|
bce8feb552
|
refs #6276 add maxHours
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 10:41:44 +01: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 |
|
Alex Moreno
|
1e3a7e5f91
|
refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 13:17:10 +01:00 |
 Sergio De la torre
|
365e05d560
|
refs #6276:mdify back silex→salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 12:21:25 +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
|
801037da64
|
fix changes: refs #6274
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 08:47:12 +01:00 |
|
Alex Moreno
|
dd02a932ef
|
Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 06:40:18 +00:00 |
|
Carlos Satorres
|
c77715d865
|
refs #6291 validation original
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-26 15:03:10 +01:00 |
 Pablo Natek
|
323c7adcdd
|
Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-26 07:20:58 +00:00 |
|
Pablo Natek
|
5a1c4ddea0
|
refactor(ticketSms): refs #6259 ticketSmsToClientSms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-26 08:20:13 +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 |
|
Jorge Penadés
|
89fda361bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-22 11:04:43 +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 |
|
Jorge Penadés
|
e1888bd154
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-22 08:35:50 +01:00 |
|
Pablo Natek
|
35750bc93f
|
merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 18:46:12 +01:00 |
|
Pablo Natek
|
27a369bef4
|
refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 18:34:22 +01: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 |
|
Carlos Satorres
|
73d1c1698b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
|
2023-12-21 12:38:58 +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
|
daef9ee59a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue
|
2023-12-21 09:01:02 +01:00 |
|
Jorge Penadés
|
f384616d69
|
move changes: refs #6274
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 08:57:46 +01:00 |
|
Jorge Penadés
|
f5cc2cd75b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 08:38:33 +01:00 |
|
Alex Moreno
|
38279b0786
|
refs #6594 deploy: init version 24.02
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 08:37:30 +01:00 |
|
Alex Moreno
|
7b0c5fe0a0
|
refs #5739 fix: sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 08:33:50 +01:00 |
|
Alex Moreno
|
f2dcbe214a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2023-12-21 07:44:41 +01:00 |
|
Jorge Penadés
|
542b09073e
|
changes moved: refs #6274
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 14:02:05 +01:00 |
|
Jorge Penadés
|
5d75592627
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 12:19:10 +01: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 |
 Juan Ferrer
|
10bfafdd3c
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 09:05:53 +00:00 |
 David Domenech
|
5936a129da
|
refs #6398
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 12:58:20 +01:00 |
|
Carlos Satorres
|
18e87a05c4
|
refs #5525 st and nd
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 10:07:17 +01:00 |
|
David Domenech
|
d60f2a7f88
|
fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 09:43:09 +01:00 |
|
Javier Segarra
|
5151cdca48
|
Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-19 07:06:36 +00:00 |
|
Carlos Satorres
|
22a9ffc163
|
refs #6291 dni
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 12:33:04 +01:00 |
|
Alex Moreno
|
59f2e3d0e6
|
refs #5914 fix: remove unnecessary
gitea/salix/pipeline/head Build queued...
Details
|
2023-12-15 08:54:41 +01:00 |
|
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 |
|
Carlos Satorres
|
556b403a5b
|
refs #5525 letter debtor st
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 11:29:50 +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 |
|
Carlos Satorres
|
920b38c929
|
refs #5525 move sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 09:49:15 +01:00 |
 Javi Gallego
|
58ba1c10d0
|
ci: dev-test
|
2023-12-07 08:01:16 +01:00 |
|
Carlos Satorres
|
102ea1ee65
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 07:35:18 +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 |