 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
|
f48500f4b3
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 18:44:11 +00:00 |
|
Pablo Natek
|
e9773b3885
|
refactor(state): refs #6366 simplify if condition
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 18:56:31 +01:00 |
 Jorge Penadés
|
8a5da43503
|
refactor: sectorCollection_getSale refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 16:00:25 +01:00 |
 Javier Segarra
|
8ee6cfb015
|
refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 15:36:35 +01: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 |
|
Javier Segarra
|
71937a4df3
|
refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 15:17:16 +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 |
|
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 |
|
Jorge Penadés
|
ad89363db5
|
fix: mark refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 13:11:39 +01:00 |
|
Jorge Penadés
|
2eca02d74f
|
refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:57:46 +01:00 |
|
Jorge Penadés
|
932b993723
|
Merge branch 'dev' into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-04 11:45:38 +00:00 |
|
Jorge Penadés
|
3ebf0a30a9
|
refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:44:44 +01:00 |
|
Jorge Penadés
|
da8057e4c7
|
fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:35:00 +01:00 |
|
Jorge Penadés
|
384d9ec803
|
fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 12:27:02 +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 |
|
Jorge Penadés
|
7d0c11e937
|
Merge branch '6276-createNewWarehouse' 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 08:51:46 +01:00 |
|
Jorge Penadés
|
6d0e1cc47c
|
refactor: fix conficts refs #6276
|
2024-01-04 08:51:18 +01: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 |
|
Javi Gallego
|
4cb82524cb
|
test: refs #3979 quito clone parametro group porque no se usa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-04 08:37:34 +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 |
|
Pablo Natek
|
b42aed13c4
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 18:15:29 +00:00 |
|
Javi Gallego
|
2fb60aeed3
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 15:37:05 +01:00 |
|
Javi Gallego
|
ab341b9b5e
|
test: refs #3979 test de clone
|
2024-01-03 15:36:39 +01:00 |
|
Alex Moreno
|
227afbe39d
|
refs #5914 fix(invoiceOut_descriptorMenu): transalation
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 14:54:01 +01:00 |
|
Alex Moreno
|
af784522c1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
|
2024-01-03 14:52:16 +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 |
|
Carlos Satorres
|
3fbead7473
|
refs #6291 fix tinIsValid
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 13:44:20 +01:00 |
 David Domenech
|
3c1237f727
|
refs #6456
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-03 13:37:18 +01:00 |
 Guillermo Bonet
|
a6ebd01ebd
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 13:28:23 +01:00 |
 Sergio De la torre
|
0b5ffcc81c
|
refs #6276:modify back silex→salix
|
2024-01-03 12:50:53 +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 |
|
Guillermo Bonet
|
f73a447391
|
refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 11:57:49 +01:00 |
|
Jorge Penadés
|
5dc49d226a
|
refs #6274 fix locale
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 10:13:56 +01:00 |
|
Alex Moreno
|
121caee93a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
|
2024-01-03 09:53:52 +01:00 |
|
Jorge Penadés
|
23854cb103
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 09:02:52 +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 |
|
Alex Moreno
|
399ca694ab
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-03 08:38:01 +01:00 |
|
Alex Moreno
|
f607719efe
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2024-01-03 08:34:00 +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 |
|
Pablo Natek
|
c116bc56c3
|
refactor(clientSms): refs #6259 redirect to lilium
|
2024-01-02 19:37:51 +01:00 |
|
Jorge Penadés
|
31c282ac0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 14:50:26 +01:00 |
|
Guillermo Bonet
|
176cbe1537
|
Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 13:02:16 +00: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 |
|
Jorge Penadés
|
924fe12a93
|
add root: refs #6276
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-02 12:44:12 +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 |
|
Guillermo Bonet
|
7cfcb17aff
|
Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 10:50:00 +00:00 |
|
Jorge Penadés
|
6b8a4a512b
|
adding filter: refs #6606
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 10:42:50 +01:00 |
|
Javier Segarra
|
4510f0a037
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 09:26:18 +00:00 |
|
Jorge Penadés
|
68ef193a19
|
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-02 09:58:30 +01:00 |
|
Jorge Penadés
|
3bd14095fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 09:45:44 +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
|
763af7da2d
|
fix test: refs #6274
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 08:58:41 +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 |
|
Jorge Penadés
|
15ec91ec79
|
fix query: refs #6369
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-29 14:05:01 +01:00 |
|
Pablo Natek
|
ccf5387e04
|
refactor(state): refs #6366 unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-29 12:44:24 +01:00 |
|
Jorge Penadés
|
1b8461034e
|
using hasAnyNegative: refs #6515
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-29 12:40:48 +01:00 |
|
Pablo Natek
|
f7ec64f3c1
|
merge(dev): refs #6366 merge dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-28 16:00:23 +01:00 |
|
Carlos Satorres
|
bfb31ad7c3
|
refs #5525 supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-28 11:46:34 +01: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
|
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
|
86db5a931d
|
arrange test suites: refs #6274
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-22 10:44:21 +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 |
|
Carlos Satorres
|
c4ff4c1984
|
refs #6291 tin valid
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-21 15:07:03 +01:00 |
|
Jorge Penadés
|
0998b5bf2c
|
add locale and refactor: refs #6274
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 13:58:33 +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 |
|
Guillermo Bonet
|
0f20f95dc5
|
refactor: refs #6433 Deleted isPreviousPrepared* columns in model
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 10:08:17 +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
|
7b65ebb58b
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-21 06:50:45 +00:00 |
|
Javier Segarra
|
adc7608b25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-20 14:40:42 +01:00 |
|
Javier Segarra
|
5c5be788c1
|
refs #5499 feat: trigger for all changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-20 14:08:11 +01:00 |
|
Guillermo Bonet
|
5f83fc158c
|
Merge branch 'dev' into 6582-routesMonitorTraduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 13:03:57 +00: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
|
acb0ec508f
|
refs #5499 feat: claimObservation
|
2023-12-20 12:09:01 +01:00 |
|
Javier Segarra
|
01e6e7dc39
|
Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 11:02:00 +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 |
|
Alex Moreno
|
351a12204a
|
Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 08:07:30 +00:00 |
|
Guillermo Bonet
|
753c6e9ec5
|
feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 07:28:54 +01:00 |
|
Guillermo Bonet
|
516a3760a1
|
feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-20 07:27:13 +01:00 |
|
Alex Moreno
|
7777696cf7
|
refs #6589 fix(worker_absences): fix started hours
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 13:58:08 +01:00 |
|
Guillermo Bonet
|
17e177b788
|
fix: refs #6398 Fix tests back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-19 10:12:03 +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 |
|
Carlos Satorres
|
e4de704b4c
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 11:16:58 +00:00 |
|
Jorge Penadés
|
5c22f51043
|
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-18 10:29:14 +01:00 |
|
Javier Segarra
|
7723b244d0
|
Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 07:17:51 +00:00 |
|
Javier Segarra
|
8d650cf6c0
|
refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-18 08:09:44 +01:00 |
|
Javier Segarra
|
29a7d9b941
|
Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-15 13:01:47 +01:00 |
|
Javier Segarra
|
dc98436b85
|
refs #2051 perf: rename variable
|
2023-12-15 13:01:44 +01:00 |
|
Javier Segarra
|
c9af8cba81
|
refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-15 12:50:05 +01:00 |
|
Jorge Penadés
|
d70a3570d3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
|
2023-12-15 12:18:28 +01:00 |
|
Javi Gallego
|
3a37e6dfc8
|
Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
|
2023-12-15 07:37: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 |
|
Carlos Satorres
|
fe184156a1
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 13:51:09 +00:00 |
|
Carlos Satorres
|
f73f3813b3
|
Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 14:37:22 +01:00 |
|
Carlos Satorres
|
bbb9f58a9e
|
refs #6220 fix(client_filter): fix where
|
2023-12-14 14:37:14 +01:00 |
|
Javier Segarra
|
043c411f68
|
Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 11:41:11 +00:00 |
|
Javier Segarra
|
9316c31180
|
refs #6264 perf: rename variable when destroy ids
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 12:36:36 +01:00 |