 Javier Segarra
|
ba2815becb
|
Merge branch 'dev' into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-22 09:00:55 +00:00 |
 Guillermo Bonet
|
9faf889833
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 09:55:04 +00:00 |
 Alex Moreno
|
ef2b156b55
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-18 08:07:47 +01:00 |
|
Guillermo Bonet
|
a486b7f2d4
|
feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 14:42:38 +01:00 |
|
Alex Moreno
|
3c778216a4
|
Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 13:19:18 +00:00 |
|
Guillermo Bonet
|
1a52e58eaa
|
feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 14:18:31 +01:00 |
|
Guillermo Bonet
|
45fd96cee6
|
feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 13:07:26 +01:00 |
|
Javier Segarra
|
3564a77043
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 11:12:04 +01:00 |
|
Guillermo Bonet
|
f1b84ee7a0
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:44:00 +01:00 |
|
Javier Segarra
|
21ce57d217
|
refs #6174 feat: update back to separate invoice and pdf
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-17 10:31:07 +01:00 |
|
Guillermo Bonet
|
2f67056dbf
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-17 09:44:32 +01:00 |
|
Alex Moreno
|
aac3e17d3c
|
Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-16 13:40:37 +00:00 |
 Carlos Satorres
|
b3e1c58918
|
refs #6313 remove restriction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-15 14:50:08 +01:00 |
|
Javier Segarra
|
831d358e41
|
refs #6174 feat first approach
|
2024-01-15 10:52:02 +01:00 |
 Jorge Penadés
|
6236cf0621
|
hotfix ticketRefund
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-12 16:18:26 +01: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 |
|
Alex Moreno
|
b1530d049e
|
refs #6398 hotFix: use userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-11 13:29:03 +01: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 |
|
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
|
bf44f82f4f
|
refs #6322 fix code
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-09 13:16:14 +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 |
 Pablo Natek
|
0e29db3b1e
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-08 13:17:24 +00:00 |
|
Pablo Natek
|
9af27783ed
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-01-08 08:11:03 +00: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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
 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 |
|
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 |
|
Alex Moreno
|
1e3a7e5f91
|
refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good
Details
|
2024-01-02 13:17:10 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Javier Segarra
|
1939c65fab
|
refs #6264 test: remove force describe for dms test
|
2023-12-14 12:35:54 +01:00 |
|
Javier Segarra
|
d0af29c0c5
|
refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 12:28:41 +01:00 |
|
Javi Gallego
|
26a05a4840
|
fix: refs #3979 si se abona un abono sin almacen no falla
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 09:14:21 +01:00 |
|
Javier Segarra
|
397eb4d32b
|
Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 06:22:22 +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
|
06bae44824
|
refs #2051 perf: uploadFile after review
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 15:38:46 +01:00 |
|
Javier Segarra
|
7b9e3b0985
|
refs #2051 perf: removeFile after review
|
2023-12-13 14:24:05 +01:00 |
|
Javier Segarra
|
7bdb1b2078
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
|
2023-12-13 13:49:38 +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 |
|
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 |
|
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 |
|
Javier Segarra
|
6b70f8b3eb
|
refs #2051 feat: uploadFile approach
|
2023-12-12 13:49:14 +01:00 |
|
Javier Segarra
|
ae76776245
|
refs #2051 feat: removeFile approach
|
2023-12-12 12:09:06 +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 |
|
Carlos Satorres
|
3c9c221220
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 06:59:38 +00:00 |
|
Carlos Satorres
|
f55e85a189
|
refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 10:35:48 +01:00 |
|
Carlos Satorres
|
af07a531ed
|
refs #6318 quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:49:55 +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 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
|
Alex Moreno
|
b2e7ea3089
|
refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 15:16:41 +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 |
|
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 |
|
Guillermo Bonet
|
3bdb002034
|
Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 09:06:17 +00: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
|
8ac3887d80
|
refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 10:53:38 +01:00 |
|
Javi Gallego
|
aa0794e136
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 06:31:25 +01:00 |
|
Jorge Penadés
|
db15285858
|
refs #5811 test updated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:21:56 +01:00 |
|
Jorge Penadés
|
2e67ef4f5d
|
refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:32:07 +01:00 |
|
Jorge Penadés
|
900dffbbba
|
refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:26:28 +01:00 |
|
Jorge Penadés
|
26a8cc6a2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:41:24 +01:00 |
|
Jorge Penadés
|
3f8d1ff617
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:17:31 +01:00 |
|
Alex Moreno
|
02e8b90926
|
refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:12:07 +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 |
|
Alex Moreno
|
0ddfb28327
|
refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 07:56:15 +01:00 |
|
Alex Moreno
|
b8d256e4e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:58:51 +01:00 |
|
Alex Moreno
|
f677382f96
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:29:53 +01:00 |
|
Alex Moreno
|
5bdf6a7338
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 07:56:23 +01:00 |
|
Javi Gallego
|
a4328e607e
|
Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:11:05 +01:00 |
|
Javi Gallego
|
3f7663da97
|
feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:09:04 +01:00 |