 Guillermo Bonet
|
1cd9b85ddf
|
Merge branch 'dev' into 6634-collectionLabelPrevia
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 09:00:08 +00:00 |
|
Guillermo Bonet
|
be1a94c283
|
feat: refs #6634 Modified collection-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 09:59:32 +01:00 |
 Alex Moreno
|
199656afb8
|
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-01-12 12:41:52 +01:00 |
 Jorge Penadés
|
2a6b509a78
|
fix: refs #6656 change acls
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 09:54:18 +01:00 |
|
Alex Moreno
|
14fff571b5
|
Merge branch 'dev' into 6353-ratingCatalog
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 08:52:51 +00:00 |
 Carlos Satorres
|
d0df880c32
|
Merge branch 'dev' into 6322-futureTicketImporte
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 07:47:23 +00:00 |
 Javi Gallego
|
c98baf21bf
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 12:17:59 +00:00 |
|
Alex Moreno
|
9b15551013
|
refs #6675 fix: correct sql folder
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 09:00:45 +01:00 |
|
Alex Moreno
|
a92297da73
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 08:14:56 +01:00 |
|
Alex Moreno
|
edde5819e3
|
refs #6660 feat: update mariadb version 10.7.7→10.11.6
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 15:39:35 +01:00 |
|
Carlos Satorres
|
980ca81bfc
|
refs #6353 fixtures catalog rating
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-10 09:38:20 +01:00 |
|
Carlos Satorres
|
16d7a20798
|
Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 13:49:31 +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 |
|
Carlos Satorres
|
676d95563b
|
refs #6322 importe
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 12:53:58 +01:00 |
 Robert Ferrús
|
ea5483e847
|
refs #6222 refactor: sale_calculateComponent
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 10:50:37 +01:00 |
|
Carlos Satorres
|
a22de3ab25
|
Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 08:46:01 +00:00 |
 Sergio De la torre
|
445703c6e2
|
6275-hotFix version not applied
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 09:14:48 +01:00 |
|
Carlos Satorres
|
782772bffc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 09:54:50 +01:00 |
|
Carlos Satorres
|
c72311860b
|
refs #647 remove e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 09:06:22 +01:00 |
|
Javi Gallego
|
406cf7335b
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-05 07:12:12 +00:00 |
 Pablo Natek
|
2e5ae062cf
|
Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 14:24:24 +00:00 |
|
Javi Gallego
|
767c6a6ac8
|
test: refs #3979 fixtures arregladas para que los abonos sean negativos
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 15:01:56 +01:00 |
|
Carlos Satorres
|
3b14c7cd23
|
refs #6456 fix tback, models
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 09:51:04 +01:00 |
 Javier Segarra
|
f7d83b15bd
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 08:08:46 +00:00 |
|
Carlos Satorres
|
15d6c9a65b
|
Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 08:39:07 +01:00 |
|
Alex Moreno
|
2a65ad6b31
|
refs #6635 build: new version
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 08:22:01 +01:00 |
|
Alex Moreno
|
23b544c1ec
|
refs #6635 fix: add translation
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 08:19:48 +01:00 |
|
Pablo Natek
|
847623f9c6
|
Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 18:28:46 +00: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 |
 David Domenech
|
d29fd5c65a
|
refs #6456
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 13:35:36 +01:00 |
|
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
|
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 |
|
Javier Segarra
|
9165b921ca
|
refs #2687 perf: change db/changes folder
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 13:00:37 +01:00 |
|
Javier Segarra
|
295124e0af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries
|
2024-01-02 12:59:50 +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 |
|
Javier Segarra
|
f10cada19f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-15 07:35:04 +01:00 |
|
Javier Segarra
|
b5b58faee4
|
refs #2687 perf: remove comments
|
2023-12-15 07:34:37 +01:00 |
|
Javier Segarra
|
d9ffdaf855
|
refs #2687 test: use tx.rollback()
|
2023-12-14 16:00:29 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Alex Moreno
|
ea39f8b3be
|
remove duplicate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 12:25:51 +01:00 |
|
Javier Segarra
|
8bd9becb74
|
refs #2687 feat: remove procedure argument
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 07:34:20 +01:00 |
|
Javier Segarra
|
64fbbd5dda
|
refs #2687 feat: new transaction procedure utils
|
2023-12-11 14:53:55 +01:00 |
|
Javier Segarra
|
a8dfe8f3bf
|
refs #2687 feat: modify vn.travel_cloneWithEntries
|
2023-12-11 14:53:29 +01:00 |
|
Carlos Satorres
|
584f3264ed
|
refs #6085 refactor sql trad
|
2023-12-11 08:54:58 +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 |