Commit Graph

8603 Commits

Author SHA1 Message Date
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 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
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
Alex Moreno 8c84f006b0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 07:15:30 +02:00
Carlos Satorres 6efda27f0c Merge branch 'dev' into 5690-redondeo_ticketProblems
gitea/salix/pipeline/head This commit looks good Details
2023-07-20 04:06:29 +00:00
Sergio De la torre 6344c11d1e Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 14:29:18 +00: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 579d6d53d8 Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 10:46:17 +00:00
Carlos Satorres 36c31af455 refs #5690 rounding translate
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 12:38:13 +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
Sergio De la torre e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 05:02:39 +00:00
Carlos Satorres 25ce685116 Merge branch 'dev' into 5824-fixUpsertFixedPrice
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 04:36:51 +00:00
Carlos Satorres 36db2ee883 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 15:05:56 +00:00
Alex Moreno 2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:53:17 +00:00
Sergio De la torre 49c656928e refs #5983 feat(itemShelving): add visible
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 15:43:11 +02:00
Carlos Satorres bd723bb7ba refs #5824 mod ng
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 15:01:58 +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 d3165fcdc7 refs #5849 fix: tback
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:25:53 +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
Sergio De la torre 9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:11:50 +02:00
Vicent Llopis 3e8775149a refs #5934 feat: change icon
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:02:42 +02:00
Vicent Llopis b3a7a170f0 refs #5934 feat: añadido clientSms log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 11:54:43 +02:00
Sergio De la torre 93da129239 refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 08:54:45 +02:00
Carlos Satorres 47e8fab8d9 refs remove
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 19:51:46 +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 d2120cdc3d refs #5762 feat: multiplatform recover-password and change-password
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:24:50 +02:00
Carlos Satorres 52f58a92c8 refs err.sqlMessage
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:11:05 +02:00
Carlos Satorres a5d1c68511 change err and traduction
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:07:45 +02:00
Carlos Satorres 10e726c486 move vehicleInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 13:51:16 +02:00
Sergio De la torre 639d5963a3 refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 13:50:07 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 12:30:48 +02:00
Carlos Satorres b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:49:26 +00:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:48:36 +02:00
Carlos Satorres 87f125453d refs #5640 fix mayus quit function 2023-07-14 13:35:13 +02:00
Carlos Satorres fa3745820d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate 2023-07-14 13:20:19 +02:00
Vicent Llopis 6980392ba1 fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:11:09 +02:00
Carlos Satorres 93387cae62 refs #5837 if isSocialNameUnique
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:07:40 +02:00
Vicent Llopis 28eedbfd23 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:04:06 +00:00
Vicent Llopis 5716acaa3c fix: test
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:01:31 +02:00
Vicent Llopis 4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 12:18:41 +02:00
Vicent Llopis 4a7cfe9122 fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:51:15 +02:00
Carlos Satorres 765c22df96 refs #5837 new table
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:30:13 +02:00
Carlos Satorres 6d8b3e346d refs #5837 fix filter existingClient France
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 09:40:16 +02:00
Carlos Satorres 190db79019 Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 07:34:27 +00:00
Alex Moreno 29a4c51518 Merge branch 'master' into 5964-supplyFixValidation
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 05:34:18 +00:00
Guillermo Bonet 765a84e2eb refs #5819 Added param to call zone_getLeaves
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 07:27:04 +02:00
Carlos Satorres 173ed251c3 refs #5964 fix supply
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 13:45:07 +02:00
Alex Moreno 4632ed298d Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 11:41:40 +00:00
Vicent Llopis 75a66571ba refs #5244 refactor: modificados todos los url='activeWith...'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 12:59:39 +02:00
Vicent Llopis c876719a5c refs #5244 fix: corregidos errores 2023-07-13 12:59:02 +02:00
Vicent Llopis 1d7f0e2135 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-13 11:42:49 +02:00
Carlos Satorres 191f478523 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:58:09 +02:00
Carlos Satorres 2627cafc22 refs #5999 defaulter country autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:54:22 +02:00
Carlos Satorres 660612cb84 refs #5999 url
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:22:41 +02:00
Vicent Llopis 392dc5060a refs #4770 delete test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 10:19:12 +02:00
Vicent Llopis 01dc26f64e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:42:53 +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 978224c21c Merge branch 'master' into hotfix_mailAlias
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 06:14:53 +00:00
Alex Moreno e994e54e4b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 07:11:09 +02:00
Carlos Satorres 7da1824e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 06:39:05 +02:00
Vicent Llopis 7aaaf5492c refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 15:07:06 +02:00
Vicent Llopis ef6a2ae578 refs #5887 fix: delete requires
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 14:06:28 +02:00
Vicent Llopis c0d329edca a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 14:04:17 +02:00
Alex Moreno 78108b2ca5 Merge branch 'master' into hotfix-travel
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 12:01:26 +00:00
Vicent Llopis 551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir
gitea/salix/pipeline/head Build queued... Details
2023-07-12 13:55:57 +02:00
Vicent Llopis 954c2f5435 refs #5244 feat: carga valor inicial
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:12:51 +02:00
Alex Moreno 219a4fbca9 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-07-12 13:09:58 +02:00
Carlos Satorres 510b78c703 refs #6006 mod dias anteriores
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 13:08:46 +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
Alex Moreno d7ac20dc6a hotFix(supplier): fix accessToken in before save
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:02:27 +02:00
Vicent Llopis bd85cf4e90 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-12 12:29:17 +02:00
Vicent Llopis a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 11:50:15 +00:00
Vicent Llopis 6655807d80 refs #4770 refactor: change acl
gitea/salix/pipeline/head Build queued... Details
2023-07-11 13:50:38 +02:00
Vicent Llopis 5a5a1ed20b refs #5887 feat: addback test
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 13:22:54 +02:00
Vicent Llopis e1f12bea02 a
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 12:33:44 +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 7291b793ae refs #5949 fix traduct
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 08:41:43 +02:00
Carlos Satorres ba109dccc5 refs #5949 trad
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 07:58:18 +02:00
Carlos Satorres d1c8f0ff11 refs #5949 itemRecycle
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 07:37:51 +02:00
Alex Moreno 5e6d941f36 Merge branch 'dev' into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-10 06:53:11 +00:00
Alex Moreno d941e2e18f Merge branch 'master' into hotfix-extraCommunityEntryRef
gitea/salix/pipeline/head This commit looks good Details
2023-07-10 05:26:05 +00:00
Carlos Satorres 9f2ef5c2c0 change ref master
gitea/salix/pipeline/head This commit looks good Details
2023-07-10 07:22:23 +02:00
Alex Moreno 8922d27f20 refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-07 12:25:02 +02:00
Alex Moreno d9a5868ce4 refs #5930 fix(claim_updateClaim) options
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 10:55:45 +02:00
Vicent Llopis 7030be3efa fix
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 09:30:04 +02:00
Alex Moreno 8fe9b387ce refs #4614 test: front and correct folder
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 15:16:52 +02:00
Alex Moreno be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight 2023-07-06 15:15:36 +02:00
Alex Moreno 63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 10:42:53 +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
Carlos Satorres 3d9f0e1497 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-07-06 05:48:45 +02:00
Alex Moreno 6530e87508 refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 15:20:51 +02:00
Alex Moreno 040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:50:45 +02:00
Alex Moreno d7fca07446 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 10:17:42 +00:00
Alex Moreno 5d933da28a refs #5712 fix empty data
gitea/salix/pipeline/head Build queued... Details
2023-07-05 12:14:26 +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
Carlos Satorres f42273006c refs #4764 service ant
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 07:36:01 +02:00
Alex Moreno 1a18ba66a9 refs #5712 fix(workerDms): filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-04 15:18:57 +02:00
Vicent Llopis 4369d275f8 refs #4770 feat: add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-04 15:04:32 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Carlos Satorres 3b81198a05 refs #4764 mod button
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 13:57:52 +02:00
Carlos Satorres 6b813cb859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 11:54:19 +02:00
Carlos Satorres 5000e05e05 refs #5334 merge + e2e solve
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 09:57:16 +02:00
Carlos Satorres f1502139ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-07-04 09:56:38 +02:00
Alex Moreno 4f616397a2 refs #5712 use dmsType readRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 15:05:39 +02:00
Carlos Satorres 983d028d06 refs #5334 popover y basic data
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:58:40 +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
Pablo Natek 8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 11:35:50 +00:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:33:48 +02:00
Alex Moreno 2d1420e3f8 Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 09:51:48 +00:00
Carlos Satorres 4d03ef8f09 Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head Build queued... Details
2023-07-03 09:47:43 +00:00
Carlos Satorres c3ef642017 refs #5836 fix fk
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 11:45:05 +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
Carlos Satorres 5e68363312 refs #5334 onsearch postlink
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 09:38:36 +02:00
Alex Moreno d1fb2859be Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 06:59:42 +00:00
Carlos Satorres dc10c20fe3 refs #5334 email validate
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 07:29:58 +02:00
Carlos Satorres dc36c6fd9d refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 13:52:46 +02:00
Vicent Llopis 7b4e8570aa refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-30 12:03:26 +02:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 11:57:56 +02:00
Carlos Satorres e6ed834bf0 refs #5836 remove case
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 10:07:29 +02:00
Carlos Satorres 3d93043b98 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 09:40:15 +02:00
Carlos Satorres 83b096c206 refs #5334 fix errors 2023-06-30 09:40:12 +02:00
Carlos Satorres 6b4501146d refs #5334 fix errors 2023-06-30 09:39:48 +02:00
Alex Moreno 6fcbf69f60 refs #5753 isNotEditableCredit to zeroCreditEditor
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 08:26:51 +02:00
Alex Moreno ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump 2023-06-30 08:23:00 +02:00
Alex Moreno 5f42ee5f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-30 07:55:47 +02:00
Vicent Llopis f3e771747a refs #5244 fix: getItemTypeWorker permite filtrar por id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:56:07 +02:00
Vicent Llopis 3cedef6f16 refs #5244 fix: add id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:22:53 +02:00
Alex Moreno b062cec747 refs #5475 fix setPassword options/cb
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:01:24 +02:00
Alex Moreno c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 14:50:06 +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 Satorres af91630852 refs #5836 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 13:22:51 +02:00
Vicent Llopis 011db142d3 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-06-29 12:49:55 +02: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
Carlos Satorres bb4951bbc8 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 07:47:41 +00:00
Carlos Satorres 9dc52b6011 refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 09:44:21 +02:00
Carlos Satorres 454cf30de7 refs #4764 boton save
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 08:27:20 +02:00
Pablo Natek bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 05:22:06 +00:00
Carlos Satorres 319c6af354 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-29 06:37:23 +02:00
Vicent Llopis c5660a21a1 Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 12:41:26 +00:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:31:54 +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
Alex Moreno 8723cf2958 refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:10:21 +02:00
Vicent Llopis 3128601027 Merge branch 'dev' into 5808-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:47:39 +00:00
Vicent Llopis 6894da7e22 refs #5688 fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 13:27:18 +02:00
Alex Moreno da50ea1dd0 Merge branch 'dev' into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 11:10:51 +00:00
Carlos Satorres f02019d64d refs #5334 fix words
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:52:53 +02:00
Alex Moreno 89c25c07b6 refs #5475 fix e2e and back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 09:59:55 +02:00
Alex Moreno 9b0cf7f378 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-28 07:20:12 +02:00
Alex Moreno 31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 07:19:04 +02:00
Alex Moreno 162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-28 07:18:10 +02:00
Alex Moreno 4b8b7a9d82 refs #5475 fix accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 15:30:54 +02:00
Alex Moreno f8a972c2f2 refs #5094 fix translation
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 14:48:22 +02:00
Carlos Satorres 07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-27 13:36:51 +02:00
Carlos Satorres a930963ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-06-27 12:34:37 +02:00
Carlos Satorres 7e542f93a1 Merge branch 'test' into warnFix_travel_summary_entry
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 10:11:59 +00:00
Carlos Satorres 8e5a6dbab3 fix warn
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 11:44:23 +02:00
Vicent Llopis 87c233d221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 10:33:15 +02:00
Carlos Satorres 5216f12001 refs #5836 check fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 10:27:39 +02:00
Carlos Satorres 549235429c refs #5640 oldBranch
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 07:18:36 +02:00
Carlos Satorres 24ea18aeb0 refs #5836 isworker back
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 13:55:39 +02:00
Alex Moreno 15c45bb544 Merge branch 'test' into hotfix-filterScopeDays
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:30:57 +00:00
Alex Moreno 224a44847d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 11:56:07 +02:00
Alex Moreno ecf742959c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 11:55:28 +02:00
Carlos Satorres 88e845b511 change applyFilters
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:49:09 +02:00
Guillermo Bonet e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 10:06:41 +02:00
Guillermo Bonet cc5021a75f refs #5684 Removed xxxLog.create and dependences
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 09:40:55 +02:00
Alex Moreno 798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-26 07:53:44 +02:00
Carlos Satorres eff46c1cec refs #5066 e2e fix, vnConfig
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 07:43:36 +02:00
Carlos Satorres dcbe8c5f7a refs #5066 quit if
gitea/salix/pipeline/head This commit looks good Details
2023-06-26 06:28:35 +02:00
Carlos Satorres abfe012a78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-06-26 06:12:22 +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
Juan Ferrer f70df714df refs #5772, #5900 InvoiceOut back test removed, logs improved 2023-06-25 16:31:24 +02:00
Juan Ferrer 7660d76850 refs #5772 Test environment fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 22:52:03 +02:00
Juan Ferrer 665339c8d2 refs #5772 Fix for unhandled ENOENT error
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 22:02:33 +02:00
Juan Ferrer 2fec5bf2aa Merge pull request 'refs #5772 test into dev' (!1633) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1633
2023-06-23 09:51:44 +00:00
Juan Ferrer 8c0e8e9e12 refs #5772 Fixes fetching parallelism from front
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 11:50:40 +02:00
Juan Ferrer 47a4a9950f refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 11:42:30 +02:00
Pablo Natek 16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 16:02:30 +00:00
Carlos Satorres beb173f6ce refs #5334 quit e2e no necesario
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 15:20:28 +02:00
Vicent Llopis d9b1f4b8a1 refs #5688 fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:06:27 +02:00
Carlos Satorres 137e01e60c refs #5334 fix acl, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 15:00:59 +02:00
Vicent Llopis d272121258 refs 5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 14:52:42 +02:00
Carlos Satorres 757360f3d1 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 12:46:36 +00:00
Carlos Satorres 4931745cde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-22 14:42:28 +02:00
Vicent Llopis 389b53ceff refs #5772 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 13:37:43 +02:00
Vicent Llopis d26778e94e refs #5688 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:30:53 +02:00
Carlos Andrés 12aa9c6b4b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 13:23:03 +02:00
Vicent Llopis 591fc14ffa refs #5772 refactor: movido codigo para enviar rocket al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 12:48:50 +02:00
Carlos Satorres 7f9d8da7a7 refs #5836 defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 11:42:21 +02:00
Vicent Llopis 9d1a181b73 refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 11:10:56 +02:00
Vicent Llopis d8fe284bcd Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 07:53:11 +00:00
Vicent Llopis 5f4b62f133 refs #5688 fix: test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 09:48:14 +02:00
Alex Moreno 18a8106461 refs #5339 fix after save
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 08:56:27 +02:00
Carlos Andrés 807596f735 refs #5772
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 08:50:18 +02:00
Vicent Llopis 473b218da1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 08:04:17 +02:00
Carlos Andrés 10a25ff590 refs #5772
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 07:49:35 +02:00
Alex Moreno aea32492e3 Merge branch 'master' into 5339_instance_vs_data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-22 05:33:34 +00:00
Vicent Llopis e9ef81f8d7 refs #5244 feat: coge todos los hijos recursivamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 15:00:46 +02:00
Alex Moreno 6ab431f8ef refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:17:25 +02:00
Vicent Llopis a699e2d874 refs #5244 feat: añadido 'depatments' como binding
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:07:36 +02:00
Carlos Satorres 9870cc7b14 refs #5660 change assist
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:34:27 +02:00
Vicent Llopis dd75302bbb 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-06-21 13:33:09 +02:00
Carlos Satorres 168d05a830 refs #5334 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:07:04 +02:00
Juan Ferrer dfdd3a1733 Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 11:08:29 +02:00
Juan Ferrer 44192c0606 refs #5667 Client translations added 2023-06-21 11:08:28 +02:00
Carlos Andrés 6f9fd9bb72 refs #5772 mensajes de error
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 09:40:14 +02:00
Alex Moreno 38de19f044 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:44:13 +00:00
Alex Moreno 2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:24:19 +00:00
Alex Moreno d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 07:53:40 +02:00
Pablo Natek e741904250 refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 17:01:06 +02:00
Vicent Llopis f37974c835 Merge branch 'dev' into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:39:27 +00:00
Carlos Satorres fa10070675 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 14:04:38 +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
Vicent Llopis 6c00e704cc refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:42:08 +02:00
Carlos Satorres f0f8b112cd Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 07:22:52 +00:00
Alex Moreno 5a6a18c76a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:20:54 +02:00
Alex Moreno dcfb991f94 hotFix(getLeaves): remoteMethodCtx correct defined
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:20:06 +02:00
Carlos Satorres c63df30e5c refs #5334 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:19:20 +02:00
Carlos Satorres a155f846c2 refs #5334 fix ctx
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:15:37 +02:00
Carlos Satorres 4537344790 merge
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 08:20:13 +02:00
Carlos Satorres 7f20973650 refs #5334 merge
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 08:16:36 +02:00
Vicent Llopis 8a2cab0e62 Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 05:30:55 +00:00
Alex Moreno 092471f74e refs #5475 feat(account_changePassword): accessScope and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-19 15:06:06 +02:00
Juan Ferrer 9fa6e2df71 refs #5595 VnModel.rawSql() bugfix
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 14:54:32 +02:00
Alex Moreno 63888e2d64 refs #5595 console.log(orderFk, userId) for rawSQL logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 13:52:25 +02:00
Carlos Satorres 3701acd26e refs #5334 error getLeaves solve
gitea/salix/pipeline/head Build queued... Details
2023-06-19 13:48:14 +02:00
Carlos Satorres 98125f8974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-19 13:22:41 +02:00
Sergio De la torre b6c8ca20ee refs #5339 data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-19 08:58:20 +02:00
Carlos Satorres 8dd360bf1e refs #4764 e2e solve
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 08:46:15 +02:00
Alex Moreno 2197441159 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 07:20:00 +02:00
Alex Moreno ee1b901dea refs #5475 feat(account_changePassword): accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 14:31:14 +02:00
Alex Moreno dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 13:42:13 +02:00
Juan Ferrer 081cf43ece refs #5667 SupplierAccount translation added 2023-06-16 13:39:24 +02:00
Alexandre Riera 9c18391c31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded 2023-06-16 13:21:11 +02:00
Vicent Llopis 55e123e795 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-06-16 11:45:08 +02:00
Alex Moreno cf01c8d46e refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 09:35:20 +02:00
Carlos Satorres 0eca606de0 Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 07:29:30 +00:00
Carlos Satorres fbe4441eda refs #4764 e2e solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 09:06:25 +02:00
Alex Moreno 50fe53fbb6 Merge branch 'test' into warnFix_ticket_sale_orderBy
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 05:38:14 +00:00
Carlos Satorres 9b950cd8d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-16 07:23:41 +02:00
Alexandre Riera 73133778fc Merge branch 'dev' into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 05:07:16 +00:00
Carlos Satorres 7bff915a7f refs #5325 back fix correct
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 17:14:34 +02:00
Carlos Satorres 4157e30d4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable 2023-06-15 16:47:33 +02:00
Alex Moreno b96f0f22b5 refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 15:16:51 +02:00
Alex Moreno 5163b7b253 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-15 15:14:41 +02:00
Vicent Llopis 55990869e2 refs #5688 ya no muestra mensaje de error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 14:16:26 +02:00
Vicent Llopis b7b6f413ba refs #5688 feat: no mostrar datos si no tiene workerCenterFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 14:15:22 +02:00
Vicent Llopis 192f4c7864 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter 2023-06-15 14:15:00 +02:00
Juan Ferrer 1c666cd48e refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 13:10:44 +02:00
Carlos Satorres 8b832c68b3 refs #5325 fix back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-15 12:49:53 +02:00
Alex Moreno 71651b96a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 11:49:40 +02:00
Alex Moreno 99ad9d3afa refs #5753 fix(change-password) 2023-06-15 11:49:39 +02:00
Vicent Llopis 5f2c5c5f9d refs #5842 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 09:55:32 +02:00
Vicent Llopis a50de4e509 refs #5842 feat: comprueba que invoiceDate no sea null
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 09:50:46 +02:00
Alex Moreno a206f64e3c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-06-15 07:27:04 +02:00
Vicent Llopis 14ebcf96c0 refs #5842 refactor: change names
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 07:24:17 +02:00
Sergio De la torre 1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 07:22:10 +02:00
Carlos Satorres b3022d0ce2 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-06-14 17:47:56 +02:00
Carlos Satorres 9cdc914a25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable 2023-06-14 17:03:09 +02:00
Alex Moreno 3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-14 15:15:00 +02:00
Vicent Llopis 7fa4eabf86 refs #5842 fix: recalcula invoiceDate cuando se cambia la company
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 14:59:18 +02:00
Sergio De la torre e8b98a2daf Merge branch 'dev' into 5651-packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 11:18:24 +00:00
Vicent Llopis 98b270b885 refs #5528 feat: add back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 13:05:46 +02:00
Vicent Llopis 9e89167d27 Merge branch 'dev' into 5691-route.index_optimizar
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 10:57:58 +00:00
Vicent Llopis 65108943ab refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:48:14 +02:00
Vicent Llopis e62a3ce166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:39:16 +02:00
Sergio De la torre c62e6fa0eb refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 10:51:22 +02:00
Juan Ferrer 961941ecb3 refs #5667 TicketRequest translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 20:52:26 +02:00
Carlos Satorres 66c5eda6f2 refs #5325 remove defaultSearch
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 16:08:11 +02:00
Alex Moreno aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-13 11:49:42 +02:00
Alex Moreno 92953b9aa8 refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 11:37:35 +02:00
Vicent Llopis 72b779f5c0 refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 10:26:12 +02:00
Vicent Llopis fa9719de78 refs #5691 feat: cambiado url por data en los crudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 08:16:37 +02:00
Vicent Llopis 0aae1732bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:35:29 +02:00
Vicent Llopis 6f3c28c4a4 refs #5468 refactor: eliminado código obsoleto
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:34:41 +02:00
Alex Moreno a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware 2023-06-13 07:11:39 +02:00
Juan Ferrer cc788d7e06 refs #5667 Account translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 16:28:47 +02:00
Juan Ferrer 3386af9b17 refs #5667 MailAliasAccount translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 16:27:02 +02:00
Carlos Satorres 59642ab3ca refs #5325 defaultSearch
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 15:44:22 +02:00
Alex Moreno d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 15:20:46 +02:00
Carlos Satorres 908799adee refs #5660 deliveryAssit
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 14:58:28 +02:00
Carlos Satorres c9c9b64884 refs #5660 deliveryAssit 2023-06-12 14:57:41 +02:00
Alex Moreno f113bfbc95 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 12:32:29 +00:00
Carlos Satorres 58bcad7b2d refs #4764 validator create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 12:42:30 +02:00
Alex Moreno 24b3697ac6 Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:31:25 +00:00
Carlos Satorres c9bf74dcc4 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:56:34 +00:00
Alex Moreno 1c39ad873c resolve dev conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 11:06:45 +02:00
Alex Moreno 22e69e6e91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-12 11:06:27 +02:00
Alex Moreno 5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:46:21 +02:00
Alexandre Riera f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:27:18 +02:00
Alexandre Riera 703c224e91 refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:26:50 +02:00
Alex Moreno 051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:11:17 +02:00
Alex Moreno 2c0c0f24b0 reactive
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 08:36:19 +02:00
Alex Moreno 1a58424531 refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 08:33:31 +02:00
Alexandre Riera 48ee29568d Merge branch 'dev' into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 05:26:28 +00:00
Alex Moreno d735f142a1 Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 05:04:28 +00:00
Carlos Satorres 06d1334e1f refs #4764 withWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-09 14:30:46 +02:00
Carlos Satorres 9ca82a2f79 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-06-09 14:23:55 +02:00
Carlos Satorres 61d9e2dcd3 refs #4764 remake refund, back front
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 14:19:17 +02:00
Carlos Satorres 9b4c4496b6 Merge branch 'dev' into 5760-changesSMS
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 11:16:02 +00: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
Carlos Satorres ec9dfa90fd refs #5760 fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 08:06:45 +02:00
Pablo Natek ac67a2606f Merge branch 'dev' into 5735-creditFormat
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 07:11:13 +02:00
Carlos Satorres bdffc0401f refs #5760 update getChanges, traduccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-08 15:29:03 +02:00
Alex Moreno 96d88cdf4b refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 14:42:07 +02:00
Vicent Llopis f47a049d7a refs #5244 fix: cambiada descripción erronea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-08 13:39:21 +02:00
Vicent Llopis 653c37f048 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-06-08 13:12:59 +02:00
Vicent Llopis 7dd5a5ac8e refs #5244 feat: hereda correctamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-08 13:12:30 +02:00
Carlos Satorres 7ea7816800 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 12:49:28 +02:00
Juan Ferrer 32a0955c1d refs #5667 Zone translations fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 12:48:14 +02:00
Alex Moreno 3e39564695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 12:39:36 +02:00
Vicent Llopis 1e759119db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-06-08 11:13:07 +02:00
Vicent Llopis 874255f2e5 refs #5244 feat: extiende correctamente
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 11:07:57 +02:00
Carlos Satorres 0afc26e20c refs #5728 remove add, quit e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 10:30:03 +02:00
Alex Moreno 5ba8a15316 refs #5809 deploy 232401 dev in test
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 10:25:25 +02:00
Vicent Llopis cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 09:19:57 +02:00
Vicent Llopis a88166cdb5 Merge branch 'dev' into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 05:15:24 +00:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 23:54:27 +02:00
Juan Ferrer 980ea67c24 Merge pull request 'test' (!1596) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1596
2023-06-07 21:02:22 +00:00
Vicent Llopis 0dbd3abd65 refs #5808 fix: corregido el condicional
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 15:06:37 +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
Carlos Satorres a34519f6d0 refs #4764 refundTicket
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 14:12:04 +02:00
Alex Moreno e5ababb0a9 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 11:49:40 +00:00
Alex Moreno 1240a6b71a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 11:44:47 +00:00
Alex Moreno edc601fd5d refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 13:34:13 +02:00
Carlos Satorres 4e08f51848 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 07:16:13 +00:00
Alexandre Riera 7121b1e516 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-07 08:50:53 +02:00
Alex Moreno abf454496d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-07 08:34:55 +02:00
Alexandre Riera bfd421c188 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 06:30:43 +00:00
Carlos Satorres cc27d1fa97 refs #5066 fix vehicle res.data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 08:30:37 +02:00
Carlos Satorres 738b04af4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-06-07 08:15:50 +02:00
Carlos Satorres d09075d490 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 05:57:05 +00:00
Vicent Llopis 3805812aba fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 07:43:44 +02:00
Alexandre Riera 16ad082967 back fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 07:36:30 +02:00
Alex Moreno ac0e7ae32b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 07:08:02 +02:00
Alex Moreno cb50c617ee refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 15:09:01 +02:00
Vicent Llopis 391dba6d2c refs #5561 feat: add async functions
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 12:15:39 +02:00
Vicent Llopis 024cb1e3f4 refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:56:14 +02:00
Carlos Satorres 05111c9268 hotfix test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 11:43:14 +02:00
Carlos Satorres 6f3704c365 hotfix colors ticket advance ticket future 2023-06-06 11:42:35 +02:00
Alexandre Riera daf85368a0 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-06 08:40:07 +00:00
Alexandre Riera 6e4d7e8b01 refs #5749 added id
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 10:31:08 +02:00
Alexandre Riera 36b0216640 refs #5513 changed tests description
gitea/salix/pipeline/head This commit looks good Details
2023-06-06 07:40:38 +02:00
Alexandre Riera 9c9a2d4fe2 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 12:25:50 +00:00
Carlos Satorres 4d333c3a68 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-06-05 10:38:59 +02:00
Vicent Llopis 5eac9d20dc a
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:43:39 +02:00
Vicent Llopis b253ea8edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 09:40:23 +02:00
Alexandre Riera 15b5f10a93 refs #5513 addFromBuy back added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 09:10:19 +02:00
Juan Ferrer fe32a2af05 refs #5667 RoleInherit & Sms: Translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:35:07 +02:00
Carlos Satorres d8f5978284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-05 08:30:12 +02:00
Carlos Satorres c1cda1a3ff refs #5334 basicData e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:29:56 +02:00
Alex Moreno 91b0e3013a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:11:47 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Juan Ferrer 47c6ad6a71 refs #5667 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:48:27 +02:00
Juan Ferrer 45eba4533a refs #5667 VnUser translation added
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:47:45 +02:00
Juan Ferrer 5be79bbdef refs #5667 VnUser translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 15:31:36 +02:00
Alex Moreno 86cd5f5237 refs #5472 fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-02 15:07:02 +02:00
Carlos Satorres 1095a59954 refs #5334 rest back, e2e summary, less e2e basic
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 14:44:56 +02:00
Vicent Llopis 67413360c6 refs #5561 feat: utilizar métodos bd
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 13:31:41 +02:00
Vicent Llopis 01175a4c6c quitado vn
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:32:34 +02:00
Vicent Llopis 186ec2ea41 fix sendMail: sustituido modelo Journey por BusinessSchedule
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:22:27 +02:00
Vicent Llopis ba64dbbe46 refs #5561 refactor: actualizados nombres
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 12:20:29 +02:00
Juan Ferrer c05d6bb9a1 refs #5563 WorkerDocument translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 11:43:44 +02:00
Vicent Llopis 02d2afcb8b refs #5561 feat: permite coloear todos los circulos
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 10:57:28 +02:00
Alexandre Riera 37bbc66ca4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 09:39:46 +02:00
Juan Ferrer 95715763a1 refs #5667 Worker translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 08:57:22 +02:00
Vicent Llopis cf2bf0a17b refs #5561 delete: codigo obsoleto
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 08:23:44 +02:00
Carlos Satorres 5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-06-02 08:21:14 +02:00
Carlos Satorres 04780e211d refs #5334 test front & 1/2 back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 16:03:55 +02:00
Vicent Llopis d727ea83ab refs # 5561 feat: cambiar url del crud-model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:31:16 +02:00
Alex Moreno 9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-01 15:29:46 +02:00
Vicent Llopis 0d85069e0f refs #5561 feat: permite colorear
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 15:01:38 +02:00
Carlos Satorres bb5247c49b refs #5334 tree
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:50 +02:00
Alex Moreno d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:23 +02:00
Alex Moreno 69bf26433d fix(workerLog): acl to hr
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 13:19:34 +02:00
Carlos Satorres f37c66304f refs #5334 change info
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 12:00:15 +02:00
Carlos Satorres 4c7c7f5c96 refs #5334 mod search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 11:30:28 +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
Carlos Satorres 0ee8811c15 refs #5398 fix agencies, warehouses
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 07:52:21 +02:00
Vicent Llopis d5aae8f824 refs #5688 refactor: muestra un mensaje de error controlado
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:53:31 +02:00
Carlos Satorres 967e07933d refs #5398 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 14:46:19 +02:00
Alex Moreno 0aed2c2c08 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:10:25 +02:00
Vicent Llopis 3b4626ee74 a
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 13:01:16 +02:00
Carlos Satorres eb6953a2b6 refs #5334 department
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:50:02 +02:00
Vicent Llopis 02665ec8e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete 2023-05-31 12:28:13 +02:00
Carlos Satorres d1a61b3e0d refs #5334 dinamic
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:26:49 +02:00
Carlos Satorres 489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-31 12:04:26 +02:00
Carlos Satorres e38bf4f1b3 refs #5334 button delete, btn popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 12:02:22 +02:00
Alex Moreno 9ebac5a3f8 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 09:40:32 +00:00
Alex Moreno f0024346a8 refs #5712 openDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 11:32:37 +02:00
Carlos Satorres 0774a94d8b refs #5334 params
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 11:24:11 +02:00
Carlos Satorres d18137bce0 refs #5066 not dense
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:20:13 +02:00
Vicent Llopis a539abf3d8 refs #5244 feat: creado back para buscar trabjadores por name. nickname y code
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:15:16 +02:00
Carlos Satorres cfe0ba7a77 Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 10:04:36 +02:00
Carlos Satorres dfebb3b307 refs #5066 sorted without CONCAT, order=false 2023-05-31 10:04:34 +02:00
Alexandre Riera eeadd72cc4 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-31 09:53:56 +02:00
Alex Moreno 6d23ef5d1e Merge branch 'master' into 5153---business-type-worker-descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-05-31 05:04:57 +00:00
Juan Ferrer a4d7988591 refs #5517 Translations fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 19:39:11 +02:00
Carlos Satorres d6c588d7eb Merge branch 'dev' into 5398-fixErrorWarehouses
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:02:54 +00:00
Carlos Satorres 2c3869d961 refs #5398 capital letters
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:48:09 +02:00
Carlos Satorres 0fd7f4183e refs #5334 fk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:36:39 +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
Vicent Llopis daeed312d0 refs #5244 fix: añadido vn-drop-down em html
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:16:15 +02:00
Carlos Satorres 1dcaba1fdc refs #5334 department workers list
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 15:13:16 +02:00
Vicent Llopis 6cf1e0953d refs #5244 feat: intento de crear el componente workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:49:28 +02:00
Carlos Satorres 26187898e1 refs #5334 popover
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 14:02:34 +02:00
Alexandre Riera 576a5f050e refs #5513 fix back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 13:48:56 +02:00
Alexandre Riera c0c522c619 Merge branch '5513-backs-embalajes' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 13:47:11 +02:00
Alexandre Riera 1fd51c191f refs #5513 minor fixes 2023-05-30 13:47:09 +02:00
Carlos Satorres 8860c77147 refs #5334 fix descriptor
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 13:21:57 +02:00
Carlos Satorres 45085cccc8 refs #5334 fix search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:54:51 +02:00
Carlos Satorres 813c4ede00 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:22:49 +00:00
Carlos Satorres eaffd61579 Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:21:47 +02:00
Carlos Satorres 0661bf8fa9 refs #5066 remake sql without ROW_ORDER 2023-05-30 12:21:44 +02:00
Carlos Satorres e7d25a6cf3 refs #5334 filter
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:08:45 +02:00
Carlos Satorres e26eedb51c refs #5334 descriptor wprkerFk clientFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:54:14 +02:00
Vicent Llopis 4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:52:04 +02:00
Alexandre Riera 30816f7947 Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:51:42 +00:00
Carlos Satorres cf632040e7 refs #5334 workFk, clientFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 11:48:39 +02:00
Alexandre Riera 060b2fdf50 Merge branch '5137-aviso-impresora' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:34:55 +02:00
Alexandre Riera 138f03d891 refs #5137 fix back test 2023-05-30 11:34:53 +02:00
Alexandre Riera 32bdaa640e Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 09:30:34 +00:00
Pablo Natek 382bc06075 refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:23:07 +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
Carlos Satorres 2778858705 refs #5334 search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:27:49 +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
Vicent Llopis 21448a84dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-30 10:16:34 +02:00
Carlos Satorres 107d8d1edd refs #5334 model y vista
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:13:49 +02:00
Vicent Llopis 7d59c6ec0c refs #5468 feat: eliminado acl nativo y añadido a salix.ACL
gitea/salix/pipeline/head Build queued... Details
2023-05-30 10:07:17 +02:00
Vicent Llopis 81a8f383aa refs #5468 feat: no depender del modulo worker
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 10:00:05 +02: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
Carlos Satorres cb664ecec4 Merge branch '5328-abonarTodoTicket' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:18:57 +02:00
Carlos Satorres ec5a5be9e6 refs #5328 remove spaces 2023-05-30 09:18:52 +02:00
Carlos Satorres 3872078507 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 07:16:38 +00:00
Carlos Satorres d9a64211de refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 09:16:02 +02:00
Vicent Llopis ea1c860a18 refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:13:47 +02:00
Alex Moreno 8fff3989e7 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:30:48 +00:00
Vicent Llopis 27700bd72c Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:14:48 +00:00
Carlos Satorres 9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-30 08:05:17 +02:00
Carlos Satorres 2d6f0bb2ce refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 15:27:50 +02:00
Alex Moreno b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 15:21:37 +02:00
Carlos Satorres f4e877dada refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 14:46:39 +02:00
Carlos Satorres 3423ce612c refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 13:49:32 +02:00
Alexandre Riera 1bb5033729 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued... Details
2023-05-29 10:56:21 +00:00
Alexandre Riera 059467a383 refs #5137 sql moved to template
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 12:55:20 +02:00
Carlos Satorres d8e7c2700a refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 12:42:27 +02:00
Vicent Llopis d2355412a0 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 08:59:20 +00:00
Carlos Satorres 2e83d91006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-05-29 10:24:19 +02:00
Carlos Satorres 41b1b2fb3f fix >
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 10:02:21 +02:00
Carlos Satorres b797f747f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX 2023-05-29 10:00:33 +02:00
Pablo Natek a232e9ecea refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:26:36 +02:00
Vicent Llopis d313517e14 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:24:28 +00:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:09:08 +00:00
Carlos Satorres 95c438b73a refs #5648 move claimSure
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 14:52:47 +02:00
Carlos Satorres 2a78a912eb refs #5334 worker.department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:35:12 +02:00
Carlos Satorres 3aa5ce6208 refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:23:34 +02:00
Carlos Satorres ceaaece007 refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:08:37 +02:00
Carlos Satorres 07e176ae4f refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:25:49 +02:00
Carlos Satorres f74c370446 refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:15:47 +02:00
Alex Moreno 0789804352 refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:58:03 +02:00
Alex Moreno 2b06c62876 refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:21:15 +02:00
Vicent Llopis 3ecfbe2052 refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 12:03:36 +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
Carlos Satorres 027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:47:04 +02:00
Carlos Satorres 10e085ca1b refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:43:51 +02:00
Carlos Satorres 8adc104cf4 refs #5735 fix currency
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 08:39:58 +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
Juan Ferrer 27d4d10472 refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:32:03 +02:00
Juan Ferrer 2e0721b101 refs #5667 Fixes: Id filter, translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:22:46 +02:00
Vicent Llopis 71d8a355bd refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 15:03:22 +02:00
Vicent Llopis 96feb24f12 refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 13:28:44 +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
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Alex Moreno dd83b25bb2 Merge branch 'master' into hotfix-item_getBalance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 09:37:38 +00:00
Alexandre Riera dfac44a87b hotfix 3rd parameter to null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 11:35:25 +02:00
Carlos Satorres d82a7eeeb7 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:25:47 +00:00
Alex Moreno a0da78700b Merge branch 'dev' into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:49:40 +00: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
Carlos Satorres 1f24314ab2 refs #5635 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:24:01 +02:00
Alex Moreno 0e6501f306 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master 2023-05-25 07:42:58 +02:00
Alex Moreno e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:34:54 +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
Alex Moreno 03e2b98485 hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:50:59 +02:00
Alexandre Riera de313b6418 refs #3628 Show what's before the inventory
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:40:26 +02:00
Alexandre Riera 74ba21b1b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:39:01 +02:00
Alexandre Riera 087fa137fd Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:14:17 +00:00
Alex Moreno 6b66eb3bb2 refs #5679 typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:59:58 +02:00
Carlos Satorres d6d72ed289 refs #5635 smart-table, counter, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-24 12:35:07 +02:00
Alexandre Riera 49bd9c35b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:19:45 +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 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:20:07 +02:00
Carlos Satorres 9b363bc7a4 refs #5635 remove vn, smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:57:51 +02:00
Carlos Satorres 1bd54765f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition 2023-05-24 10:05:38 +02:00
Carlos Satorres a99b7cd4f1 Merge branch 'dev' into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 08:02:33 +00:00
Carlos Satorres 6294fc0435 refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:02:02 +02:00
Carlos Satorres 6cf2c38927 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:59:04 +00:00
Carlos Satorres bb39724718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-05-24 08:09:44 +02:00
Carlos Satorres e46caffe96 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:05:44 +00:00
Vicent Llopis 3caef0c135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:46:08 +02:00
Vicent Llopis 1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:45:04 +00: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
Alexandre Riera 97653d9b8f Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:07:33 +00:00
Alex Moreno c35e2e155f refs #5472 test(changePassword): back
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 15:12:28 +02:00
Vicent Llopis 3119ae4471 refs #5609 delete: console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 15:12:20 +02: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
Carlos Satorres 0dda7791f6 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:51:10 +00:00
Carlos Satorres af1f92613f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:57:11 +02:00
Vicent Llopis 0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:45:03 +02:00
Vicent Llopis c9b4c68b0c refs #5468 refactor: actualizada vista
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:41:13 +02:00
Carlos Satorres 4f5bd95d21 refs #5639 order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:23:46 +02:00
Vicent Llopis 0702e4ef43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:19 +02:00
Vicent Llopis b7e3e9fa71 refs #5468 feat: add testBack
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:10 +02:00
Vicent Llopis db55c3e81b refs #5468 fix: fornt test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:49:34 +02:00
Vicent Llopis 191fe4ebf6 refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 12:40:49 +02:00
Carlos Satorres e2bea16e68 refs #5639 select country, paymethod
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:31:02 +02:00
Vicent Llopis 940ed29dfc refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:21:35 +02:00
Carlos Satorres db7d3b6868 refs #5639 payMethodFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:32:26 +02:00
Carlos Satorres 7fd2927ec9 refs #5639 smart-table country
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:26:31 +02:00
Vicent Llopis 96163cb07f refs #5468 feat: update acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:43:46 +02:00
Vicent Llopis cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:04:31 +02:00
Vicent Llopis 6135a8f576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-23 10:03:40 +02:00
Vicent Llopis 4bed88faf5 refs #5468 fix: e2e test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:44:07 +02:00
Carlos Satorres 84abba5566 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:38:01 +00:00
Alex Moreno 9500e99b86 Merge branch 'dev' into 5579-fix-order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:17:25 +00:00
Alex Moreno 53e55de605 refs #5579 fix(route_index): order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:15:31 +02:00
Carlos Satorres d7d94796d6 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:13:47 +00:00
Vicent Llopis 9426ff204f refs #5468 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:12:27 +02:00
Carlos Satorres 0c673e43bc refs #5639 smart-tabla defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:02:05 +02:00
Vicent Llopis aea39dd0b7 refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:45:03 +02:00
Alexandre Riera bf8d82f3c6 refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 08:43:31 +02:00
Vicent Llopis 3b7b31deb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:31:52 +02:00
Carlos Satorres ee8685329f Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:23:19 +00:00
Alex Moreno 6f503e2a81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-23 08:23:16 +02:00
Carlos Satorres 8ee581eb67 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:02:17 +00:00
Alex Moreno 6f06bac0c1 Merge branch 'dev' into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:55:08 +00: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
Vicent Llopis b65ebc6af3 refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 07:09:51 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Carlos Satorres 3994e65040 refs #5648 spaces fix2 2023-05-22 15:56:14 +02:00
Carlos Satorres a7c59f51b9 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 13:51:35 +00:00
Carlos Satorres 5e651d7b8c Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:30:06 +02:00
Carlos Satorres 6d147e7af7 refs #5648 fix spaces 2023-05-22 14:30:04 +02:00
Carlos Satorres 6093cb4794 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:26:57 +00:00
Carlos Satorres 9bc20493fe #refs #5648 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:02:07 +02:00
Carlos Satorres 1b19035d8d refs #5648 vn-confirm
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:41:02 +02:00
Alex Moreno ddab59a10c refs #5472 refactor(changePassword): convert in async
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 09:17:40 +02:00
Carlos Satorres e9222dbcb7 Merge branch 'dev' into 5689-fixedPricesSize
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 06:31:51 +00:00
Carlos Satorres 23287e5ebf refs #5648 setTimeout
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 08:30:23 +02:00
Carlos Satorres 32ce0c1a1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim 2023-05-22 08:13:31 +02:00
Juan Ferrer 69b892f2fd refs #5667 Translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 16:59:39 +02:00
Vicent Llopis 8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 13:34:07 +02:00
Juan Ferrer 6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI 2023-05-19 10:56:15 +02:00
Vicent Llopis 5ec107188c refs #5609 feat: no deja buscar si no tiene un filtro de fecha
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 10:30:36 +02:00
Vicent Llopis 8cf988b7d2 refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 08:02:17 +02:00
Alex Moreno bbc34f04ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 07:35:23 +02:00
Carlos Satorres 2b1e951692 refs #5635 smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 15:33:54 +02:00
Alexandre Riera 58c25786a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:52:33 +02:00
Alexandre Riera d70a31bfbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes 2023-05-18 14:49:27 +02:00
Alex Moreno f54d9180b1 fix front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:44:05 +02:00
Alexandre Riera e8376c00a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:43:20 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:12:46 +02:00
Vicent Llopis ec02972efb refs #5609 mostrar filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:11:29 +02:00
Carlos Satorres 814568f2a9 refs #5297 errors solve, trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 13:11:17 +02:00
Alexandre Riera 2591d2d115 refs #3628 added check & date-picker
gitea/salix/pipeline/head Build queued... Details
2023-05-18 11:42:22 +02:00
Alexandre Riera 4bcb461d36 refs #3628 added check & date-picker
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 11:41:46 +02:00
Vicent Llopis d33a84c39f refs #5638 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:30:21 +02:00
Vicent Llopis 463d209d77 refs #5638 refactor: eliminado if innecesario
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:21:30 +02:00
Vicent Llopis 9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre'
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:58:13 +02:00
Vicent Llopis b66362d313 refs #5638 fix: cambiado nombre de variable
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:33:17 +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
Vicent Llopis a9f71ccbc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:33:08 +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
Juan Ferrer 48da4b13ff refs #5667 Ticket translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 17:08:20 +02:00
Alex Moreno 02451818ef typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:31:19 +02:00
Carlos Satorres 69a25d8d03 refs #5696 horas a 00
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:04:13 +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
Carlos Satorres c31eee4906 refs #5696 landed
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 13:35:55 +02:00