Commit Graph

1095 Commits

Author SHA1 Message Date
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Jorge Penadés 0c356938fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:43:56 +01:00
Guillermo Bonet eec36300ad refactor: refs #6184 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:25:48 +01:00
Guillermo Bonet 1d596b63a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:24:28 +01:00
Alex Moreno 9ac0ffb85a Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 07:30:59 +00:00
Jorge Penadés 7d01449518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:11:48 +01:00
Jorge Penadés bda23a2139 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 14:33:51 +01:00
Alex Moreno a9a1f97366 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-01 12:17:48 +01:00
Jorge Penadés d43976192a fix: refs #6703 fix conflicts 2024-01-31 09:16:26 +01:00
Carlos Satorres 5d2f3d1a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack 2024-01-30 16:42:00 +01:00
Jorge Penadés 2a6abffef9 fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 16:07:33 +01:00
Carlos Satorres 509d5cea14 refs #6270 fix back
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 15:54:03 +01:00
Jorge Penadés e17fc91415 fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 14:58:11 +01:00
Jorge Penadés 88dfdb157f 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-30 11:25:17 +01:00
Guillermo Bonet 13b8964e3d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 07:27:34 +00:00
Sergio De la torre 0f3ffcfa61 fix: refs #6184 Upload sign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:11:33 +01:00
Guillermo Bonet 1fe6818a0f fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 07:42:58 +01:00
Guillermo Bonet 65268487b9 fix: #6184 Now creates only one dms in saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 07:32:26 +01:00
Carlos Satorres 9b8c58ba7d refs #6270 makeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 16:00:24 +01:00
Jorge Penadés 72e5050d93 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-29 08:37:55 +01:00
Guillermo Bonet 65756f98ad fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 08:25:00 +01:00
Jorge Penadés 4fc780967f fix: refs #6703 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 15:32:50 +01:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00:00
Guillermo Bonet 567e480e3b feat: #6184 Minor changes
gitea/salix/pipeline/head Build queued... Details
2024-01-26 12:40:42 +01:00
Guillermo Bonet 25fa154f60 feat: #6184 Minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 12:25:02 +01:00
Guillermo Bonet d5a145ba1b feat: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:44:04 +01:00
Guillermo Bonet dec795d902 feat: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:14:47 +01:00
Guillermo Bonet 5828fa9657 feat: #6184 Refactor saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:05:24 +01:00
Javier Segarra 0afc9ab109 refs #6174 test: fix test bug
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 09:55:21 +01:00
Javier Segarra f1cbb6aab3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify 2024-01-26 08:48:05 +01:00
Jorge Penadés e5d466b697 fix: refs #6703 drop & replace sale refund by clone
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 08:30:43 +01:00
Pablo Natek a7faac3ef6 fix. refs #6743 remove consoleLog 2024-01-25 15:07:19 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Guillermo Bonet 9005975f1c feat: #6184 Modified email cmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 13:56:47 +01:00
Alex Moreno 66936d8983 hotFix: saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 11:37:25 +01:00
Alex Moreno 578bcd3cce hotFix: saveSign 2024-01-25 11:09:56 +01:00
Javier Segarra bc6f9bc074 refs #6174 test: new test for new method
gitea/salix/pipeline/head This commit looks good Details
2024-01-23 23:52:45 +01:00
Guillermo Bonet a676607e29 feat: #6184 Added email cmr 2024-01-23 14:13:40 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
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
Jorge Penadés d41d57143f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 13:53:26 +01: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
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
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
Jorge Penadés 6a78123fca fix: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 09:01:48 +01:00
Javier Segarra 831d358e41 refs #6174 feat first approach 2024-01-15 10:52:02 +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
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
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 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
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
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
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 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 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
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 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 6b70f8b3eb refs #2051 feat: uploadFile approach 2023-12-12 13:49:14 +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 f55e85a189 refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 10:35:48 +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
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
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
Pablo Natek 2a57f7e98a Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 14:02:27 +00:00
Pablo Natek 0a5e8e1902 refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 14:49:54 +01:00
Carlos Satorres f3faf37e1a hotfix addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 12:34:00 +01:00
Alex Moreno bc6389fd66 Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 09:00:12 +00:00
Alex Moreno aec1c9d447 fix: correct align
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 09:54:07 +01:00
Guillermo Bonet 2792efa9cd perf: refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 08:36:05 +01:00
Carlos Satorres a1c8bba4a5 hotfix addressId
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 11:29:18 +01:00
Alex Moreno 2eacf7391e refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 08:46:49 +01:00
Guillermo Bonet 05a7498219 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:14:21 +00:00
Guillermo Bonet 0771548ef1 refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 14:14:09 +01:00
Javi Gallego 9d54618620 fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 10:01:02 +01:00
Alex Moreno a523e32373 refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 07:57:53 +01:00
Alex Moreno 740d2fb976 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-02 08:48:03 +01:00
Alex Moreno 37dce99447 refs #6335 test(ticketAdvance): add test to keep price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 15:00:05 +01:00
Alex Moreno a80715583c refs #6335 feat(ticketAdvance): change the date if you can
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 14:16:25 +01:00
Alex Moreno bd8cc897c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-30 07:21:31 +01:00
Pablo Natek 14753212bb fix(saveSign): refs #4131 remove call state on saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:07:17 +02:00
Pablo Natek 65a1d052dc feat(ticket.state): refs #4131 to state
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:03:40 +02:00
Alex Moreno ae160890a8 refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-27 15:06:20 +02:00
Pablo Natek 42bbdf9814 feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 13:41:32 +02:00
Jorge Penadés da2bc416f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 08:26:35 +02:00
Alex Moreno a501d577f8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:23:00 +02:00
Alex Moreno efa9f16452 fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:22:44 +02:00
Alex Moreno 22b7c59812 refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:23:03 +02:00
Jorge Penadés 1231d6dd1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-24 08:34:42 +02:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 08:31:37 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:55:30 +00:00
Alex Moreno ef1ddfd484 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:28:37 +02:00
Alex Moreno d5f98700e7 refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 08:32:35 +02:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Jorge Penadés e680a6a080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:00:43 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 06:51:50 +00:00
Pablo Natek 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:37:28 +02:00
Javi Gallego 44ce0a8730 refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:46:41 +02:00
Pablo Natek 033c02750b refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:24:58 +02:00
Alex Moreno 093431ecdf refs #6119 fix(sale_hook): fix quantity case
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 15:27:10 +02:00
Guillermo Bonet 3e70cb07e0 refs #6184 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 14:20:35 +02:00
Guillermo Bonet c0089b1fa0 refs #6184 Added cmrFk in ticket model
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 12:20:30 +02:00
Guillermo Bonet d9339af87e refs #6184 Insert in ticketCmr
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 11:46:56 +02:00
Guillermo Bonet 3e522b08b6 refs #6184 Added saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 11:43:21 +02:00
Jorge Penadés 179d8ab87d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 11:30:53 +02:00
Alex Moreno ca86b3cc2f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:27:35 +02:00
Alex Moreno 7cd2e290ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:22:41 +02:00
Alex Moreno 542119983b refs #5929 test: fix test after fix ticket_isEditable
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 09:28:23 +02:00
Alex Moreno f3c55cdee9 refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 16:00:09 +02:00
Jorge Penadés 45fbe6f174 Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 06:36:44 +00:00
Jorge Penadés db8dc8487b ref #6246 replace name
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 15:28:08 +02:00
Jorge Penadés f4ce5db93b Merge branch 'dev' into 6246-checkTicketSales
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 11:49:18 +00:00
Jorge Penadés c8c06f498c ref #5914 fixed tests e2e
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 10:49:47 +02:00
Jorge Penadés 731bad5981 ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 14:52:56 +02:00
Jorge Penadés f64f7a975d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:51:20 +02:00
Jorge Penadés 6fe52ba3e8 ref #6246 check sales and update test
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 12:48:54 +02:00
Jorge Penadés 82f14e62ad ref #5914 tests fixed
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 16:08:55 +02:00
Jorge Penadés 87cee57e56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 10:47:53 +02:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Sergio De la torre 881a1ee0b8 refs #5652 modify: solved Tests
gitea/salix/pipeline/head This commit looks good Details
2023-09-15 11:24:17 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Sergio De la torre 7d8828e604 refs #6132 fix: saveSign without route
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 13:50:31 +02:00
Juan Ferrer d60e35d817 Merge pull request 'refs #6153 master into test' (!1726) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1726
2023-08-29 06:50:27 +00:00
Pablo Natek 78eba23d12 refs #6156 new field
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 13:44:15 +02:00
Alex Moreno 4c1d9cd767 hotFix(priceDifference): import UserError
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 11:32:20 +02:00
Jorge Penadés 3d4a99b07e refs 5914 transferInvoice created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 10:51:34 +02:00
Alex Moreno 508a4b2d34 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:04:27 +02:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:45:41 +02:00
Alex Moreno a26652045c refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:17:46 +02:00
Jorge Penadés 27ab6639c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-08-10 13:26:42 +02:00
Carlos Satorres f70b767506 Merge branch 'dev' into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 08:05:46 +00:00
Jorge Penadés 132640cddf Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-08 15:10:40 +02:00
Jorge Penadés 7ca6c6b96d refs #5914 fix merge 2023-08-08 15:10:15 +02:00
Alex Moreno 19c09d60a2 refs #5986 feat(ticket_filter): add classColor column
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 15:04:21 +02:00
Alex Moreno 0d5c6ffdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 07:10:25 +02:00
Alex Moreno e85cddec3c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 10:19:27 +02:00
Alex Moreno 26d6bbff4c refs #5929 hotFix: add UserError
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 10:04:46 +02:00
Guillermo Bonet eeb68e1ad9 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-04 08:54:41 +00:00
Alex Moreno 700ba4a7b1 refs #5914 feat(transferInvoiceOut): optimization
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-04 08:22:43 +02:00
Carlos Satorres 1308efb98d Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good Details
2023-08-04 01:21:52 +00:00
Guillermo Bonet 602f57bca9 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 08:54:32 +00:00
Guillermo Bonet aab0771e6e refs #5995 Removed my code in closure.js
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 14:37:38 +02:00
Alex Moreno fd9b842e6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-08-02 13:58:40 +02:00
Guillermo Bonet 16353dfddc refs #5995 First commit
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 07:35:40 +02:00
Carlos Satorres 2bde94a667 Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 11:40:29 +00:00
Jorge Penadés 3ef74cab5c refs #5914 WIP created transferInvoiceOut 2023-08-01 12:45:57 +02:00
Alex Moreno 30c5e8d8cc hotFix(canBeInvoiced): no de vuelve error si hay mas de un ticket y uno esta a 0
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 11:11:29 +02:00
Jorge Penadés a0fee6ad50 refs #5929 removed useless vars
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 09:20:54 +02:00
Jorge Penadés 96483a827f Merge branch 'dev' into 5929-editTicketPrice
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 13:40:08 +00:00
Jorge Penadés 543fbf3c0a refs #5929 isEditableOrThrow created, tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 15:35:08 +02:00
Jorge Penadés 9978db9d52 refs #5929 WIP test created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 11:33:01 +02:00
Jorge Penadés 4f80221101 refs #5929 added ACL and accurate errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-24 10:34:44 +02:00
Alex Moreno 23308d7ae3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-07-21 12:40:59 +02:00
Alex Moreno eb963ff993 refs #5866 fix(transferClient): correct variable name
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 08:28:19 +02:00
Jorge Penadés 618989052a refs #5866 fix transferClient and test added
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 15:15:33 +02:00
Jorge Penadés 8281dbacd1 Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 12:34:16 +00:00
Jorge Penadés 2fa1c4b6ca Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:23:07 +00:00
Jorge Penadés 9db8ae237f refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 10:19:03 +02:00
Vicent Llopis 4755c50cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved
gitea/salix/pipeline/head Build queued... Details
2023-07-20 07:22:30 +02:00
Alex Moreno 2c79056f34 refs #5976 error extended
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 13:44:04 +02:00
Carlos Satorres aaba4e74b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems 2023-07-19 12:00:59 +02:00
Alex Moreno f07ac89cb6 refs #5976 add custom error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 15:01:04 +02:00
Vicent Llopis 7bd378e9dd refs #
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 14:15:56 +02:00
Alex Moreno 15dee8bef4 refs #5976 refactor: transaferSale call setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 15:19:36 +02:00
Alex Moreno ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 08:43:50 +02:00
Vicent Llopis 337ce56a60 refs #5887 test exlcuido
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 08:37:11 +02:00
Alex Moreno 9cb29b9166 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 13:05:17 +02:00
Vicent Llopis da13f0811c refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 09:59:11 +02:00
Vicent Llopis 93e70e699a refs #5874 feat: refactorizado proceso facturación 2023-07-11 09:19:15 +02:00
Carlos Satorres 9c9b53917a refs #5334 fix error
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 08:20:33 +02:00
Alex Moreno 444b08c566 refs #5712 test(docuware)
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:09:52 +02:00
Alex Moreno c7b9d0827e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 13:42:54 +02:00
Carlos Satorres d03df4c5cc refs #5690 ticketproblems
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 11:38:38 +02:00
Javi Gallego bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:43:16 +00:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 10:39:07 +02:00
Alex Moreno befa385830 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 14:30:20 +02:00
Juan Ferrer e32a29fc09 refs #5900 Remove duplicated logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-25 19:08:13 +02:00
Vicent Llopis e99627c0b2 codigo innecesario
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 11:28:25 +02:00
Vicent Llopis cea6fae649 fix: eliminada variable que no estaba definida
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 10:40:57 +02:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 09:03:23 +02:00
Vicent Llopis e2c7a38e82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 14:18:36 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 08:32:06 +02:00
Alex Moreno c23d8282eb refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 15:34:11 +02:00
Alexandre Riera 632662c440 refs #5595 added userId in makeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:49:10 +02:00
Alexandre Riera e05d3b0793 Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 08:27:35 +00:00
Alexandre Riera 153542d2be refs #5595 taking active connection
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:49:39 +02:00
Vicent Llopis 9e8efff016 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 11:55:32 +02:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Alexandre Riera a584e1ab5e Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:22:51 +00:00
Vicent Llopis ce211b436d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 13:00:11 +02:00
Alex Moreno 37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:56:10 +02:00
Alex Moreno 42a39b6778 refs #5706 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:22:56 +02:00
Alexandre Riera 133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:18:26 +00:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:16:19 +02:00
Alex Moreno 6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:40:11 +00:00
Vicent Llopis 2c7473b064 refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:06:38 +02:00
Alexandre Riera b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:54:12 +00:00
Alexandre Riera 0e11bfab0b refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:53:25 +02:00
Alex Moreno 2ef922e80c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:10:10 +02:00
Alex Moreno ba763abc26 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:17:31 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Alexandre Riera 0d980334b8 refs #5634 conditional merge
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:41:00 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 14:14:08 +02:00
Alex Moreno 7704256079 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 08:00:49 +02:00
Vicent Llopis 461966d73e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 11:33:28 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alex Moreno 97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:58:11 +02:00
Alexandre Riera 54eb0fc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:59:05 +02:00
Alexandre Riera ad3c6dcee2 wip #5595
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 14:34:36 +02:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Vicent Llopis 2d181139b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 14:58:34 +02:00
Vicent Llopis 22b223038a delete focus 2023-04-26 14:56:07 +02:00
Vicent Llopis 8bb8b8cfba refs #5594 fix backTest
gitea/salix/pipeline/head Build queued... Details
2023-04-26 14:55:37 +02:00
Vicent Llopis 09dbd29086 refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 14:46:16 +02:00
Alex Moreno 28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:36 +02:00
Alex Moreno 11d1900859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:40:36 +02:00
Vicent Llopis bf558761a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:45:56 +02:00
Alexandre Riera 0a1583aa54 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:42:32 +02:00
Alexandre Riera 2975e7fae3 hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:46:46 +02:00
Vicent Llopis 38e5660e61 refs #5542 refactorizado "abono" para que siempre cree un único ticket abono 2023-04-21 13:59:28 +02:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Alex Moreno bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 07:55:46 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 15:03:23 +02:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 07:26:35 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:23:02 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:59:49 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Juan Ferrer b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 16:48:11 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 14:18:01 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Joan Sanchez 7b5e0bae8e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:20:33 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:30:53 +01:00
Alexandre Riera c0094d8047 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:21 +01:00
Alexandre Riera a0be5c50fc refs #4632 changed packed from boxed 2023-03-16 09:07:19 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:04:57 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
gitea/salix/pipeline/head There was a failure building this commit Details
Refs #5182
2023-03-13 15:05:19 +01:00
Alexandre Riera 59a3ff0f7b Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 12:10:24 +00:00
Alexandre Riera 21c7b18de9 refs #5036 make logs/querys only when grabUser is disabled
gitea/salix/pipeline/head Build queued... Details
2023-03-07 13:10:02 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Joan Sanchez 32b3284e40 Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1344
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:31:20 +00:00
Joan Sanchez 84dc95621d Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1348
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:30:17 +00:00
Guillermo Bonet 707ae232a7 refs #5193 ticketCreateWithUser to ticket_add
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:24:36 +01:00
Alexandre Riera 915c598c0c fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 09:04:53 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued... Details
2023-03-01 08:29:58 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:42:18 +01:00
Alexandre Riera 76cd2d160e Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 06:05:21 +00:00
Alexandre Riera 6590c6f1fa refs #5036 transferSales also transfer sale's logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-24 08:55:04 +01:00
Robert Ferrús 1e23dfe34e Merge branch 'dev' into 5115-transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:00:32 +00:00
Alexandre Riera 42b8f08a4d refs #5168 checked sales with logs
gitea/salix/pipeline/head This commit looks good Details
2023-02-22 12:14:17 +01:00
Alexandre Riera be8d19a9f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 09:27:38 +01:00
Vicent Llopis 26d72a7b3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund 2023-02-20 11:49:17 +01:00
Alexandre Riera 77066b2005 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-20 09:20:30 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Vicent Llopis a5a0256e44 feat: añadido parametro que indica si genera uno o multiples ticket de abono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-14 10:58:41 +01:00