Commit Graph

8284 Commits

Author SHA1 Message Date
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 83b9ef72fc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:47:44 +01:00
Alex Moreno 742d6de986 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 07:28:41 +01:00
Carlos Andrés 8c1ff26de7 Merge branch 'dev' into 5637-saleGroupLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 11:12:40 +00:00
Robert Ferrús 6112c7ba5f refs #5637 saleGroup traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 09:59:34 +01:00
Pablo Natek a47d31cec9 Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 06:48:53 +00: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
Pablo Natek e504ad313c remove(console.log): refs #4131 quitar console log
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 14:56:33 +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
Jorge Penadés ab0640291b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 08:25:41 +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
Sergio De la torre 7ae12327f5 refs #5134 fix: model ExpeditionScan
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 16:16:22 +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
Pablo Natek 524ac4d99d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges 2023-10-26 22:16:06 +02:00
Pablo Natek 3584b15c19 Merge branch 'dev' into 4131-unifyTicketStatusChanges 2023-10-26 22:10:35 +02:00
Alex Moreno 55d80458cc refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 14:37:42 +02:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00
Alex Moreno 6b94ea7d11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-26 09:48:35 +02:00
Jorge Penadés 3a1227bdc2 ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 09:20:25 +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 013b010c22 refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 07:56:57 +02:00
Alex Moreno 26bdbabff5 refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-25 15:48:19 +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
Carlos Andrés 001d7cd574 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 15:03:38 +00:00
Jorge Penadés 9f141238bc ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 11:47:54 +02:00
Alex Moreno 5442476f05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-24 10:35:11 +02:00
Jorge Penadés 35bb949fcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 10:13:38 +02:00
Jorge Penadés f1deeb69ca ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:34:04 +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
Carlos Andrés 08431e94c6 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 13:52:52 +00:00
Carlos Andrés 6e3517b40f refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 14:51:09 +02:00
Alex Moreno 247aa5af2a refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:52:06 +02:00
Alex Moreno cf856a585b refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:50:00 +02:00
Jorge Penadés 1f0a57d320 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 09:03:15 +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
Jorge Penadés 33656e9d9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 08:21:32 +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
Pablo Natek 8597c23fb3 Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:53:57 +02:00
Pablo Natek 5c69d9c7f0 fix: add await in async functions refs #5979 2023-10-20 12:53:54 +02:00
Alex Moreno 1eabad7f4b refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:37:44 +02:00
Pablo Natek 75cfea4a2e Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:18:43 +00:00
Pablo Natek 25c13e42ab Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 11:36:24 +02:00
Pablo Natek 243a32dff5 remove(expand): quito expand de la columna requester refs #6278 2023-10-20 11:36:11 +02: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 84aed7ca21 refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:26:56 +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
Pablo Natek 9cb4e57951 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 05:31:12 +00:00
Pablo Natek dc93328bcf Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 18:24:04 +02:00
Pablo Natek 07fa011035 fix(updateClaim): el spec daba error refs #5979 2023-10-19 18:24:03 +02:00
Pablo Natek dad67539c5 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 16:23:34 +00:00
Carlos Andrés 16f20cea70 refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 15:12:06 +02:00
Pablo Natek f26595bb62 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:15:43 +00:00
Alex Moreno a0e32cf455 Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:05:25 +00:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00: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
Alex Moreno d9ab607126 refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:03:11 +02:00
Pablo Natek 71182d8630 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:49:31 +00:00
Alex Moreno 1ea6b87266 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:48:51 +00:00
Juan Ferrer 39a0f13500 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:14:29 +00:00
Guillermo Bonet 1b8f227c47 ticket #125321 filter advance tickets fix
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:58:15 +02:00
Pablo Natek e2f7ce8b35 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:58:50 +00:00
Alex Moreno 3294937b54 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:50:29 +00: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
Jorge Penadés 15890e80d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:59:19 +02:00
Jorge Penadés 52b14cf8b4 ref #6138 fix emailVerified
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:51:10 +02:00
Jorge Penadés 5b1e5743b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:35:37 +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
Javi Gallego 84fc0de4ea Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1803
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-19 06:41:43 +00:00
Pablo Natek d3a7b4ecb9 remove: console.log from updateClaim refs #5979 2023-10-19 08:41:26 +02:00
Pablo Natek f8889df903 remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued... Details
2023-10-19 08:40:25 +02: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
Jorge Penadés 770aa60b69 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 08:26:22 +02:00
Jorge Penadés 7e25fac3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:25:00 +02:00
Jorge Penadés 8917821ec0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:23:44 +02:00
Alex Moreno daaf076133 Merge branch 'dev' into 6312
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 05:29:43 +00:00
Alex Moreno da20697052 refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 15:19:26 +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
Jorge Penadés 8fe911ee0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:43:22 +02:00
Jorge Penadés 62d2c7e701 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-18 13:42:15 +02:00
Jorge Penadés ea5597d3f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 13:40:02 +02:00
Jorge Penadés af0d5072ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 13:37:14 +02:00
Pablo Natek 3e96b3d0d2 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 11:24:03 +00:00
Jorge Penadés 330fb08aac ref #5417 fix back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:23:00 +02:00
Pablo Natek bf09f13aa2 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 11:07:24 +00:00
Pablo Natek 44bc30adf7 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:35:53 +00:00
Pablo Natek 2bb4300e1b remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:35:45 +02:00
Pablo Natek 34c9d030e9 Merge branch 'dev' into 6266-minimumImprtSmsFix
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:31:12 +00:00
Pablo Natek 5f49a4fe1d fix: created -> shipped refs #6266
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:25:47 +02:00
Pablo Natek 1920a1b893 merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:23:23 +02:00
Jorge Penadés 251d71a437 ref #5417 refactor transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 12:05:33 +02:00
Alex Moreno a84f6fe1da Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:05:04 +02:00
Jorge Penadés 700caac641 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:03:07 +02:00
Alex Moreno 4300b24c14 refs #5918 refactor(worker_timeControl): simplify ng-show
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:45:15 +02:00
Alex Moreno d1cb2a1d9a refs #5918 test: add updateWorkerTimeControlMail
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:30:36 +02:00
Alex Moreno a7b0ef1e4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend 2023-10-18 09:23:55 +02:00
Alex Moreno b3c7511e59 refs #6067 feat(url): getByUser 2023-10-18 08:52:06 +02:00
Alex Moreno a916007314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-18 07:20:34 +02:00
Pablo Natek 8d44bb8867 refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 15:05:48 +02:00
Jorge Penadés 69a54be1a9 ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 14:02:08 +02:00
Pablo Natek 541926d3f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded 2023-10-17 13:57:32 +02:00
Pablo Natek 9870a0e60a feat(origin): create method url_/geturl redf #5979 2023-10-17 13:56:49 +02:00
Alex Moreno d4770c525e refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 11:00:41 +02:00
Jorge Penadés 48003b5d03 ref #6138
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 08:28:15 +02:00
Pablo Natek 4f911e644c fix: remove console.log refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:43:03 +02:00
Pablo Natek afe4c676fc fix(url): la ulr termina con / no es necesario añadir el texto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:38:33 +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
Jorge Penadés bd535374d8 ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 15:58:25 +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
Alex Moreno 9e39e96cf4 hotFix: workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 15:22:33 +02:00
Alex Moreno f79e711617 refs #6199 test: updateQuantity refactor
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 10:19:33 +02:00
Alex Moreno b769fa9bcf refs #6199
gitea/salix/pipeline/head This commit looks good Details
fix(sale_updateQuantity): if clientType is loses skip
test: fix updateQuantity activeCtx and add test for minQuantity
2023-10-16 10:10:57 +02:00
Jorge Penadés 3af72e1439 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments 2023-10-16 08:20:20 +02:00
Jorge Penadés ab6c58cd12 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-16 08:18:00 +02:00
Pablo Natek f832c1d9ec refs #5979 getUrl 2023-10-15 11:08:33 +02:00
Sergio De la torre f6bf36d46a Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 14:02:25 +00:00
Alex Moreno ab1cc34015 refs #6199 feat(sale): best quantity restriction
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 15:14:48 +02:00
Alex Moreno 03687cb482 hotFix: delete getCurrentWorkerMana
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 14:56:56 +02:00
Jorge Penadés 9ba3c9c8bc Merge branch 'dev' into 5914-transferInvoiceOut 2023-10-13 11:17:12 +00:00
Jorge Penadés 6b8a6c7a69 Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 11:15:04 +00:00
Alex Moreno f00a4e63a6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 13:08:54 +02:00
Javi Gallego 0081c55b9e Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 10:56:33 +00:00
Carlos Andrés 9c0334619d refs #6199
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 11:56:50 +02:00
Alex Moreno fa90132934 refs #6199 fix(orderCatalogView): html and css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 10:23:48 +02:00
Guillermo Bonet 7367656a35 refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-13 09:02:40 +02:00
Sergio De la torre 35c0ec0d04 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 15:14:13 +00:00
Javi Gallego 393d1889f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 14:06:32 +02:00
Javi Gallego df9d6fd6f8 efectue con acento 2023-10-11 14:06:28 +02:00
Carlos Satorres cba8a48d18 Merge branch 'dev' into 5768-incoterms
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 10:05:45 +00:00
Carlos Satorres 0023561acb refs #6293 traducción
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 12:04:12 +02:00
Guillermo Bonet 6b1dded222 refs #6199 Requested change, position of input
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 08:28:52 +02:00
Guillermo Bonet d41233efaf refs #6199 Requested change, name of color
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 07:59:05 +02:00
Guillermo Bonet 2b41bf7eb1 refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 07:39:41 +02:00
Guillermo Bonet d2ce920f13 refs #6199 Added minQuantity in catalog and more
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-10 13:49:11 +02:00
Carlos Satorres 4adee11c63 refs #5768 remove comment
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 12:35:34 +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
Guillermo Bonet 03afea3b8e refs #6199 Added minQuantity in item
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-10 10:51:02 +02:00
Carlos Satorres 1adfa33a9a hotfix length sales
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 14:52:30 +02:00
Pablo Natek c4e3fdf510 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:03:03 +00:00
Carlos Satorres 05812c3f35 refs #6282 left join
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 07:14:30 +02:00
Carlos Satorres 62c7dc9db5 hotfix-change minus
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:16:42 +02:00
Pablo Natek f40185c2d4 refs #4764 hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:24:52 +02:00
Carlos Satorres 3fbdae15b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-10-05 14:04:42 +02:00
Carlos Satorres 3b81b511c2 remove consolelog
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:01:53 +02:00
Carlos Satorres 5b6eb0a2a6 refs #5768 add address, nickname, pdf, email
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:01:07 +02:00
Pablo Natek 020de5d754 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-05 07:57:46 +00:00
Alex Moreno 8d7eda5af3 refs #5673 fix: add development translation
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 09:12:54 +02:00
Alex Moreno 7a6022efd4 Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 06:31:54 +00:00
Jorge Penadés 0d39471970 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-10-05 08:20:47 +02:00
Alex Moreno 9538841a30 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:28:02 +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
Carlos Satorres f2adbc1716 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-10-04 13:54:18 +02:00
Alex Moreno f8a510b330 refs #5918 fix(workerTimeControl): update(workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 12:31:46 +02:00
Alex Moreno df6d10e514 refs #5918 fix(workerTimeControl): resend mail
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 12:17:24 +02:00
Jorge Penadés c35899542d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 08:40:44 +02:00
Alex Moreno 45e41de9a9 refs #5918 fix(worker_time-control): isMailSended
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-03 14:03:52 +02:00
Alex Moreno 21ddcb7e8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-03 11:39:44 +02:00
Carlos Satorres bd46a77cb7 refs #5768 incoterms addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 10:15:16 +02:00
Pablo Natek 96769d9ff9 refs #6213 fixIntermitentError
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 08:57:59 +02:00
Alex Moreno 9baa450298 Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 05:25:55 +00:00
Pablo Natek 7fd2d143c3 refs #6213 devMerge 2023-10-03 07:08:29 +02:00
Alex Moreno 4545a63214 refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-02 14:51:19 +02:00
Pablo Natek 99d65804e8 refs #6278 fixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 13:29:39 +02:00
Jorge Penadés 918cff55d9 Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 10:06:08 +02:00
Jorge Penadés c59b119a4a ref #5417 fix transactions 2023-10-02 10:06:04 +02:00
Jorge Penadés a00cf557b7 Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 07:57:25 +00:00
Jorge Penadés 2eb9a97ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-10-02 09:28:41 +02:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:14:30 +02:00
Jorge Penadés a7128b8187 ref #5417 fix transactions
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:04:43 +02:00
Jorge Penadés cb2ac21349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments 2023-10-02 08:49:27 +02:00
Jorge Penadés 5f93df26a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl 2023-10-02 08:21:09 +02:00
Alex Moreno d3706733e4 Merge branch 'master' into 5929-hotFix_canEdit_weekly
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 05:06:55 +00:00
Alex Moreno 7b8518ff5a Merge branch 'dev' into 6033-vnLog_userDescriptor
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 05:04:26 +00:00
Jorge Penadés 6f4a12e50f ref #5417 date filters added
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 14:42:47 +02:00
Jorge Penadés 3e9d01815a Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 10:30:44 +00:00
Alex Moreno a0d705683b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-29 12:22:42 +02:00
Alex Moreno 53ab694ad4 Merge branch 'dev' into 5890--itemShelvingAsignado
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:18:34 +00:00
Alex Moreno b33700abc9 refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:57:25 +02:00
Jorge Penadés 9536fdba58 ref #6119 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:10:58 +02:00
Alex Moreno a0a59b672f refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 10:04:57 +02:00
Pablo Natek 0fa56149d7 refs #6266 smsfix
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 09:47:22 +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
Jorge Penadés f1dc809147 Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 06:22:51 +00:00
Jorge Penadés 4d226d9a58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl 2023-09-29 08:20:16 +02:00
Jorge Penadés d4e78ea889 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-29 08:16:12 +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
Carlos Andrés 52cba80dc8 Merge branch 'dev' into 5890--itemShelvingAsignado 2023-09-28 15:13:37 +02:00
Alex Moreno 1d4001f520 Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 12:04:11 +00:00
Alex Moreno 28dfb895ca refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:49:58 +02:00
Jorge Penadés 4b213c1c9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:31:45 +02:00
Alex Moreno e51df063d3 refs #5890 feat: add userId in rawSql
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:26:05 +02:00
Alex Moreno 75e54bd82f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado 2023-09-28 13:21:12 +02:00
Jorge Penadés e209ab28f4 ref #6065 first time hours load fixed
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 11:53:09 +02:00
Jorge Penadés 869bdab7ce ref #6065 fetchHours relocated
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 11:36:03 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:18:15 +02:00
Sergio De la torre 4048627c76 refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 08:08:40 +02:00
Sergio De la torre 18de92f9e7 refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 07:51:54 +02:00
Sergio De la torre a86469ccd2 refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 07:42:44 +02:00
Sergio De la torre ac3e9c811d refs #5890 feat: itemShelvingSaleAsignado
gitea/salix/pipeline/head This commit looks good Details
2023-09-27 14:01:17 +02:00
Jorge Penadés a7c0949f0e ref #6065 replace then by async/await
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-27 08:57:31 +02:00
Alex Moreno d313f6ea5c Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 12:59:32 +00:00
Sergio De la torre 2ea2943eca refs #5134 feat: models
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 13:12:18 +02:00
Jorge Penadés e1e225a1ef Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 12:42:47 +02:00
Jorge Penadés 50543963c1 ref #5914 refactor createTicketRefund 2023-09-26 12:42:45 +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
Alex Moreno e36f98195c refs #6033 feat: create user-photo component for worker and user descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-09-26 08:15:19 +02: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 474399b383 ref #5914 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 15:23:51 +02:00
Alex Moreno 7a3d3d5e2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 14:14:23 +02:00
Jorge Penadés 64eb216367 ref #5914 fixed back test 2023-09-25 14:01:40 +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
Alex Moreno eb0e6dd985 refs #6033 feat(VnLog): can use accountDescriptor
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 13:06:28 +02:00
Jorge Penadés 98ee9bbaf3 ref #5914 back test added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 12:54:31 +02:00
Alex Moreno d05106cc83 Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 10:10:21 +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
Alex Moreno 6cf1095b10 refs #6067 feat: vnUser use verify() and more security when update user and mailForward
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 08:33:16 +02:00
Pablo Natek af8773612c refs #6213 remove f
gitea/salix/pipeline/head Build queued... Details
2023-09-25 08:23:59 +02:00
Pablo Natek fc4019ad69 Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-25 08:23:25 +02:00
Pablo Natek 9b10a2904c refs #6213 unifyTest 2023-09-25 08:23:23 +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
Alex Moreno d43b70c971 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:30:28 +02:00
Alex Moreno cf36b10763 refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:29:48 +02:00
Alex Moreno db7f72e262 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-09-22 13:19:35 +02:00
Pablo Natek ed157d1fd1 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 11:11:25 +00:00
Alex Moreno d16ae47712 Merge branch 'dev' into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 11:01:25 +00: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
Sergio De la torre ed1d8ca94f refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 12:29:56 +02:00
Carlos Satorres 5b22314b07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-09-22 12:17:23 +02:00
Jorge Penadés 6bc9b7b232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-22 12:05:12 +02:00
Pablo Natek a854fff94f refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 10:59:48 +02:00
Carlos Satorres c7f84ad6db refs #5843 add return
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 10:36:51 +02:00
Pablo Natek c175bcfc97 refs #6159 rename spec
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 09:40:37 +02:00
Pablo Natek 1357b60b9b refs #6159 fixFixtures
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 09:14:08 +02:00
Carlos Satorres c7e26f9155 refs #5768 autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 06:08:07 +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
Alex Moreno a78348f2de refs #6067 feat(account_basicData): use vnUser/preview
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-21 15:06:14 +02:00
Carlos Satorres 7b246b1bac refs #5768 trad choose address
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 13:15:00 +02:00
Carlos Satorres 1f1dfae7e3 refs #5843 changes models
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 12:50:07 +02:00
Jorge Penadés ac4aea7d38 ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 09:14:46 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 07:32:19 +02:00
Pablo Natek 324b3ed8ee Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 05:21:06 +00:00
Jorge Penadés 5b818cef0c 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 15:25:20 +02:00
Alex Moreno 3b90d7e5e5 refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 15:10:28 +02:00
Carlos Satorres f60b6b84fe refs #5843 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 11:58:36 +02:00
Carlos Satorres f92acdfe6f Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 09:52:32 +00:00
Jorge Penadés 4870b0830b ref #5914 fix refund and change method name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 11:06:30 +02:00
Pablo Natek d29c37693d Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:53:53 +00: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
Javi Gallego 72a8256aee Merge pull request 'fixes #6241 dbTest fixed' (!1756) from 6241--arreglar--dbTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1756
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-09-20 06:27:21 +00:00
Javi Gallego 29a186fa18 Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued... Details
2023-09-20 08:18:46 +02:00
Guillermo Bonet e2229b6762 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:18:24 +02:00
Guillermo Bonet 4ccb09d057 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 08:18:03 +02:00
Javi Gallego 45cf1b1ff3 fixes #6241 dbTest fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 08:12:07 +02:00
Guillermo Bonet 56c1dbc096 Merge branch 'master' into 5995-getExternalCmrRouteFk
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:42:46 +00: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
Guillermo Bonet 2686fd0601 refs #6210 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:18:46 +02:00
Guillermo Bonet 77b55e5b09 refs #6210 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 12:15:23 +02:00
Guillermo Bonet 661563a2b6 refs #6210 Refactor filter client (zoneFk) 2023-09-19 12:14:55 +02:00
Pablo Natek 971d77a198 refs #6213 specChangeId
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 07:46:44 +02:00
Pablo Natek 361c2b4cad refs #6213 fixSpec
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-19 07:33:28 +02:00
Alex Moreno 2dbd711104 Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 05:24:05 +00:00
Pablo Natek aef34165d2 refs #4131 reverse claim changes
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 13:57:17 +02:00
Alex Moreno 656492b9a6 Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 10:40:26 +00:00
Carlos Satorres cfd080530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-18 11:49:03 +02:00
Guillermo Bonet f6d46396b5 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 08:15:43 +00:00
Pablo Natek c1da4815cb Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 08:12:08 +00:00
Pablo Natek cdf0951a1b refs #6213 newSuplierSpec
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 10:12:32 +02:00
Guillermo Bonet 6c34421413 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 10:03:31 +02:00
Pablo Natek 44ec197ea0 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-18 06:56:48 +00:00
Jorge Penadés 32a0aedf11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-18 08:07:27 +02:00
Pablo Natek 55b53c86c4 refs #6213 formatfix
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 07:38:31 +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
Sergio De la torre 0403c67bad Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-15 05:47:00 +00:00
Carlos Satorres 2a1e828e14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-15 07:30:46 +02:00
Pablo Natek 191b254acc Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 16:05:25 +00:00
Sergio De la torre b756d2f938 refs #5652 modify
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 18:03:30 +02:00
Pablo Natek cf138a0814 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 13:15:52 +00:00
Pablo Natek a44e5206a7 refs #6213 fixConcatBug
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 14:18:00 +02:00
Javi Gallego eff0975eb2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 10:27:03 +02:00
Javi Gallego 82631d6fcd claimingRate divide por 100 2023-09-14 10:26:59 +02:00
Sergio De la torre 43f5bbb04e Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 09:05:55 +02:00
Sergio De la torre d2cd522842 refs #5652 modify:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 07:47:10 +02:00
Pablo Natek 66e851b5ea refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:48:58 +02:00
Pablo Natek 7ab8cb37cd ref #6213 fixformat
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:22:21 +02:00
Pablo Natek 72026332ba Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 13:07:38 +00:00
Carlos Satorres 12dff3e248 Merge branch 'dev' into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 08:52:59 +00:00
Javi Gallego 7bd3bfddc3 fix sin bankEntity ya no falla
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 07:07:22 +02:00
Pablo Natek 740514c5a8 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-12 13:46:58 +00:00
Sergio De la torre 1d25355423 refs #5652 fix:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 08:44:42 +02:00
Pablo Natek 6a753d26af refs #6213 default account value
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 18:28:47 +02:00
Sergio De la torre 5f5a0645be refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 16:16:49 +02:00
Pablo Natek cbaf6001a8 refs #6213 remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:36:42 +02:00
Pablo Natek ccfd8fad05 refs #6213 fixCreateError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:32:46 +02:00
Carlos Satorres a29b25cffd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 10:48:38 +02:00
Carlos Satorres 544259df9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-11 10:47:21 +02:00
Javi Gallego 08e97b6a19 Merge pull request 'fixes #6169 invoiceIn con valores predeterminados' (!1728) from 6169---invoice-in-basic-data--dms-refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1728
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-09-11 07:00:20 +00:00
Jorge Penadés 48a6bf2969 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-08 08:05:17 +02:00
Carlos Satorres c2f73eb548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-09-07 13:38:38 +02:00
Carlos Andrés 4784e71350 refs #6176 book entry deleted
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 13:21:03 +02:00
Jorge Penadés 427425a750 ref #6119 simplifiy component
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 09:50:13 +02:00
Carlos Andrés 0465c2ca54 Merge branch 'dev' into 6176-book-entry-deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 19:27:02 +00:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 21:22:10 +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 8218eb2a6b refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head This commit looks good Details
2023-09-06 09:37:41 +02:00
Sergio De la torre dd1f759e20 refs #5652 feat:itemTrash_new 2023-09-06 09:35:43 +02:00
Sergio De la torre 2fffa56d70 refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 09:18:28 +02:00
Javi Gallego 6a4d8fbfbf Merge branch 'dev' into 6173-dump-BBDD
gitea/salix/pipeline/head This commit looks good Details
2023-09-05 13:48:35 +02:00
Carlos Satorres 7025326e06 Merge branch 'dev' into 6044-fixTickCalendar
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 10:31:08 +00:00
Javi Gallego c2d8e1c002 fixes #6173 show just buyUltimate items
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 12:14:52 +02:00
Carlos Andrés 40468b70e6 refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:59:55 +02:00
Javi Gallego ed25bd93d6 fixes #6173 lastItemBuy muestra articulos sin podu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:13:29 +02:00
Jorge Penadés f46d6355dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-04 08:06:47 +02:00
Jorge Penadés 52d698b0eb ref#6119 link fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-01 12:38:35 +02:00
Sergio De la torre 022d3d08e6 refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-01 12:34:33 +02:00
Sergio De la torre 3795404789 Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 10:15:26 +00:00
Guillermo Bonet 979315aa5e refs #5995 Implemented downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 12:10:39 +02:00
Jorge Penadés 9eff7c509f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 12:06:49 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Carlos Satorres 9b971abb55 refs #6044 class scss
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 11:49:08 +02:00
Guillermo Bonet cab3548c9b Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 06:11:08 +00:00
Sergio De la torre 00201197cc Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 05:24:55 +00: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
Carlos Satorres 017e0dd948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-31 13:29:34 +02:00
Jorge Penadés c2a54b8c65 ref #6119 vnLinkPhone created
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 13:02:56 +02:00
Javi Gallego 92789ba3de refs #6173 fixed backTest 2023-08-31 10:04:28 +02:00
Javi Gallego ea5e10faed Merge pull request 'test' (!1730) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1730
2023-08-31 07:58:48 +00:00
Guillermo Bonet 0dbb77fc64 refs #6023 Transactioned sync
gitea/salix/pipeline/head This commit looks good Details
2023-08-31 09:20:33 +02:00
Jorge Penadés 05f0f72c73 refs #6119 microsip link added
gitea/salix/pipeline/head This commit looks good Details
2023-08-30 14:14:48 +02:00
Javi Gallego 30c863722c fixes #6169 no se necesita tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 14:14:20 +02:00
Javi Gallego fea0db14e2 fixes #6169 invoiceIn con valores predeterminados
gitea/salix/pipeline/head This commit looks good Details
2023-08-30 13:35:51 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 12:48:57 +02:00
Guillermo Bonet d1df8009a6 refs #6023 Fix change rol bug
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-29 10:52:05 +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
Jorge Penadés 7f1db050ad Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:56:53 +00:00
Jorge Penadés 5fe12d9281 Merge branch 'dev' into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:43:26 +00:00
Jorge Penadés ca28d2d78f ref #5216 myOptions added
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 14:37:32 +02:00
Alex Moreno 2ecc464046 refs #5673 feat(claim_development): redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 14:26:17 +02:00
Alex Moreno 45c58feb8c Merge branch 'dev' into 6146-route-sugestedTicket-error
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 12:10:52 +00:00
Vicent Llopis 00b1746fd8 Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 11:32:58 +00:00
Vicent Llopis b304210e8f Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 08:47:12 +00:00
Vicent Llopis c4cf5f3a4f Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-25 08:04:42 +00:00
Vicent Llopis 9da5c4c1db refs #5918 refacotr: cambiado nombre variable 2023-08-25 10:04:27 +02:00
Javi Gallego 1d300237f2 Merge branch 'dev' into 6146-route-sugestedTicket-error
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 09:59:18 +02:00
Javi Gallego f54a239229 fixes #6143 fixes: this.bankEntityFk no existe
gitea/salix/pipeline/head This commit looks good Details
2023-08-25 09:46:53 +02:00
Jorge Penadés 083f19fd41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-25 08:11:44 +02:00
Javi Gallego a3d301f12e Merge branch 'dev' into 6143-refactor-iban-con-country 2023-08-25 07:23:08 +02:00
Vicent Llopis f3e43686a3 refs #5811 feat: al borrar expedicion borrar tmb de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 14:59:28 +02:00
Jorge Penadés 386de69bce refs #5216 fix error handling
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 12:47:10 +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
Javi Gallego b5b7770f3f refs #6146 fixes: muestra la agencia de la ruta 2023-08-24 10:41:28 +02:00
Jorge Penadés bda3937417 refs #5216 path replaced and test created
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 10:01:07 +02:00
Vicent Llopis 9a12169ba4 Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 07:33:07 +00:00
Vicent Llopis beeebbdf9c refs #6013 refactor: siempre se crea una tranacción para cada dia
gitea/salix/pipeline/head Build queued... Details
2023-08-24 09:33:58 +02:00
Vicent Llopis 1f63648697 refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 09:10:04 +02:00
Jorge Penadés 0f3b633de4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 08:03:01 +02:00
Vicent Llopis f8fd2bbd17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 07:50:24 +02:00
Vicent Llopis 3cffdca0c7 Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 05:39:48 +00:00
Vicent Llopis dad792cb76 refs #5244 move changes sql
gitea/salix/pipeline/head Build queued... Details
2023-08-24 07:40:37 +02:00
Alex Moreno 3eacb4dbd9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:05:04 +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
Alex Moreno 8454d208e1 hotFix(route_tickets): orderBy nickname
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:02:52 +02:00
Jorge Penadés 82d08261e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd 2023-08-23 10:25:48 +02:00
Alex Moreno 7349d4496f refs #5351 hotFix(worker_sip): use worker.id not worker.userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 07:34:01 +02:00
Javi Gallego 4657bf4e43 refs #6143 refactor: ibanValidation with countryCode param
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 14:58:26 +02:00
Alex Moreno 5a5e3ebddb refs #5712 hotFix(catalog): undo last fix search_panel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 13:39:57 +02:00
Vicent Llopis dd1dbcbd4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 13:39:09 +02:00
Vicent Llopis c7c17e6e4a Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 11:18:08 +00:00
Vicent Llopis 2f2611a705 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:31:17 +00: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
Guillermo Bonet 6d60592fb9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-21 09:34:32 +02:00
Guillermo Bonet 86def6e212 refs #5995 Changed query getExternalCmrs
gitea/salix/pipeline/head This commit looks good Details
2023-08-21 08:47:28 +02:00
Jorge Penadés 040f5be85c 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-08-18 12:18:30 +02:00
Alex Moreno 518d5111e4 refs #6127 hotFix(ticketRefund): get ticketFk front ticketService
gitea/salix/pipeline/head This commit looks good Details
2023-08-17 08:42:04 +02:00
Alex Moreno 868fbbfc2e cau #103812 hotFix(supplier): beforeSave name
gitea/salix/pipeline/head This commit looks good Details
2023-08-16 08:04:32 +02:00
Sergio De la torre 8d0b3efa11 refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:39:40 +02:00
Alex Moreno 1ec51d94cf refs #5134 feat: correct sql
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:53:43 +02:00
Sergio De la torre a6047d257b refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:45:18 +02:00
Alex Moreno 9ef4ba9bef refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:32:49 +02:00
Sergio De la torre 6eb88f8ab7 refs #5134 feat: models
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-11 11:58:30 +02:00
Alex Moreno 00fa5b7ce3 Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 07:38:53 +00: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
Alex Moreno afc0c98065 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 11:05:37 +02:00
Alex Moreno bdf0138c70 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-08-10 10:40:40 +02:00
Guillermo Bonet b197109556 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 10:14:22 +02:00
Carlos Satorres a11905ee63 Merge branch 'dev' into fix-fixtures_test
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 08:00:07 +00:00
Carlos Satorres 8807b9f87f fix upper
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 09:58:48 +02:00
Alex Moreno de773bc849 Merge branch 'master' into 5995-liliumExternalCmr
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 06:55:56 +00:00
Guillermo Bonet d6b30271f2 refs #5995 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 08:12:52 +02:00
Guillermo Bonet ed88a5b25f refs #5995 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 07:54:49 +02:00
Alex Moreno 209cac2a6a Merge branch 'dev' into 5762-recoverPassword-multiplatform
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:05:16 +00:00
Carlos Satorres 5653a39e3b fix fixtures names, socialnames streets
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:10:05 +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
Alex Moreno aee78960b0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 08:00:54 +02:00
Alex Moreno 765ab054a1 refs #5934 fix(clientSms): add vn-tooltip
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 07:41:38 +02: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 ce78fc8e5d refs #5986 feat: state model add classColor properties
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 15:06:28 +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
Guillermo Bonet 2f64a41f64 refs #5995 Added getExternalCmrs
gitea/salix/pipeline/head This commit looks good Details
2023-08-08 14:16:47 +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 00fcd3a800 refs #6083 feat: add lilium ticketSms
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 14:03:07 +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
Alex Moreno 4191d2529d refs #5712 warnFix: getById condition
gitea/salix/pipeline/head This commit looks good Details
2023-08-07 07:57:38 +02:00
Alex Moreno 75d3d12ae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform 2023-08-04 14:31:56 +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
Alex Moreno 83d0a394e3 refs #5973 refactor(item_fetched-tags): restyle empty tags
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 15:59:09 +02:00
Jorge Penadés 725fe674c0 refs #5914 WIP fixing transacticions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-03 14:01:50 +02: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
Carlos Satorres 3388fd7c59 fix test back
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 10:26:29 +02:00
Carlos Satorres 4fb0ad415c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head Build queued... Details
2023-08-03 10:03:15 +02:00
Carlos Satorres 183fdacefc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-03 10:01:11 +02:00
Guillermo Bonet 8deb8c1f54 Merge branch 'master' into 5995-newCmr
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 06:50:04 +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 4a0b8f37cd refs #5995 Load blob
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 13:41:44 +02:00
Alex Moreno 56cd94feaa refs #5843 fix(timeControl_filter): not use userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-02 13:26:42 +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
Jorge Penadés bd122e6327 refs #5014 WIP trasactions added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-01 16:13:24 +02:00
Alex Moreno b8780dfbbf Merge branch 'master' into hotifx-loadDataDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 12:12:17 +00: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 fc32f48b64 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-08-01 12:46:15 +02:00
Jorge Penadés 3ef74cab5c refs #5914 WIP created transferInvoiceOut 2023-08-01 12:45:57 +02:00
Carlos Satorres 79d88facc3 refs #4764 add test front
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 12:33:56 +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
Carlos Satorres 40607a42cf hotfix-loadData
gitea/salix/pipeline/head This commit looks good Details
2023-08-01 10:25:44 +02:00
Carlos Satorres 12acda0b1c refs #4764 ticketSerivce refund add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 11:06:19 +02:00
Vicent Llopis db992a9b91 Merge branch 'dev' into hotfix_workCenter_isNull
gitea/salix/pipeline/head This commit looks good Details
2023-07-31 08:54:37 +00:00
Jorge Penadés 22f76ec6a9 refs #5914 WIP clone method created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 10:33:51 +02:00
Jorge Penadés e63efa4f0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-07-31 10:32:41 +02:00
Vicent Llopis 7d10be37ec Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-31 08:26:30 +00:00
Jorge Penadés 50155cea8d refs #5914 WIP transfer invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 15:21:43 +02:00
Carlos Andrés 6872cea6bf Merge branch 'master' into 6077-Log-InvoiceInDueday-incorrecto-Salix
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 13:13:59 +00:00
Vicent Llopis 81dc163819 ya no muestra error en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-28 14:40:03 +02:00
Alex Moreno e253dd7982 refs #5351 fix(worker_model): remove required userFk
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 14:39:01 +02:00
Carlos Andrés 136b401ede refs #6077 espacios correctos
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 14:17:50 +02:00
Carlos Andrés 4061f3e5ce #refs 6077 espacios por tabulaciones
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 12:28:41 +02:00
Vicent Llopis 1d4ce2c703 refs #5804 fix: delete transaction
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 12:24:24 +02:00
Vicent Llopis 251ed36eca refs #6013 feat: mostrar error en el mail
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 10:51:48 +02:00
Carlos Satorres af60412232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-07-27 17:24:50 +02:00
Carlos Satorres d01584bfb3 refs #4764 service
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 15:15:55 +02:00
Vicent Llopis 0054f2d82f refs #6013 fix: codigo no bloqueante
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 15:07:10 +02:00
Vicent Llopis 7367d1cdfe refs #6013 fix: add await
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 14:41:53 +02:00
Carlos Andrés 3bc3ffe115 refs #6077 Log-InvoiceInDueday-incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 13:40:39 +02:00
Vicent Llopis 65b9cadd9e refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 12:51:14 +02:00
Vicent Llopis 777426aa05 refs #5561 add backTest
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 07:58:55 +02:00
Alex Moreno 305caaf8aa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-07-27 07:20:34 +02:00
Alex Moreno 61b17d1fa5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 07:19:48 +02:00
Jorge Penadés 10361ba78e refs #5216 addExpeditionState refactored
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:33:56 +02:00
Carlos Satorres 118f41c898 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:12:01 +02:00
Jorge Penadés bbc26d8ba4 WIP refs #5216 addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 12:36:30 +02:00
Jorge Penadés 0b88194f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:27:01 +02:00
Jorge Penadés 05eff94217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:22:32 +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 0b6fb70f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5929-editTicketPrice 2023-07-26 08:36:29 +02:00
Alex Moreno af28cfe6df Merge branch 'dev' into 6047-addEditableTd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 05:22:44 +00:00
Jorge Penadés fa9dfdf411 refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 16:32:38 +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
Alex Moreno 44ceeac9c4 refs #5983 feat(itemShelving): add userFk field
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 10:21:54 +02:00
Jorge Penadés ea4190f15c refs #5216 update expedition state added
gitea/salix/pipeline/head This commit looks good Details
2023-07-24 13:32:28 +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
Jorge Penadés 55f32397c5 removed unnecesary comments
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 13:13:44 +02:00
Jorge Penadés ade7303a6f refs #6047 added editable-td component
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 13:05:55 +02:00
Vicent Llopis 8267daef3a refs #5918 fix: permite reenviar el correo si ha dado fallo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-21 12:58: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 985e258529 refs #5769 fix(web-access): email rule
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:33:14 +02:00
Vicent Llopis 9bf891fcec refs #5561 fixed
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:20:06 +02:00
Vicent Llopis f926c60017 remove file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-21 12:02:02 +02:00
Vicent Llopis 51f9055d23 remove file 2023-07-21 12:01:57 +02:00
Vicent Llopis cf0b6f8c6e refs #5561 fix: saleGroupDetail.saleFk UNIQUE
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:01:01 +02:00
Vicent Llopis f52b398596 refs #5561 refactor: sustituidos sql por loopback
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 09:50:27 +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
Vicent Llopis 7d2e98267f refs #5561 eliminados valores a piñon
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 15:09:31 +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
Vicent Llopis 8f7caa1183 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 11:42:10 +02: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 1215b8cd57 Merge branch 'dev' into 5849-makeInvoice_solved
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:15:57 +00:00
Vicent Llopis 7312ed9cc4 refs #5244 fix back test
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 09:56:07 +02:00
Vicent Llopis d6a27741b5 a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 09:50:56 +02:00
Vicent Llopis 04ca5743a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-20 09:40:41 +02:00
Alex Moreno 5771ccb488 Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 06:50:56 +00:00
Alex Moreno aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 06:40:23 +00:00
Alex Moreno 60e75d7825 refs #5837 fix client condition
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 08:23:43 +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
Vicent Llopis 6df1ef9d4c Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head Build queued... Details
2023-07-20 05:16:54 +00:00
Vicent Llopis ab95ef74a9 refs #5934 refactor: nombres variables
gitea/salix/pipeline/head Build queued... Details
2023-07-20 07:17:35 +02:00