Commit Graph

1041 Commits

Author SHA1 Message Date
Jorge Penadés 1231d6dd1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-10-24 08:34:42 +02:00
Alex Moreno 483526c970 refs #6015 feat(executeRoutine): check db restrictions. test: add executeRoutine tests 2023-10-23 15:03:05 +02:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-10-23 08:31:37 +02:00
Pablo Natek a87698d2ba Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin 2023-10-20 13:08:53 +02:00
Pablo Natek 4df39272d6 remove: appiclation config refs #5979 2023-10-20 13:08:39 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin 2023-10-20 10:55:30 +00:00
Pablo Natek 5c69d9c7f0 fix: add await in async functions refs #5979 2023-10-20 12:53:54 +02:00
Alex Moreno c04ceeced2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6014-executeRoutineMethod 2023-10-20 09:52:00 +02:00
Alex Moreno ef1ddfd484 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-10-20 09:28:37 +02:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev 2023-10-19 13:22:33 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin 2023-10-19 06:51:50 +00:00
Pablo Natek 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979 2023-10-19 08:37:28 +02:00
Alex Moreno 4d3d38ebe3 refs #6014 feat: executeRoutine 2023-10-18 15:22:04 +02:00
Alex Moreno da20697052 refs #6199 feat(sale_updateQuantity): can upload 2023-10-18 15:19:26 +02:00
Alex Moreno 002329b0a1 refs 6199 add quantityLessThanMin translation 2023-10-18 12:04:37 +02:00
Pablo Natek 9870a0e60a feat(origin): create method url_/geturl redf #5979 2023-10-17 13:56:49 +02:00
Pablo Natek 033c02750b refactor(origin): .origin por getUrl() 2023-10-16 18:24:58 +02:00
Alex Moreno b769fa9bcf refs #6199
fix(sale_updateQuantity): if clientType is loses skip
test: fix updateQuantity activeCtx and add test for minQuantity
2023-10-16 10:10:57 +02:00
Pablo Natek f832c1d9ec refs #5979 getUrl 2023-10-15 11:08:33 +02:00
Carlos Andrés 9c0334619d refs #6199 2023-10-13 11:56:50 +02:00
Jorge Penadés 179d8ab87d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-10-10 11:30:53 +02:00
Pablo Natek c4e3fdf510 Merge branch 'dev' into 6213-supplierFixCreateErrors 2023-10-06 06:03:03 +00:00
Jorge Penadés c35899542d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-10-04 08:40:44 +02:00
Pablo Natek 7fd2d143c3 refs #6213 devMerge 2023-10-03 07:08:29 +02:00
Carlos Andrés c469a221c7 refs #6254 2023-09-29 14:16:35 +02:00
Carlos Andrés 0e5a7bbb85 refs #6254 2023-09-29 14:11:11 +02:00
Carlos Andrés 41ac907b05 refs #6254-collection_getTickets 2023-09-29 13:44:41 +02:00
Carlos Andrés 9a7cb3ef7b refs #6254 collection_getTickets 2023-09-29 12:30:05 +02:00
Alex Moreno 1307d4727c refs #6254 feat(collection): add getTickets 2023-09-27 15:08:36 +02:00
Sergio De la torre ac3e9c811d refs #5890 feat: itemShelvingSaleAsignado 2023-09-27 14:01:17 +02:00
Jorge Penadés c8c06f498c ref #5914 fixed tests e2e 2023-09-25 10:49:47 +02:00
Jorge Penadés 731bad5981 ref #5914 create ticket with new and refactor 2023-09-22 14:52:56 +02:00
Jorge Penadés ac4aea7d38 ref #5914 created transfer issued invoice 2023-09-21 09:14:46 +02:00
Pablo Natek 324b3ed8ee Merge branch 'dev' into 6213-supplierFixCreateErrors 2023-09-21 05:21:06 +00:00
Jorge Penadés 4870b0830b ref #5914 fix refund and change method name 2023-09-20 11:06:30 +02:00
Jorge Penadés 87cee57e56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-20 10:47:53 +02:00
Guillermo Bonet 4ccb09d057 Merge branch 'master' into test 2023-09-20 08:18:03 +02:00
Guillermo Bonet 56c1dbc096 Merge branch 'master' into 5995-getExternalCmrRouteFk 2023-09-19 12:42:46 +00:00
Guillermo Bonet 6c34421413 refs #5995 Requested changes 2023-09-18 10:03:31 +02:00
Pablo Natek f82af979ed refs #6213 fixTraductionFile 2023-09-13 16:54:51 +02:00
Pablo Natek ccfd8fad05 refs #6213 fixCreateError 2023-09-11 12:32:46 +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
Javi Gallego 6a4d8fbfbf Merge branch 'dev' into 6173-dump-BBDD 2023-09-05 13:48:35 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Sergio De la torre e7cd052199 refs #6132 add messageError 2023-08-31 13:49:00 +02:00
Carlos Satorres 017e0dd948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-08-31 13:29:34 +02:00
Javi Gallego f54a239229 fixes #6143 fixes: this.bankEntityFk no existe 2023-08-25 09:46:53 +02:00
Jorge Penadés 3d4a99b07e refs 5914 transferInvoice created 2023-08-24 10:51:34 +02:00
Javi Gallego 4657bf4e43 refs #6143 refactor: ibanValidation with countryCode param 2023-08-22 14:58:26 +02:00
Jorge Penadés 27ab6639c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-08-10 13:26:42 +02:00
Jorge Penadés 7ca6c6b96d refs #5914 fix merge 2023-08-08 15:10:15 +02:00
Alex Moreno 0d5c6ffdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted 2023-08-08 07:10:25 +02:00
Carlos Satorres b85023b46d accent 2023-08-03 10:11:17 +02:00
Carlos Satorres 9b11479675 refs #5640 traducciones 2023-08-03 10:10:53 +02:00
Carlos Satorres 183fdacefc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate 2023-08-03 10:01:11 +02:00
Jorge Penadés 50155cea8d refs #5914 WIP transfer invoiceOut 2023-07-28 15:21:43 +02:00
Carlos Satorres d01584bfb3 refs #4764 service 2023-07-27 15:15:55 +02:00
Jorge Penadés 543fbf3c0a refs #5929 isEditableOrThrow created, tests passed 2023-07-25 15:35:08 +02:00
Jorge Penadés 9978db9d52 refs #5929 WIP test created 2023-07-25 11:33:01 +02:00
Jorge Penadés 4f80221101 refs #5929 added ACL and accurate errors 2023-07-24 10:34:44 +02:00
Vicent Llopis 4755c50cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved 2023-07-20 07:22:30 +02:00
Vicent Llopis b13618529a refs #5849 delete: traducción erronea 2023-07-20 07:21:38 +02:00
Alex Moreno 2c79056f34 refs #5976 error extended 2023-07-19 13:44:04 +02:00
Alex Moreno f07ac89cb6 refs #5976 add custom error 2023-07-18 15:01:04 +02:00
Vicent Llopis 4c7f42acb5 a 2023-07-18 14:17:07 +02:00
Vicent Llopis 7bd378e9dd refs # 2023-07-18 14:15:56 +02:00
Carlos Satorres a5d1c68511 change err and traduction 2023-07-17 14:07:45 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back 2023-07-17 12:30:48 +02:00
Carlos Satorres 87f125453d refs #5640 fix mayus quit function 2023-07-14 13:35:13 +02:00
Alex Moreno ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-07-13 08:43:50 +02:00
Vicent Llopis 551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir 2023-07-12 13:55:57 +02:00
Alex Moreno 9cb29b9166 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-07-12 13:05:17 +02:00
Vicent Llopis d4217ff8d3 refs #5887 correct translations 2023-07-11 13:38:48 +02:00
Vicent Llopis e1f12bea02 a 2023-07-11 12:33:44 +02:00
Vicent Llopis 93e70e699a refs #5874 feat: refactorizado proceso facturación 2023-07-11 09:19:15 +02:00
Alex Moreno 63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-07-06 10:42:53 +02:00
Carlos Satorres 9c9b53917a refs #5334 fix error 2023-07-06 08:20:33 +02:00
Carlos Satorres 83467c3b6c refs #5334 quit es 2023-07-06 06:08:12 +02:00
Carlos Satorres 5000e05e05 refs #5334 merge + e2e solve 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 ff6d9e427b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-07-03 13:54:15 +02:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev 2023-07-03 13:33:48 +02:00
Alex Moreno 7fe8698b6f refs #5753 fix ticketToInvoice 2023-07-03 10:04:03 +02:00
Carlos Satorres dc36c6fd9d refs #5334 basicData solve e2e 2023-06-30 13:52:46 +02:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-30 11:57:56 +02:00
Alex Moreno 7eb8460ba0 refs #5816 remove unforeseen dev 2023-06-29 15:38:49 +02:00
Alex Moreno b062cec747 refs #5475 fix setPassword options/cb 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 2023-06-29 14:50:06 +02:00
Javi Gallego bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs 2023-06-29 12:43:16 +00:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa 2023-06-28 14:31:54 +02:00
Alex Moreno 31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-28 07:19:04 +02:00
Juan Ferrer c42b38c5cc refs #5900 Code clean, refactor & accurated 2023-06-26 10:23:34 +02:00
Guillermo Bonet e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs 2023-06-26 10:06:41 +02:00
Guillermo Bonet cc5021a75f refs #5684 Removed xxxLog.create and dependences 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
Juan Ferrer 98301f8e70 refs #5900 Small fixes & code clean 2023-06-25 17:06:38 +02:00
Juan Ferrer f70df714df refs #5772, #5900 InvoiceOut back test removed, logs improved 2023-06-25 16:31:24 +02:00
Carlos Andrés 12aa9c6b4b Merge branch 'dev' 2023-06-22 13:23:03 +02:00
Vicent Llopis 591fc14ffa refs #5772 refactor: movido codigo para enviar rocket al back 2023-06-22 12:48:50 +02:00
Carlos Andrés 807596f735 refs #5772 2023-06-22 08:50:18 +02:00
Carlos Andrés 10a25ff590 refs #5772 2023-06-22 07:49:35 +02:00
Alex Moreno 6ab431f8ef refs #5475 tests 2023-06-21 14:17:25 +02:00
Carlos Andrés 6f9fd9bb72 refs #5772 mensajes de error 2023-06-21 09:40:14 +02:00
Alex Moreno d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-21 07:53:40 +02:00
Alex Moreno a8fafacb82 refs #5475 send email force 2023-06-20 15:06:02 +02:00
Vicent Llopis f6cb1cb130 Merge branch 'dev' into 5554-renovar_token 2023-06-20 12:07:52 +00:00
Alex Moreno 5a6a18c76a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-20 09:20:54 +02:00
Juan Ferrer 9fa6e2df71 refs #5595 VnModel.rawSql() bugfix 2023-06-19 14:54:32 +02:00
Alex Moreno dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-16 13:42:13 +02:00
Alex Moreno 3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired 2023-06-14 15:15:00 +02:00
Alex Moreno aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-13 11:49:42 +02:00
Vicent Llopis 61f99744c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token 2023-06-13 07:43:23 +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
Alex Moreno d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote 2023-06-12 15:20:46 +02:00
Alex Moreno 5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired 2023-06-12 10:46:21 +02:00
Alex Moreno 051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-12 09:11:17 +02:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs 2023-06-09 09:03:23 +02:00
Vicent Llopis 929b29e7e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token 2023-06-08 13:14:33 +02:00
Alex Moreno 3e39564695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-08 12:39:36 +02:00
Vicent Llopis cf559b2ba5 refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono 2023-06-08 09:19:57 +02:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models 2023-06-07 23:54:27 +02:00
Alex Moreno edc601fd5d refs #5489 fix(account/sync), fix(order) catalog-search-panel popover 2023-06-07 13:34:13 +02:00
Vicent Llopis 3fdb546d86 refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created 2023-06-07 10:28:29 +02:00
Alexandre Riera 7121b1e516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs 2023-06-07 08:50:53 +02:00
Alex Moreno ac0e7ae32b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-07 07:08:02 +02:00
Alex Moreno 7311e79273 fix(vn-model): rewriteMethod 2023-06-06 15:07:54 +02:00
Alex Moreno 5d6eaca6b8 refs #5472 test(changePassword): e2e 2023-06-05 15:20:07 +02:00
Alex Moreno 9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync 2023-06-01 15:29:46 +02:00
Alex Moreno d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-01 14:19:23 +02:00
Alexandre Riera e05d3b0793 Merge branch 'dev' into 5595-modify-loggable-tables-in-procs 2023-05-30 08:27:35 +00:00
Alexandre Riera 153542d2be refs #5595 taking active connection 2023-05-30 09:49:39 +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
Carlos Satorres 138d158f4f #refs 5684 remove and mod selectors 2023-05-29 09:11:41 +02:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-26 07:41:48 +02:00
Alex Moreno e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale 2023-05-25 07:34:54 +02:00
Alex Moreno 292d9e038d typo 2023-05-24 13:38:11 +02:00
Alex Moreno 6b66eb3bb2 refs #5679 typo 2023-05-24 12:59:58 +02:00
Alexandre Riera 856dcf18cb refs #5677 locations 2023-05-24 12:17:41 +02:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed 2023-05-24 12:16:19 +02:00
Alex Moreno 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale 2023-05-24 11:20:07 +02:00
Alex Moreno bbc34f04ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-19 07:35:23 +02:00
Alexandre Riera 58c25786a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-05-18 14:52:33 +02:00
Alex Moreno 7704256079 master to test 2023-05-11 08:00:49 +02:00
Alex Moreno a345265a89 refs #5488 specifics acls 2023-05-10 14:09:06 +02:00
Alexandre Riera e7d16dc8ba refs #4797 fix test, add getList 2023-05-09 11:34:32 +02:00
Alexandre Riera b37bde2ba7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-05-09 08:14:42 +02:00
Alex Moreno 8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-05-09 07:11:09 +02:00
Juan Ferrer 68b1b6c5bd refs #5517 E2E fixes 2023-05-08 12:03:27 +02:00
Alexandre Riera b3100d2653 refs #5595 remove OkPackets from logIn and logOut 2023-05-04 09:55:36 +02:00
Alex Moreno 5eca583c62 refs #5472 feat(vnUser): override setPassword 2023-05-03 15:19:19 +02:00
Alexandre Riera ad3c6dcee2 wip #5595 2023-05-03 14:34:36 +02:00
Alex Moreno bf3aac70f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-03 11:37:07 +02:00
Alex Moreno 79e7e7c604 refs #5472 feat: add change-password section 2023-05-02 15:16:13 +02:00
Alexandre Riera 13c37e88ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-05-02 11:38:07 +02:00
Alex Moreno 48be8b9fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-02 11:27:14 +02:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section 2023-05-02 07:28:59 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies 2023-04-28 13:02:10 +00:00
Carlos Satorres 0e0db960af refs #5540 supplier 2023-04-28 14:23:44 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Carlos Satorres cdbbec9d36 refs #5540 validate 2023-04-28 10:21:54 +02:00
Carlos Satorres b8f7f7bd69 refs #5540 create validateIban 2023-04-28 09:07:06 +02:00
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations 2023-04-27 18:13:24 +02:00
Alex Moreno 42fc0b62d8 refs #5472 feat(user): add passExpired 2023-04-27 15:18:27 +02:00
Carlos Satorres e1864fec09 arreglo json 2023-04-27 13:26:22 +02:00
Carlos Satorres 08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies 2023-04-27 12:49:01 +02:00
Carlos Satorres 07148f6c29 refs #5540 mon message 2023-04-27 11:31:26 +02:00
Alex Moreno 34bb216f17 deploy(231601): dev to test 2023-04-27 08:53:54 +02:00
Alexandre Riera 83319894b2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev 2023-04-25 11:25:29 +02:00
Alexandre Riera 91b2d15234 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test 2023-04-25 08:53:50 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved 2023-04-24 19:10:04 +02:00
Carlos Satorres 67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies 2023-04-24 06:51:41 +00:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Alex Moreno 9766008ca9 fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 90000 2023-04-21 10:04:14 +02:00
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alexandre Riera b3a10698af hotfix negativeBases 2023-04-21 08:20:38 +02:00
Alex Moreno 239685b43f (231401) master to test 2023-04-20 08:52:48 +02:00
Alex Moreno 7df4a2b15d fix(231401): fix tests and fixtures 2023-04-20 08:25:15 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Juan Ferrer dc853213b8 refs #5553 Allow to skip default transaction timeout 2023-04-18 20:33:39 +02:00
Joan Sanchez d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 13:14:57 +02:00
Joan Sanchez cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 11:52:17 +02:00
Joan Sanchez fded7d062b section fix 2023-04-18 09:49:23 +02:00
Joan Sanchez 6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2 2023-04-18 08:32:22 +02:00
Juan Ferrer 378400c6d2 refs #5553 Image scrubing method improved
Remove & dryRun options, check that collection exists, performance improved, exclusive lock
2023-04-17 18:19:25 +02:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing 2023-04-15 14:24:50 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Joan Sanchez f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-13 12:00:22 +02:00
Joan Sanchez b5f2cf3711 Added unit test & translation fixes 2023-04-13 11:54:56 +02:00
Alexandre Riera 71e202d586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro 2023-04-13 08:45:05 +02:00
Alexandre Riera eed57c9b4e refs #5546 removed log tests 2023-04-12 14:47:07 +02:00
Carlos Satorres ef6e85532e refs #5213 cambios e2e, descriptor 2023-04-12 14:20:05 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests 2023-04-12 12:33:14 +02:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert 2023-04-11 09:48:31 +02:00
Joan Sanchez 2e0325e567 Validate code 2023-04-06 14:59:25 +02:00
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails 2023-04-04 14:09:55 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-04-04 08:40:03 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-30 14:57:00 +02:00
Joan Sanchez cc759373a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-03-29 15:20:57 +02:00
Joan Sanchez d5fd15224e fix(sqlConnector): handled malformed json parse
Refs #4862
2023-03-29 14:57:14 +02:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-20 09:54:02 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-16 09:16:50 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix 2023-03-16 08:06:17 +00:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos 2023-03-16 06:42:39 +00:00
Joan Sanchez dc936fe690 Merge branch 'dev' into 5182-print_publish 2023-03-15 07:05:14 +00:00
Carlos Andrés 6b375cbaaa refs #5000 InvoiceOut 2023-03-14 09:34:41 +01:00
Carlos Andrés 2a6848c09a refs #5000 invoiceOutGlobal 2023-03-14 09:17:39 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor 2023-03-14 08:17:46 +01:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
Refs #5182
2023-03-13 15:05:19 +01:00
Alexandre Riera e66974f77f refs #5036 removed grabUserLog function 2023-03-10 10:02:34 +01:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError 2023-03-09 08:31:38 +01:00
Joan Sanchez 23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar 2023-03-08 06:50:16 +00:00
Alexandre Riera 0fbff4eb8f Merge branch '5036-regularizar-historicos' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-03-07 14:11:05 +01:00
Alexandre Riera b00a481016 refs #5036 hasGrabUser out of function 2023-03-07 14:11:03 +01:00
Alexandre Riera 59a3ff0f7b Merge branch 'dev' into 5036-regularizar-historicos 2023-03-07 12:10:24 +00:00
Alexandre Riera 21c7b18de9 refs #5036 make logs/querys only when grabUser is disabled 2023-03-07 13:10:02 +01:00
Vicent Llopis 0bda8c0ed6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-07 09:14:30 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Alexandre Riera 4e800a7a45 . 2023-03-06 09:30:14 +01:00
Alexandre Riera f2bd0253e2 refs #5092 added unbilled tickets section 2023-03-06 09:27:53 +01:00
Javi Gallego 780572a9f2 test fixed 2023-03-06 08:14:26 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-03-03 07:44:31 +01:00
Joan Sanchez b8881a050c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-03-02 07:41:16 +01:00
Carlos Andrés 6f5e25493d invoicing test 2023-03-01 10:36:38 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund 2023-03-01 08:29:58 +01:00
Guillermo Bonet 15f2f46e4c refs #4975 Traduction no branch 2023-02-28 14:48:17 +01:00
Guillermo Bonet 656685cd7e refs #4975 Minor changes 2023-02-28 14:35:34 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations 2023-02-28 13:42:18 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added 2023-02-27 08:39:46 +01:00
Alexandre Riera 76cd2d160e Merge branch 'dev' into 5036-regularizar-historicos 2023-02-27 06:05:21 +00:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC 2023-02-23 09:25:23 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Alex Moreno f0827c992b feat: add console.log 2023-02-21 14:53:35 +01:00
Alexandre Riera 77066b2005 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-20 09:20:30 +01:00
Joan Sanchez acf5981a5f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-02-16 14:20:05 +01:00
Alexandre Riera f42fbb80ec refs #5036 changes 2023-02-16 08:54:45 +01:00
Alex Moreno a507f7e8fb fix(boot_date): Date.vnUTC return new Date() 2023-02-14 13:17:56 +01:00
Vicent Llopis 222032aae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-02-09 08:38:08 +01:00
Alex Moreno b209ecb011 feat: create post route for debug 2023-02-08 10:56:51 +01:00
Alexandre Riera 0c91f95762 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-03 12:03:16 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-02-02 11:42:48 +01:00
Alexandre Riera 780018e4df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-02-02 08:40:49 +01:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-02-02 08:23:17 +01:00
Alexandre Riera 62766706b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData 2023-02-01 08:52:03 +01:00
Alexandre Riera 7d7e1a74da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-02-01 08:46:28 +01:00
Alexandre Riera fd440a4db3 refs #5129 better translation tracked sales 2023-01-31 15:42:36 +01:00
Joan Sanchez e34d64361b Account refactor 2023-01-31 14:57:24 +01:00
Alexandre Riera a358e58171 docuware translation 2023-01-31 12:12:25 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added 2023-01-31 09:04:45 +01:00
Alex Moreno a74fb31b5b fix: vn.time 2023-01-30 15:15:27 +01:00
Vicent Llopis 903a42683d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-30 12:45:17 +01:00
Alexandre Riera 8119b301c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-30 12:21:54 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added 2023-01-30 08:30:39 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 07:56:12 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser 2023-01-27 08:20:32 +00:00
Alexandre Riera 355c9d855d Merge branch 'dev' into 5036-regularizar-historicos 2023-01-27 07:59:49 +00:00
Alexandre Riera a12f629690 refs #5036 corrections 2023-01-27 08:52:33 +01:00
Alexandre Riera d69b204c4c refs #5036 loggable refactored, tests fixed 2023-01-26 15:49:30 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter 2023-01-25 15:29:01 +01:00
Joan Sanchez 70cc83b8bf Enable vanity user URLs 2023-01-24 11:55:50 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-24 08:11:46 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor 2023-01-23 15:24:00 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Alexandre Riera 07d3fef8f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-23 13:44:19 +01:00
Alexandre Riera 635e787cce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-01-23 13:26:05 +01:00
Alexandre Riera 96becec9d3 refs #4564 mixin vn-report created 2023-01-23 10:12:34 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-20 08:30:30 +01:00
Alexandre Riera 292372395e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 07:15:03 +01:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates 2023-01-17 15:36:39 +01:00
Vicent Llopis b7004e6a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-17 12:50:34 +01:00
Alexandre Riera 2b7383af74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-01-17 10:11:19 +01:00
Alex Moreno 6b1a6fe44b feat: mock dates front and back 2023-01-16 15:18:00 +01:00
Guillermo Bonet 3d4600d70d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method 2023-01-16 12:26:10 +01:00
Alexandre Riera b3c6443277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-16 10:33:35 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file 2023-01-13 13:33:59 +01:00
Alexandre Riera 41671e8a3a refs #4927 modified hook to check name & country 2023-01-13 08:38:29 +01:00
Guillermo Bonet 868c2aaaef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method 2023-01-12 15:25:51 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests 2023-01-12 15:16:38 +01:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs 2023-01-11 13:24:55 +01:00
Alexandre Riera bebbe1c846 refs #5036 fixed transaction 2023-01-10 15:24:22 +01:00
Guillermo Bonet e0e34595f4 refs #4975 Added translations 2023-01-09 18:46:19 +01:00
Vicent Llopis 5a5e4c5afb feat: solo coge los tickets que no esten eliminados 2023-01-09 14:47:52 +01:00
Alexandre Riera e0fa7609cb refs #5036 transaction added 2023-01-09 13:49:35 +01:00
Vicent Llopis d16235cba9 fix: show error when is negative base 2023-01-05 10:55:56 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-28 11:49:16 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-22 09:30:35 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-21 08:05:19 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future 2022-12-20 09:54:28 +01:00
Guillermo Bonet dc82e610b7 refs #4975 Minor changes 2022-12-19 11:24:18 +01:00
Guillermo Bonet a46c2ced7c refs #4975: Added last mdbVersion/last method 2022-12-19 07:26:07 +01:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-16 13:45:25 +01:00
Alexandre Riera 900b378c88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-12-16 07:56:38 +01:00
Carlos Andrés 31d7145c51 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket 2022-12-15 13:28:34 +00:00
Alex Moreno 4b16b413dc fixes #4990 acquireTimeout to 60000 2022-12-15 14:09:35 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code 2022-12-14 15:03:55 +01:00
Carlos Andrés 41b7b6ab06 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket 2022-12-12 08:24:11 +00:00
Vicent Llopis 444d495b7f refactor: codigo reducido 2022-12-01 07:22:13 +01:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-01 07:11:00 +01:00