Commit Graph

753 Commits

Author SHA1 Message Date
Pablo Natek 175e73e565 fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit 2023-11-02 14:05:14 +01: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 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979 2023-10-19 08:37:28 +02:00
Jorge Penadés 330fb08aac ref #5417 fix back test 2023-10-18 13:23:00 +02:00
Jorge Penadés 251d71a437 ref #5417 refactor transactions 2023-10-18 12:05:33 +02:00
Pablo Natek 033c02750b refactor(origin): .origin por getUrl() 2023-10-16 18:24:58 +02:00
Jorge Penadés 3af72e1439 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments 2023-10-16 08:20:20 +02:00
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 5b6eb0a2a6 refs #5768 add address, nickname, pdf, email 2023-10-05 14:01:07 +02:00
Alex Moreno ca86b3cc2f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-10-05 07:27:35 +02:00
Alex Moreno 7cd2e290ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-05 07:22:41 +02:00
Jorge Penadés c59b119a4a ref #5417 fix transactions 2023-10-02 10:06:04 +02:00
Jorge Penadés a7128b8187 ref #5417 fix transactions 2023-10-02 09:04:43 +02:00
Jorge Penadés 6f4a12e50f ref #5417 date filters added 2023-09-29 14:42:47 +02:00
Alex Moreno a0a59b672f refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail 2023-09-29 10:04:57 +02:00
Carlos Satorres 1f1dfae7e3 refs #5843 changes models 2023-09-21 12:50:07 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-21 07:32:19 +02:00
Carlos Satorres f60b6b84fe refs #5843 fix back 2023-09-20 11:58:36 +02:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Guillermo Bonet 2686fd0601 refs #6210 Minor change 2023-09-19 12:18:46 +02:00
Guillermo Bonet 77b55e5b09 refs #6210 Minor change 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
Sergio De la torre b756d2f938 refs #5652 modify 2023-09-14 18:03:30 +02:00
Sergio De la torre 43f5bbb04e Merge branch 'dev' into 5652-ItemTrash 2023-09-14 09:05:55 +02:00
Sergio De la torre d2cd522842 refs #5652 modify:without fit 2023-09-14 07:47:10 +02:00
Sergio De la torre 1d25355423 refs #5652 fix:without fit 2023-09-12 08:44:42 +02:00
Sergio De la torre 5f5a0645be refs #5652 feat:itemTrash_new 2023-09-11 16:16:49 +02:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted 2023-09-06 21:22:10 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-06 14:02:53 +02:00
Sergio De la torre 8218eb2a6b refs #5652 feat:itemTrash_new 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 2023-09-06 09:18:28 +02:00
Javi Gallego f54a239229 fixes #6143 fixes: this.bankEntityFk no existe 2023-08-25 09:46:53 +02:00
Javi Gallego 4657bf4e43 refs #6143 refactor: ibanValidation with countryCode param 2023-08-22 14:58:26 +02:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk 2023-08-22 10:45:41 +02:00
Carlos Satorres 8807b9f87f fix upper 2023-08-10 09:58:48 +02:00
Carlos Satorres 5653a39e3b fix fixtures names, socialnames streets 2023-08-09 13:10:05 +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
Vicent Llopis 1215b8cd57 Merge branch 'dev' into 5849-makeInvoice_solved 2023-07-20 08:15:57 +00:00
Alex Moreno 5771ccb488 Merge branch 'dev' into 5934-clientSms 2023-07-20 06:50:56 +00:00
Alex Moreno aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance 2023-07-20 06:40:23 +00:00
Alex Moreno 60e75d7825 refs #5837 fix client condition 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 2023-07-20 07:22:30 +02:00
Vicent Llopis 6df1ef9d4c Merge branch 'dev' into 5934-clientSms 2023-07-20 05:16:54 +00:00
Vicent Llopis ab95ef74a9 refs #5934 refactor: nombres variables 2023-07-20 07:17:35 +02:00
Vicent Llopis d3165fcdc7 refs #5849 fix: tback 2023-07-18 14:25:53 +02:00
Vicent Llopis 7bd378e9dd refs # 2023-07-18 14:15:56 +02:00
Vicent Llopis 3e8775149a refs #5934 feat: change icon 2023-07-18 13:02:42 +02:00
Vicent Llopis b3a7a170f0 refs #5934 feat: añadido clientSms log 2023-07-18 11:54:43 +02:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix 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 93387cae62 refs #5837 if isSocialNameUnique 2023-07-14 13:07:40 +02:00
Carlos Satorres 765c22df96 refs #5837 new table 2023-07-14 11:30:13 +02:00
Carlos Satorres 6d8b3e346d refs #5837 fix filter existingClient France 2023-07-14 09:40:16 +02:00
Alex Moreno 4632ed298d Merge branch 'master' into 5999-defaultCountry 2023-07-13 11:41:40 +00:00
Carlos Satorres 2627cafc22 refs #5999 defaulter country autocomplete 2023-07-13 10:54:22 +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 93e70e699a refs #5874 feat: refactorizado proceso facturación 2023-07-11 09:19: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 c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-29 14:50:06 +02:00
Vicent Llopis 87c233d221 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management 2023-06-27 10:33:15 +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 e32a29fc09 refs #5900 Remove duplicated logs 2023-06-25 19:08:13 +02:00
Juan Ferrer 44192c0606 refs #5667 Client translations added 2023-06-21 11:08:28 +02:00
Alex Moreno 092471f74e refs #5475 feat(account_changePassword): accessScope and backTest 2023-06-19 15:06:06 +02:00
Juan Ferrer 1c666cd48e refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm 2023-06-15 13:10:44 +02:00
Alex Moreno 1c39ad873c resolve dev conflicts 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 2023-06-12 10:46:21 +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
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
Juan Ferrer 980ea67c24 Merge pull request 'test' (!1596) from test into dev
Reviewed-on: #1596
2023-06-07 21:02:22 +00:00
Vicent Llopis 0dbd3abd65 refs #5808 fix: corregido el condicional 2023-06-07 15:06:37 +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
Juan Ferrer fe32a2af05 refs #5667 RoleInherit & Sms: Translations added 2023-06-05 08:35:07 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-05 08:09:16 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options 2023-06-01 08:32:06 +02:00
Alex Moreno 0aed2c2c08 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-05-31 13:10:25 +02:00
Pablo Natek 382bc06075 refs #5153 2023-05-30 11:23:07 +02:00
Pablo Natek a232e9ecea refs #5153 2023-05-29 09:26:36 +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
Carlos Satorres 4f5bd95d21 refs #5639 order 2023-05-23 13:23:46 +02:00
Carlos Satorres e2bea16e68 refs #5639 select country, paymethod 2023-05-23 12:31:02 +02:00
Carlos Satorres 7fd2927ec9 refs #5639 smart-table country 2023-05-23 11:26:31 +02: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
Alex Moreno 6f06bac0c1 Merge branch 'dev' into 4797-worker-notification-selector 2023-05-23 05:55:08 +00:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
Reviewed-on: #1546
2023-05-22 17:04:32 +00: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 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl 2023-05-17 11:43:25 +00:00
Juan Ferrer 0d51987d47 refs #5667 Client sample translations 2023-05-17 12:41:25 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes 2023-05-17 10:18:41 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations 2023-05-16 20:06:14 +02:00
Pablo Natek 65082be077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr 2023-05-12 08:28:19 +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 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alex Moreno b2027fddf3 fix(client): use account setPassword 2023-05-03 14:56:14 +02:00
Alexandre Riera 4c0ec6faf5 changedModel sms 2023-05-02 14:26:47 +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