Commit Graph

1191 Commits

Author SHA1 Message Date
Javier Segarra f27bdec758 feat(salix): refs #7648 #7648 changes requested 2024-07-01 21:14:27 +02:00
Jon Elias 0e84749c07 Merge branch 'dev' into 6436_jasmine_beforeAll 2024-07-01 10:22:11 +00:00
Jon Elias 0917fc318a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-28 13:19:38 +02:00
Alex Moreno cca62ae902 feat: return sql check error 2024-06-26 12:25:18 +02:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll 2024-06-20 12:24:06 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-06-20 09:48:57 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-06-20 09:48:34 +02:00
Javi Gallego b2ad449809 feat: refs #7027 mailError managed 2024-06-19 14:38:56 +02:00
Jorge Penadés 89ea931d9c feat: refs #6744 add locale & drop verification 2024-06-17 12:19:59 +02:00
Guillermo Bonet 9b80ef73a8 Merge branch 'test' into dev 2024-06-14 12:48:00 +02:00
Carlos Satorres 189c67bd2d warmFix change if 2024-06-14 09:43:10 +02:00
Jon Elias 711fad6b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-14 08:50:32 +02:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test 2024-06-14 08:39:57 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests 2024-06-12 12:23:37 +02:00
Jon Elias 2b45c2c61a feat: refs #6436 new test changes, rollback order/filter and /ticket/clone 2024-06-12 08:25:50 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll 2024-06-11 09:41:26 +02:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Jorge Penadés 479e4f3f8a feat: refs #6273 required payMethod for internals 2024-06-07 13:55:56 +02:00
Alex Moreno ca6afb9c10 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-06-07 10:32:49 +02:00
Alex Moreno a33f14ffa5 feat(transferInvoice): makePdf of refund 2024-06-05 12:44:28 +02:00
Jon Elias cf5b8a27a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-03 10:04:38 +02:00
Javi Gallego 6a08a806a9 Merge branch 'dev' into 6408-rocketChat 2024-05-31 10:39:14 +00:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev 2024-05-31 12:29:32 +02:00
Alex Moreno bd82bb011a fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests 2024-05-31 08:44:30 +02:00
Alex Moreno 9e384487cf Merge branch 'master' into 7268-hotFix_getChanges_datestring 2024-05-30 08:01:33 +00:00
Javi Gallego 1bcd7a9665 Merge branch 'dev' into 6408-rocketChat 2024-05-28 12:46:37 +02:00
Javi Gallego 9ee05860f6 feat: #6408 tests 2024-05-28 12:19:54 +02:00
Carlos Satorres 3626941c8c fix traduction & e2e 2024-05-27 12:30:53 +02:00
Alex Moreno a464b0afd1 fix: en translations 2024-05-27 11:54:37 +02:00
Carlos Satorres 4c3428da55 refs #7292 add traduction 2024-05-24 08:21:28 +02:00
Carlos Satorres f45f909995 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember 2024-05-23 14:46:33 +02:00
Carlos Satorres ee010a3bb3 refs #7296 fix pr errors, trad 2024-05-23 14:44:47 +02:00
Carlos Andrés 35a583d6d8 Merge pull request 'test' (!2504) from test into dev
Reviewed-on: #2504
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-23 11:42:23 +00:00
Jon Elias e902a84d10 refactor: refs #5447 changed models 2024-05-23 09:22:19 +02:00
Carlos Satorres 83f638323a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember 2024-05-22 16:09:52 +02:00
Pablo Natek 2142b78deb feat: refs #7187 Add support for multiple PDAs per user 2024-05-21 19:25:18 +02:00
Alex Moreno 28279b0782 Merge branch 'dev' into 7421-fix_checking_NODE_ENV 2024-05-21 13:12:30 +00:00
Alex Moreno ff33c926af fix: move to boot 2024-05-21 15:11:32 +02:00
Alex Moreno 1f2017c272 fix: simplify 2024-05-21 14:03:13 +02:00
Alex Moreno 18bb8a4ea5 fix: checking process.env.NODE_ENV 2024-05-21 13:50:45 +02:00
Carlos Satorres cf630a7213 refs #7292 traduction es 2024-05-21 10:20:54 +02:00
Carlos Satorres 9bd5244f64 refs #7292 hook ueemember 2024-05-21 10:19:21 +02:00
Guillermo Bonet 9d98ae4a03 Merge branch 'test' into dev 2024-05-20 07:02:00 +02:00
Guillermo Bonet 18ce388944 Merge branch 'test' into dev 2024-05-20 06:59:42 +02:00
Jorge Penadés 2694f277d2 fix: refs #6744 add es locale 2024-05-17 13:03:24 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda 2024-05-16 10:23:33 +02:00
Carlos Satorres 8a7d124066 refs #6882 fix traductions 2024-05-08 12:17:44 +02:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays 2024-05-06 09:26:14 +02:00
Sergio De la torre c3b9e76cd6 Merge branch 'dev' into 6799_translations 2024-05-03 09:28:28 +00:00
Sergio De la torre d994a682f9 refs #6799 feat: french and portuguese 2024-05-02 16:48:58 +02:00
Carlos Satorres a43593f63b Merge branch 'dev' into 6870-modifyDefaulterNotification 2024-05-02 10:42:00 +00:00
Carlos Satorres def1521131 refs #6870 defaulter id 2024-05-02 12:42:17 +02:00
Carlos Satorres ae15f4b5d1 refs #6870 markdown 2024-05-02 12:14:39 +02:00
Jon Elias 2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-30 10:19:29 +00:00
Carlos Satorres ace39b92ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification 2024-04-29 12:14:38 +02:00
Carlos Satorres f3c7b1e89c refs #6870 add observationEmail 2024-04-29 11:59:51 +02:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Pablo Natek d25c5eb327 fix: refs #4988 translates 2024-04-25 17:22:22 +02:00
Pablo Natek af1abe934f fix: refs #4988 translates 2024-04-25 17:21:59 +02:00
Jorge Penadés 931c2c4f5e feat: refs #7211 error & locale 2024-04-25 13:12:06 +02:00
Pablo Natek 48d3ee373e fix: refs #4988 yml 2024-04-25 12:47:52 +02:00
Pablo Natek 00359a0a6b fix: refs #4988 traduction 2024-04-25 12:44:27 +02:00
Pablo Natek c2888e4f97 fix: refs #4988 correct yml 2024-04-25 12:43:47 +02:00
Pablo Natek 4e11e46fff feat: refs #4988 capture error on duplicate 2024-04-25 12:40:54 +02:00
Alex Moreno a15b7e0eb8 fix(util_log): refs #7268 fix getChanges when is datestring 2024-04-25 10:44:08 +02:00
Jorge Penadés 6749722634 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice 2024-04-25 10:10:06 +02:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest 2024-04-24 10:31:26 +02:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Guillermo Bonet bc2b6ff97e feat: refs #7173 Added traduction 2024-04-17 07:25:46 +02:00
Carlos Satorres de75d811c3 refs #6682 absence 2024-04-09 12:30:25 +02:00
Guillermo Bonet 449a06c85c feat: refs #6636 Added tests 2024-04-09 09:43:30 +02:00
Guillermo Bonet 6c1e44638e feat: refs #6636 Added getEnumValue method 2024-04-05 11:01:00 +02:00
Guillermo Bonet ac658fb6af Merge branch 'dev' into 6636-pickup 2024-04-05 05:29:26 +00:00
Sergio De la torre 2ed5237568 Merge branch 'dev' into 6964_itemOlder 2024-04-04 13:45:20 +00:00
Guillermo Bonet fcb4fe92e8 Merge branch 'dev' into 6636-pickup 2024-04-04 12:14:23 +00:00
Guillermo Bonet f44e19cae3 feat: refs #6636 Modified updateClaim, model and tests 2024-04-04 14:15:20 +02:00
Jon Elias 3e044a8efe fix: refs #7152 add supplier storage 2024-04-04 08:16:37 +02:00
Alex Moreno ed46ad03d2 refs #7152 warmFix 2024-03-28 09:33:57 +01:00
Sergio De la torre c265896224 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder 2024-03-26 10:24:27 +01:00
Jon Elias 0f4e1acf09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier 2024-03-26 08:37:51 +01:00
Jon Elias 04e42cd3c8 feat: #6514 created supplierDms functionality 2024-03-26 08:29:07 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-26 08:18:47 +01:00
Sergio De la torre 8b684442f5 refs #6276 hotFix: setUserError and return 2024-03-25 16:07:20 +01:00
Sergio De la torre 9e5e49c28f refs #6276 feat:newWarehouse 2024-03-22 06:56:27 +01:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse 2024-03-21 10:18:54 +01:00
Alex Moreno 517aeebe8b refs #7019 fix(createManualInvoice): add throw error 2024-03-18 14:20:05 +01:00
Jorge Penadés 6281ba352b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword 2024-03-15 10:38:08 +01:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test 2024-03-14 08:36:19 +01:00
Alex Moreno c2ecedca71 feat: refs #6925 check incoterms in closure and makeInvoice 2024-03-08 07:48:55 +01:00
Jorge Penadés a94fd1a61c fix: refs #6744 change error kind 2024-03-07 09:29:51 +01:00
Jorge Penadés 05f3a3f31b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword 2024-03-07 08:43:01 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +01:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Carlos Satorres 0156bb09d1 Merge branch 'dev' into 6980-validateIBANRefactor 2024-03-05 11:54:20 +00:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test 2024-03-05 12:37:06 +01:00
Carlos Satorres 2b299eb32b refs #6980 fix iban 2024-03-05 09:48:53 +01:00
Alex Moreno a3052c1cf9 refs #6925 hotFix(invoice) parenthesis & handle incoterms error 2024-03-01 15:05:12 +01:00
Jorge Penadés 7d8d31022b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-01 12:29:55 +01:00
Jorge Penadés 1658838c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword 2024-02-29 12:41:24 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-27 09:42:14 +01:00
Carlos Satorres c0988f8d11 fix json 2024-02-27 09:31:25 +01:00
Carlos Satorres aa49a5c82d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations 2024-02-27 09:28:27 +01:00
Alex Moreno b1a8fcf968 refs #6925 fix(invoice): incoterms error 2024-02-26 11:50:46 +01:00
Alex Moreno d37802fda8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-26 07:21:47 +01:00
Pablo Natek 18da27179d merge(dev): refs #6005 traduction conflict 2024-02-23 09:40:58 +01:00
Jorge Penadés 3bf25e5759 fix: refs #6744 locale 2024-02-23 09:31:01 +01:00
Jorge Penadés 744dd61561 fix: refs #6744 create setUnverifiedPassword 2024-02-22 15:42:54 +01:00
Carlos Satorres e7f8b7282b refs #5858 remove clean pr 2024-02-20 13:48:31 +01:00
Carlos Satorres 62ccbb3074 refs #5858 fix error 2024-02-20 13:45:10 +01:00
Carlos Satorres f3f0360059 refs #5858 fix conflicts 2024-02-20 13:19:31 +01:00
Carlos Satorres 8514a23f9c refs #5858 fix conflicts 2024-02-20 13:18:37 +01:00
Carlos Satorres ed37902291 Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations 2024-02-20 13:14:54 +01:00
Alex Moreno e8a945ba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-19 11:49:20 +01:00
Pablo Natek b3ce6e8d45 fix(spec): refs #6403 add mrwSpec 2024-02-19 11:33:56 +01:00
Jorge Penadés 1767ce426a fix: refs #6276 collection_addItem 2024-02-16 11:54:59 +01:00
Jorge Penadés 63c615655b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-16 08:34:05 +01:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-02-15 10:14:19 +01:00
Alex Moreno fddbf6451b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-02-15 07:52:08 +01:00
Javier Segarra 258958e076 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations 2024-02-14 09:44:51 +01:00
Guillermo Bonet e08fb3d229 fix: refs #6184 Minor change 2024-02-13 08:59:58 +01:00
Alex Moreno 06fe4957d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-13 08:13:58 +01:00
Guillermo Bonet 97f02187e3 Merge branch 'dev' into 6184-saveCmr 2024-02-13 07:35:07 +01:00
Jorge Penadés d60a95feaa fix: refs #6379 await & locale 2024-02-12 08:34:25 +01:00
Jorge Penadés 4aeb88229d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-09 13:07:42 +01:00
Jorge Penadés e0de498f65 fix: refs #6379 add Error & locale 2024-02-09 13:04:27 +01:00
Jorge Penadés 8ad69a62b9 fix: refs #6276 loggable & userId 2024-02-08 10:08:16 +01:00
Jorge Penadés 2940c68516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-08 08:36:05 +01:00
Carlos Satorres 9ee0669903 hotfix kmMax 2024-02-07 11:27:18 +01:00
Jorge Penadés aff8ee28ea fix: refs #6272 back & create test 2024-02-07 10:16:47 +01:00
Alex Moreno e6735f9ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-07 08:35:54 +01:00
Alex Moreno 87864593b2 Merge branch 'dev' into 6184-saveCmr 2024-02-07 06:17:35 +00:00
Javier Segarra 4d6e631fca Merge branch 'dev' into 5834-billingDataAutoFillBic 2024-02-06 17:33:27 +01:00
Guillermo Bonet f4feb6e8b7 Merge branch 'dev' into 6184-saveCmr 2024-02-06 12:13:48 +01:00
Carlos Satorres 318f74072e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus 2024-02-06 10:09:11 +01:00
Carlos Satorres 6002c6cd7a refs #6757 fix trad 2024-02-06 10:07:39 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr 2024-02-06 06:39:51 +01:00
Alex Moreno 691853df49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-05 12:55:16 +01:00
Juan Ferrer 43c245b45b Merge branch 'dev' into 6706-optimizeHooks 2024-02-05 10:27:53 +00:00
Javier Segarra 22f9d7d7a2 Merge branch 'dev' into 5834-billingDataAutoFillBic 2024-02-05 07:24:54 +01:00
Guillermo Bonet 1d596b63a0 Merge branch 'dev' into 6184-saveCmr 2024-02-02 12:24:28 +01:00
Juan Ferrer af536412bf Merge branch '6706-optimizeHooks' of https://gitea.verdnatura.es/verdnatura/salix into 6706-optimizeHooks 2024-02-02 09:50:22 +01:00
Juan Ferrer 4eb53614bc build: refs #6706 Migration to pnPM 2024-02-02 09:49:39 +01:00
Alex Moreno d5e6750998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-02 09:36:41 +01:00
Alex Moreno 9ac0ffb85a Merge branch 'dev' into 6270-electronicInvoiceBack 2024-02-02 07:30:59 +00:00
Jorge Penadés 9f9d953b86 fix: refs #6276 resolve conflicts 2024-02-02 08:11:00 +01:00
Jorge Penadés ec7a88c6dd fix: refs #6703 tests, backs & fixtures 2024-02-01 12:56:11 +01:00
Carlos Satorres 6576bab305 Merge branch 'dev' into 6397-emailValidation 2024-02-01 11:48:48 +00:00
Carlos Satorres 91c3c8f04d Merge branch 'dev' into 6270-electronicInvoiceBack 2024-02-01 10:51:11 +00:00
Alex Moreno 36e8840e6e Merge branch 'dev' into 6757-supplierMayus 2024-02-01 09:28:59 +00:00
Jorge Penadés c4161eec97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-01 08:14:37 +01:00