wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
7,174 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

5656 Commits

Author SHA1 Message Date
Alex Moreno 6bd2835c59 chore: refs #7155 typo 2024-09-25 13:18:26 +02:00
Alex Moreno 9a11f94922 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2 2024-09-25 13:17:34 +02:00
Alex Moreno 8dd2c44832 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-25 12:53:12 +02:00
Alex Moreno f04beb8f90 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-25 12:52:58 +02:00
Jorge Penadés aab428494e fix: refs #6898 add role 2024-09-25 12:40:22 +02:00
Pablo Natek cea5edd506 fix: refs #7129 translate 2024-09-25 12:33:19 +02:00
Jorge Penadés d2996f0838 fix: refs #6943 prevent null 2024-09-25 12:23:41 +02:00
Pablo Natek ca568c31ca fix: refs #7129 clone post 2024-09-25 11:51:51 +02:00
Javier Segarra 53d5d123c2 feat: i18n 2024-09-25 11:36:44 +02:00
Javier Segarra fb180f0198 fix: apply order 2024-09-25 11:31:05 +02:00
Javier Segarra 77ad96a58b fix: itemfixedPrice inputs 2024-09-25 11:30:18 +02:00
Pablo Natek 27b699ebf4 fix: refs #7129 some component styles 2024-09-25 11:16:27 +02:00
Javier Segarra 72ddeaa90a test: refs #8031 e2e 2024-09-25 10:53:38 +02:00
Jorge Penadés b54d358617 fix: refs #7207 use right locale 2024-09-25 09:14:35 +02:00
Javier Segarra 8c7ee3024f Merge branch 'dev' into 8031_notify_dataSaved 2024-09-25 09:12:17 +02:00
Jorge Penadés dc6acfadb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-09-25 08:51:21 +02:00
Pablo Natek 1ee3691cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-25 08:26:27 +02:00
Jon Elias a14eb53f14 Merge branch 'dev' into 7884-AddLabelerField 2024-09-25 06:02:51 +00:00
Javier Segarra c1087614c6 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-25 05:50:22 +00:00
Jon Elias ff3ab83727 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-25 05:25:07 +00:00
Javier Segarra 2a64d9643e Merge branch 'dev' into vnInput_autoFocus 2024-09-24 20:16:56 +00:00
Jorge Penadés 86a82c5aad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-09-24 14:39:18 +02:00
Alex Moreno d35b40a891 fix: vnTable color 2024-09-24 14:07:04 +02:00
Alex Moreno 991ad21c77 fix: refs #7155 remove userParams in watcher 2024-09-24 13:16:34 +02:00
Pablo Natek f0c2baa60e fix: refs #7129 remove consoleLog 2024-09-24 12:56:14 +02:00
Pablo Natek 70d640dc37 fix: refs #7129 some style issues 2024-09-24 12:54:34 +02:00
Alex Moreno e555bd4cde Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward 2024-09-24 12:21:31 +02:00
Jon Elias 8315eb2b4c Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 09:37:17 +00:00
Alex Moreno 3d34d9c6bb chore: refs #7155 remove console.log 2024-09-24 10:54:17 +02:00
Jon Elias 8ac0083b9c Merge branch 'dev' into 7884-AddLabelerField 2024-09-24 08:44:15 +00:00
Jon Elias 21f7613f21 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 08:36:57 +00:00
Jon Elias f34e81038e Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-24 10:36:02 +02:00
Jon Elias cd96003c0e refactor: refs #7553 requested changes and added keyup.enter 2024-09-24 10:35:59 +02:00
Jorge Penadés 3eb846b70c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-24 10:15:46 +02:00
Alex Moreno edb6e9ce61 feat(TravelList): add daysOnward 2024-09-24 09:57:05 +02:00
Javier Segarra 6e57306026 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-24 07:39:22 +00:00
Jorge Penadés 42e4493fb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-09-24 09:27:38 +02:00
Pablo Natek c400929c99 fix: refs #7129 translate page title 2024-09-24 08:33:16 +02:00
Alex Moreno b7ed63afc6 Merge branch 'dev' into 7404-fixFront 2024-09-24 06:18:42 +00:00
Alex Moreno 8760781660 fix: merge in dev 2024-09-24 08:15:44 +02:00
Alex Moreno 98a3b03be7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-24 07:48:58 +02:00
Alex Moreno 5fc306e11e Merge branch 'dev' into 6943_fix_customer_module 2024-09-24 05:38:47 +00:00
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Javier Segarra a5c6d628ca feat: enable notify positive when user update self data 2024-09-23 18:48:58 +00:00
Javier Segarra 55e017b0cc Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 18:39:09 +00:00
Javier Segarra 3ede256dc5 feat: change label because its more natural 2024-09-23 18:30:14 +00:00
Jorge Penadés 2cb9899de1 feat: refs #7207 show queue 2024-09-23 15:38:54 +02:00
Javier Segarra b4b31c0c92 fix: enable autofocus 2024-09-23 15:21:07 +02:00
Javier Segarra e9e2caee85 feat: autofocus after clear 2024-09-23 13:18:14 +00:00
Javier Segarra 27a3e36b58 fix: comments 2024-09-23 14:56:34 +02:00
Javier Segarra ab0c38810a fix: Options VnSelect properties 2024-09-23 12:44:37 +00:00
Javier Segarra caddcf45c3 fix: Options VnSelect properties 2024-09-23 12:43:52 +00:00
Javier Segarra 5803af7a74 Merge branch 'dev' into 6943_fix_customer_module 2024-09-23 12:24:01 +00:00
Javier Segarra ac8aa6bcc1 fix: table order 2024-09-23 14:21:41 +02:00
Jon Elias b728b7c5bd Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-23 13:51:22 +02:00
Jon Elias 3716507f93 perf: refs #7553 removeSales function 2024-09-23 13:51:20 +02:00
Javier Segarra 0829b6d0d2 fix: i18n en preparation label 2024-09-23 11:42:47 +00:00
Pablo Natek b04564d5a8 fix: refs #7404 style non center pop up 2024-09-23 13:23:25 +02:00
Pablo Natek e700f6f4a8 feat: refs #7404 style dynamic text color 2024-09-23 13:14:25 +02:00
Jorge Penadés f809e0fb31 fix: refs #7323 show prev month week color 2024-09-23 12:55:39 +02:00
Javier Segarra 279a100f8b fix: i18n en preparation label 2024-09-23 10:25:44 +00:00
Javier Segarra a52cdf8f94 fix: i18n en preparation label 2024-09-23 10:25:11 +00:00
Robert Ferrús 5ebbb1cf73 feat: refs #8000 fix 2024-09-23 12:24:19 +02:00
Robert Ferrús 1ae20202cc feat: refs #8000 add column into zoneBasicData 2024-09-23 11:56:20 +02:00
Javier Segarra 7713e33c67 Merge branch 'dev' into 8018_location_label 2024-09-23 09:48:19 +00:00
Javier Segarra 013a76cbce test: VnLocation 2024-09-23 11:48:00 +02:00
Jorge Penadés 7bbad14f53 feat: refs #7323 delete btn 2024-09-23 11:38:27 +02:00
Javier Segarra 66cb069109 perf: CustomerBalance 2024-09-23 11:06:08 +02:00
Javier Segarra 88fd40eae6 feat: minor changes 2024-09-23 11:05:58 +02:00
Jon Elias 0dd79ed708 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 08:22:21 +00:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes 2024-09-23 10:21:30 +02:00
Pablo Natek 17bb144bce fix: refs #7404 translates and some minor style fixes 2024-09-23 10:04:45 +02:00
Javier Segarra 8bbea9c903 feat: change order 2024-09-23 09:47:54 +02:00
Jorge Penadés 37545b4cab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-23 09:29:26 +02:00
Jon Elias 4c071aea8b Merge branch 'dev' into 7884-AddLabelerField 2024-09-23 06:51:07 +00:00
Javier Segarra 2a97f35dd9 Merge branch 'dev' into 6943_fix_customer_module 2024-09-21 01:32:45 +02:00
Javier Segarra d81d562edf feat: goToSupplier 2024-09-21 01:30:37 +02:00
Javier Segarra f5c50e842e Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module 2024-09-21 01:22:30 +02:00
Javier Segarra f84444d894 feat: add tooltip CustomerNewCustomAgent 2024-09-21 01:22:25 +02:00
Jorge Penadés 6cc8ca6731 chore: refs #7702 add tests 2024-09-20 17:38:02 +02:00
Jorge Penadés fc23f9a8dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-09-20 16:22:48 +02:00
Jorge Penadés df56eefe2f fix: refs #7353 fine tunning ui 2024-09-20 15:46:54 +02:00
Jon Elias edea17340d refactor: refs #7553 adjust ticket notes view in summary 2024-09-20 14:33:59 +02:00
Carlos Satorres 716d018121 refs #72983 fix filters 2024-09-20 14:20:26 +02:00
Jorge Penadés deff8a1cf4 feat: hide menus on small view 2024-09-20 13:58:26 +02:00
Javier Segarra ddf42d9659 feat: update VnLocation instances 2024-09-20 13:46:07 +02:00
Javier Segarra b822c7722b feat: formatLocation when field is null 2024-09-20 13:45:43 +02:00
Jorge Penadés 6216eedd88 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixUI 2024-09-20 13:22:30 +02:00
Jorge Penadés 7a253d314c chore: refs #7353 drop useless code 2024-09-20 13:22:15 +02:00
Jorge Penadés 3e101242f6 chore: refs #7353 drop useless code 2024-09-20 13:20:40 +02:00
Jorge Penadés 87efc2f355 fix: refs #7353 responsive filters 2024-09-20 13:00:34 +02:00
Jorge Penadés e1f3589110 fix: refs #7353 horizontal scroll 2024-09-20 12:17:10 +02:00
Javier Segarra 271e33a999 feat: formatLocation when field is null 2024-09-20 11:57:15 +02:00
Jorge Penadés ac6d98cd36 fix: refs #7353 horizontal scroll 2024-09-20 11:22:51 +02:00
Jorge Penadés b2cc74d890 fix: refs #7524 use id 2024-09-20 10:27:24 +02:00
Jon Elias d7fb8bdaf5 Merge branch 'dev' into 7884-AddLabelerField 2024-09-20 08:24:39 +00:00
Jorge Penadés 075c129036 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-tooManyRecords 2024-09-20 10:05:44 +02:00
Jorge Penadés 3b709c20cf fix: refs #7524 use id 2024-09-20 10:05:28 +02:00
Jorge Penadés 2537e58ff3 fix: refs #7524 dynamic fetch 2024-09-20 09:56:04 +02:00
Carlos Satorres 681c72a3d0 Merge branch 'master' into 6898-fixSupplier2 2024-09-20 07:31:21 +00:00
Carlos Satorres 45b5433206 refs #6898 fix filter 2024-09-20 09:14:11 +02:00
Jon Elias 2c15f79a2d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-20 09:08:13 +02:00
Jon Elias 44d98865fe fix: refs #7553 requested changes 2024-09-20 09:04:31 +02:00
Javier Segarra 650e801433 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 11:10:28 +00:00
Alex Moreno 1150739de7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-19 12:59:51 +02:00
Alex Moreno 4f442a1f5a Merge branch 'dev' into fix_global_handler 2024-09-19 10:54:45 +00:00
Javier Segarra 8e96265106 fix: CustomerFilter 2024-09-19 12:51:49 +02:00
Jon Elias c0dab66a24 Merge branch 'dev' into FixWagonRedirect 2024-09-19 10:08:18 +00:00
Javier Segarra 88e2ea48c2 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 10:07:46 +00:00
Javier Segarra 8b379faa52 perf: imrpove exprBuilder 2024-09-19 12:06:00 +02:00
Jon Elias 8fa11263e8 fix: fix wagon list reload 2024-09-19 12:05:08 +02:00
Javier Segarra 35e89591ff Merge branch 'dev' into fix_VnTable_infiniteScroll 2024-09-19 08:25:49 +00:00
Javier Segarra 46dbab4757 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 09:35:34 +02:00
Javier Segarra 1425ec268c Merge branch 'dev' into highlight_today_qDate 2024-09-19 07:31:37 +00:00
Jorge Penadés 2e8397a34b feat: refs #7323 use scopes 2024-09-19 09:26:54 +02:00
Javier Segarra c21133ebd4 Merge branch 'dev' into 6943_fix_customer_module 2024-09-19 01:10:23 +02:00
Javier Segarra ccfe61d777 feat: vnSelect exprBuilder 2024-09-19 01:10:14 +02:00
Javier Segarra 1550d79160 feat: add shortcut more buttons 2024-09-19 00:10:28 +02:00
Javier Segarra 08bec59a37 add_circle 2024-09-19 00:04:58 +02:00
Javier Segarra 1cb2981f97 feat: apply color when today 2024-09-18 16:26:56 +00:00
Javi Gallego b3f27d9a84 feat: translations fixed 2024-09-18 17:51:49 +02:00
Javier Segarra 3de08826ac Merge branch 'dev' into fix_VnTable_infiniteScroll 2024-09-18 15:41:35 +00:00
Alex Moreno 5ca38ca825 feat: global handler 2024-09-18 14:48:15 +02:00
Javier Segarra b59e7174df Merge branch 'fix_VnTable_infiniteScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_VnTable_infiniteScroll 2024-09-18 14:30:53 +02:00
Alex Moreno 7b70734eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-18 14:29:29 +02:00
Javier Segarra d76250f56f fix: reset VnTable scroll properties 2024-09-18 12:27:48 +00:00
Javier Segarra 98411d3c29 Merge branch 'dev' into add_shortcut_add_subSections 2024-09-18 12:25:23 +00:00
Carlos Satorres 364ce63545 Merge branch 'dev' into 7155-scopeDays 2024-09-18 12:01:43 +00:00
Jon Elias 9db12a8dee fix: wagon reload 2024-09-18 13:46:37 +02:00
Carlos Satorres fc26fa12be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-18 13:34:14 +02:00
Javier Segarra 37329a7391 feat: add shortcut add event in some subSections 2024-09-18 13:30:51 +02:00
Alex Moreno f86525e31d fix: not null variable 2024-09-18 13:24:21 +02:00
Alex Moreno 3906fc386f hotFix: supplierDescriptor not use same data-key 2024-09-18 12:49:45 +02:00
Jon Elias 34f70d026e feat: refs #7553 added new field in list and translations 2024-09-18 11:50:00 +02:00
Alex Moreno 8abd375985 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk 2024-09-18 10:14:54 +02:00
Alex Moreno 21a7fafba5 feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData 2024-09-18 09:57:21 +02:00
Jorge Penadés 5625ef4ce1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-18 09:41:26 +02:00
Javier Segarra aa6dac3944 fix: SupplierFiscalData VnLocation 2024-09-18 07:28:10 +00:00
Jon Elias 07cd9d5aae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-18 08:42:59 +02:00
Jon Elias 98faf22e73 Merge branch 'dev' into 7884-AddLabelerField 2024-09-18 06:24:07 +00:00
Alex Moreno f1759eca04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk 2024-09-18 08:23:25 +02:00
Jon Elias 3a95cf123e Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-09-18 08:23:18 +02:00
Jon Elias 566d657f70 feat: refs #7884 added default params and chip translations 2024-09-18 08:23:15 +02:00
Alex Moreno fb1a94604b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-18 08:20:45 +02:00
Jorge Penadés 41c43fde76 feat: refs #7323 hide log section 2024-09-17 16:08:48 +02:00
Jorge Penadés 84cf3bea95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-17 16:02:15 +02:00
Carlos Satorres 4f662375cd fix(VnTable): sanitizer value is defined 2024-09-17 15:04:58 +02:00
Carlos Satorres db783e1538 refs #7283 item Descriptor 2024-09-17 15:03:30 +02:00
Carlos Satorres ae97e32826 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-17 14:55:48 +02:00
Javier Segarra c7bef79c0a perf: improve 2024-09-17 13:48:17 +02:00
Pablo Natek cead2c2b5e Merge branch 'dev' into 7404-stockBought 2024-09-17 11:40:42 +00:00
Pablo Natek e559ab43d7 fix: refs #7404 remove some style 2024-09-17 13:40:27 +02:00
Jorge Penadés 47de2caed7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-17 13:26:48 +02:00
Jorge Penadés eb6f12ae3b fix: refs #7353 rollback 2024-09-17 12:58:06 +02:00
Jorge Penadés ed4a4e1e59 fix: refs #7353 rollback 2024-09-17 12:57:43 +02:00
Jorge Penadés 2cb2ce16ef fix: refs #7353 locale 2024-09-17 12:56:50 +02:00
Jorge Penadés 3f03f0d4e9 fix: refs #7353 show unremovable params 2024-09-17 12:41:57 +02:00
Javier Segarra 29e4c723c9 Merge branch 'dev' into 6943_fix_customer_module 2024-09-17 12:12:41 +02:00
Jorge Penadés 4edcff41f1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixFilter 2024-09-17 11:39:07 +02:00
Jorge Penadés 56f8cbe615 fix: refs #7353 sales person filter and locale 2024-09-17 11:37:44 +02:00
Carlos Satorres 8c91cb42f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-17 11:11:57 +02:00
Jon Elias 58cd0b54cf Merge branch 'dev' into 6346-WagonTypeToCard 2024-09-17 09:08:00 +00:00
Carlos Satorres 044156356c hotfix searchbar 2024-09-17 10:37:22 +02:00
Alex Moreno 3d1bb0c67a fix(itemDescriptor): fix redirection to itemDiary 2024-09-17 10:20:44 +02:00
Pablo Natek 7faa0c240f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-17 10:10:40 +02:00
Javier Segarra e4adbfa9f7 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-17 07:29:00 +00:00
Alex Moreno 37b6a03288 fix(itemDescriptor): fix redirection to itemDiary 2024-09-17 09:25:53 +02:00
Jon Elias 6edabd856c Merge branch 'dev' into 7884-AddLabelerField 2024-09-17 06:32:27 +00:00
Jon Elias 479f2a8e53 feat: refs #7884 added new filter field 2024-09-17 08:31:02 +02:00
Jorge Penadés da7d0326c0 fix: refs #7323 workerBalance & arrayData setUserParams 2024-09-16 17:12:48 +02:00
Jorge Penadés 1ff15da8ca fix: refs #7323 workerList 2024-09-16 16:33:09 +02:00
Carlos Satorres 1916c6e4bf refs #7283 itemFilters 2024-09-16 14:29:39 +02:00
Alex Moreno b4cee6b02f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 14:24:22 +02:00
Javier Segarra 603fb1de71 Merge branch 'dev' into 7017_formModel_validations 2024-09-16 11:58:15 +00:00
Javier Segarra cf95cd7db7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module 2024-09-16 13:33:28 +02:00
Javier Segarra 6ffd985575 perf: CustomerBasicData.salesPersonFk 2024-09-16 13:33:07 +02:00
Jon Elias cb87f4dce1 Merge branch 'dev' into 6346-WagonTypeToCard 2024-09-16 11:04:29 +00:00
Jon Elias ae76bd0b0e refactor: refs #6346 wagons to VnTable 2024-09-16 12:58:06 +02:00
Javier Segarra eb8690a422 fix: remove promise execution 2024-09-16 10:30:04 +00:00
Javier Segarra d384894bf0 fix: rule 2024-09-16 10:29:36 +00:00
Jorge Penadés 8577f33599 Merge branch 'dev' into 7828-makeCorrectCalls 2024-09-16 10:24:45 +00:00
Pablo Natek 263dc29d7a fix: refs #7404 remove console.log 2024-09-16 12:19:03 +02:00
Javier Segarra 27069e56b8 Merge branch 'dev' into 6943_fix_customer_module 2024-09-16 10:11:29 +00:00
Jorge Penadés 91dccd10d3 feat: refs #7702 drop old components 2024-09-16 10:39:39 +02:00
Jorge Penadés 9ec2fb4c77 feat: refs #7702 fine tunning 2024-09-16 10:36:56 +02:00
Alex Moreno 4c8238455f fix(ClaimList): fix summary 2024-09-16 10:03:12 +02:00
Carlos Satorres 70759b8a4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-16 09:28:51 +02:00
Alex Moreno 8c4e4a16af fix(VnSectionMain): add QPage 2024-09-16 09:19:08 +02:00
Jorge Penadés 153c9b743f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-09-16 09:01:20 +02:00
Pablo Natek c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-16 08:59:46 +02:00
Pablo Natek deb30ee955 feat: refs #7404 travel m3 form 2024-09-16 08:59:36 +02:00
Guillermo Bonet 07e45f2051 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 07:17:38 +02:00
Guillermo Bonet 57b939bdd5 Merge branch 'test' into dev 2024-09-16 07:17:25 +02:00
Guillermo Bonet b6ee1ac2bc Merge branch 'master' into test 2024-09-16 07:17:12 +02:00
Javier Segarra 93488a5750 fix: styles 2024-09-13 23:19:16 +02:00
Javier Segarra b6cce74449 fix: merge conflicts 2024-09-13 23:11:18 +02:00
Javier Segarra 401400bdcf fix: remove FetchData 2024-09-13 22:52:26 +02:00
Javier Segarra ed5ba1dd1a Merge branch 'dev' into 7017_formModel_validations 2024-09-13 22:50:13 +02:00
Javier Segarra 9c36a113e1 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-13 20:17:01 +00:00
Jorge Penadés 98cdeabe9f feat: refs #7702 vnChangePassword 2024-09-13 18:15:28 +02:00
Javier Segarra 6e6af0af80 perf: improve style 2024-09-13 15:16:40 +02:00
Guillermo Bonet eca34e2c0f feat: refs #7644 Icon 2024-09-13 14:57:33 +02:00
Carlos Satorres 0fcc4fe232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-13 13:50:01 +02:00
Jon Elias 6f9e46f7a0 fix: refs #7553 deleted log 2024-09-13 13:01:07 +02:00
Carlos Satorres 842fb9de5f refs #7155 scopeDays fix 2024-09-13 12:52:25 +02:00
Jorge Penadés 4bf8e1224d chore: refs #7702 rollback 2024-09-13 12:28:07 +02:00
Jorge Penadés e90b78c4c5 fix: refs #7702 rollback 2024-09-13 12:27:37 +02:00
Jorge Penadés 6983245d7d Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-09-13 12:26:15 +02:00
Jon Elias c291ea267c refactor: refs #7553 added clickable event in transfer sales like Salix 2024-09-13 12:07:45 +02:00
Jorge Penadés 48a5c15b9d feat: refs #7828 create axios instance which no manage errors 2024-09-13 10:54:09 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Javier Segarra a5ea940dd8 fix: Customer module find salesPersons out of first get 2024-09-13 09:23:15 +02:00
Jorge Penadés 46fb7d0c73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-13 09:20:14 +02:00
Jorge Penadés dcde6a1b9d Merge branch 'test' into 7353-warmfix-fixSearchbar 2024-09-13 07:19:42 +00:00
Jon Elias 4a0b92eded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-13 09:05:26 +02:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-13 08:57:27 +02:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-13 08:57:14 +02:00
Carlos Satorres 8be1833f9e refs #7155 scopeDays 2024-09-13 08:49:36 +02:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Jon Elias eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-13 06:10:34 +00:00
Javier Segarra b36f072b24 Merge branch 'dev' into 6943_fix_customer_module 2024-09-12 21:26:43 +02:00
Javier Segarra aca13d9119 fix: CustomerBillingData 2024-09-12 21:26:28 +02:00
Javier Segarra fa408dc226 fix: CustomerAddress mobile 2024-09-12 21:20:30 +02:00
Javier Segarra 6e784bb290 fix: address-create i18n 2024-09-12 21:11:51 +02:00
Javier Segarra 54fc7f6394 fix: CustomerRecovery transalate label 2024-09-12 21:10:06 +02:00
Javier Segarra 39f2deafc4 fix: CustomerCreditOpinion workerDescriptor 2024-09-12 21:08:41 +02:00
Javier Segarra 70d0132710 fix: CustomerWebPayment 2024-09-12 21:03:19 +02:00
Javier Segarra 24f4af712e fix: CustomerMandates 2024-09-12 20:59:35 +02:00
Javier Segarra 8fc7e3cfb4 fix: CustomerSamples 2024-09-12 20:43:50 +02:00
Javier Segarra a29ee42b9e fix: CustomerBasicData show id assigned 2024-09-12 20:41:50 +02:00
Jorge Penadés 6adcaff5d8 fix: refs #7524 dynamic load 2024-09-12 16:48:39 +02:00
Alex Moreno dcb8c5daad fix: workerDms filter workerFk 2024-09-12 13:27:28 +02:00
Jon Elias bb1eb30a25 fix: refs #7553 changed fields in order in purchase request table 2024-09-12 13:22:53 +02:00
Javier Segarra cfdfc7f531 fix: CustomerSamples 2024-09-12 13:19:37 +02:00
Jorge Penadés 44fd356d63 feat: refs #7828 useAcl & cherry pick mail data worker 2024-09-12 13:19:31 +02:00
Jon Elias b4c46dc153 refactor: refs #7553 modified ticketSummary QChips, deleted useless code 2024-09-12 13:13:56 +02:00
Jorge Penadés adb9cac360 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-12 13:11:11 +02:00
Jon Elias b8f6bc26ad Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:34:55 +02:00
Jon Elias d00a88a3f4 refactor: refs #7500 deleted useless code 2024-09-12 12:34:54 +02:00
Jon Elias be389c6736 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-12 10:32:47 +00:00
Jon Elias 35247007f0 Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:31:03 +02:00
Jon Elias e5056c45c0 fix: refs #7500 fixed showing images wrongly 2024-09-12 12:31:00 +02:00
Javier Segarra 058039fd61 Merge branch 'dev' into 5938_filterGrouped 2024-09-12 10:27:36 +00:00
Javier Segarra a3afe790b9 fix: CustomerGreuges 2024-09-12 12:00:07 +02:00
Javier Segarra c22f8f1069 fix: stop call back event hasMoreData 2024-09-12 09:57:31 +00:00
Javier Segarra c7adb91912 feat: use disableInifiniteScroll property 2024-09-12 09:56:37 +00:00
Carlos Satorres 050d8ae208 refs #7283 fix items error get images 2024-09-12 11:43:37 +02:00
Carlos Satorres 68a2ac385f refs #7283 fix items images 2024-09-12 11:36:02 +02:00
Javier Segarra 3892df250c fix: #5938 grouped filter 2024-09-12 08:53:46 +00:00
Jon Elias 4a1f5e922c refactor: refs #7553 align ticket sale qdrawer fields 2024-09-12 10:19:21 +02:00
Jon Elias 6a5f31ff1e fix: refs #7553 fixed conflicts 2024-09-12 10:14:38 +02:00
Javier Segarra 9941975683 fix: infiniteScroll 2024-09-12 08:07:53 +00:00
Alex Moreno 368e013f54 Merge branch 'master' into hotFix_claimList_attenderFk 2024-09-12 07:59:16 +00:00
Jorge Penadés 1dffa8865e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-12 09:55:30 +02:00
Jorge Penadés 59f6913a74 fix: refs #7323 add correct label 2024-09-12 09:43:08 +02:00
Jorge Penadés d92659289b fix: refs #7323 add correct label 2024-09-12 09:41:29 +02:00
Jorge Penadés 22bc8f2414 fix: refs #7323 show user name 2024-09-12 09:33:06 +02:00
Carlos Satorres 039a8d1d02 refs #7283 fix items 2024-09-12 09:32:41 +02:00
Alex Moreno 9d055a48c4 Merge branch 'dev' into 7792-accountBasicData_twoFactorFk 2024-09-12 07:29:47 +00:00
Jorge Penadés 6b79d70551 refactor: refs #7828 wip 2024-09-12 09:14:55 +02:00
Alex Moreno d822bb6f20 fix(ClaimList): attenderFk filter 2024-09-12 09:12:36 +02:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Alex Moreno 4a234dd875 fix: duplicate code 2024-09-12 08:31:57 +02:00
Alex Moreno 8bf7b729d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-12 08:26:10 +02:00
Alex Moreno 8d04d50a13 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-12 08:26:01 +02:00
Carlos Satorres b66e66eb0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-12 07:44:35 +02:00
Carlos Satorres 04c8481b51 refs #7283 fix itemFixed 2024-09-12 07:43:12 +02:00
Carlos Satorres 04070a5a85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-12 07:42:55 +02:00
Jon Elias 18fc5e241c fix: refs #7903 fixed ticket's search bar and keybinding tooltip 2024-09-11 14:07:31 +02:00
Javier Segarra 8d96539b24 perf: solve reload CardSummary component 2024-09-11 13:18:54 +02:00
Javier Segarra c3108b4335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-11 12:48:38 +02:00
Javier Segarra f02ca7437c Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-11 10:27:12 +00:00
Jorge Penadés 9219fa07f5 fix: refs #7353 hide search param 2024-09-11 11:23:14 +02:00
Jon Elias 422907447b refactor: refs #7553 merge conflicts 2024-09-11 10:27:08 +02:00
Jon Elias d1138529b2 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-11 10:26:52 +02:00
Carlos Satorres 1c9e13fe15 refs #7962 fix claimSummary 2024-09-11 10:23:27 +02:00
Jorge Penadés b559f2f18c refactor: refs #7353 use global locales 2024-09-11 10:18:11 +02:00
Jon Elias ff7bcfb00a refactor: refs #7553 modified ticket sale to create a row in the table 2024-09-11 10:16:42 +02:00
Jorge Penadés 2b012d2de4 fix: refs #7353 use same datakey 2024-09-11 10:04:40 +02:00
Jorge Penadés 2d5602e784 Merge branch 'dev' into 7663-setWeight 2024-09-11 07:40:36 +00:00
Alex Moreno e2d3154878 fix(ClaimLines): not reload when change quantity 2024-09-11 09:21:30 +02:00
Javier Segarra 2d8322c6da fix: remove FIXME 2024-09-11 09:20:54 +02:00
Jorge Penadés 49f90801a8 Merge branch 'test' into 6772-warmfix-fixE2e 2024-09-11 07:09:46 +00:00
Javier Segarra 19eb770893 feat: remove cli warnings 2024-09-11 08:41:16 +02:00
Alex Moreno 97da106522 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:33:25 +02:00
Alex Moreno e7fb6a7963 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:32:59 +02:00
Javier Segarra b2535dedcf Merge branch 'dev' into 5938_fine_ticketAdvance 2024-09-11 06:29:27 +00:00
Pablo Natek c7e717c611 feat: refs #7404 add travel m3 to reserves form 2024-09-11 07:55:12 +02:00
Javier Segarra b5dcc865e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-10 15:17:25 +02:00
Javier Segarra 622afca9be feat: CustomerSample to VnTable 2024-09-10 15:17:10 +02:00
Jorge Penadés a41143b410 chore: refs #6772 fix e2e 2024-09-10 14:43:35 +02:00
Jorge Penadés 77f2a4d825 fix: refs #6900 rollback 2024-09-10 14:36:44 +02:00
Jorge Penadés 070c9ca25f fix: refs #6900 e2e error 2024-09-10 14:17:59 +02:00
Carlos Satorres 7b2545798c fix(account_privileges): fix url update 2024-09-10 12:38:09 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Javier Segarra 113ebd23a6 Merge branch 'dev' into 5938_fine_ticketAdvance 2024-09-10 09:49:23 +00:00
Jon Elias e7a89138ba fix: refs #7553 fix conflicts 2024-09-10 11:47:38 +02:00
Carlos Satorres 8c57bca4e0 hotfix cau #218919 accountPrivileges fix 2024-09-10 10:36:41 +02:00
Jorge Penadés 5cc1d0cec4 chore: refs #7663 drop useless code 2024-09-10 10:04:40 +02:00
Jorge Penadés f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-10 09:41:34 +02:00
Jorge Penadés 3fafb15eb8 refactor: refs #4074 use fn 2024-09-10 09:18:57 +02:00
Jorge Penadés f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-10 08:59:01 +02:00
Jon Elias b4fb9ceb2e Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:29:51 +00:00
Jon Elias abc39633bf Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-10 08:28:49 +02:00
Jon Elias 30ffb2428e perf: refs #6346 previous changes 2024-09-10 08:28:48 +02:00
Alex Moreno 3164209bef Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-10 08:13:56 +02:00
Jon Elias 6790067a89 Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:02:18 +00:00
Jon Elias e1adb1a8dd refactor: refs #6346 requested changes 2024-09-10 08:01:28 +02:00
Javier Segarra d347a81d74 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-10 05:19:02 +00:00
Jon Elias 4786a0e277 Merge branch 'dev' into 7889-KeyShortcuts 2024-09-10 04:45:24 +00:00
Javier Segarra 7e74123459 Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-10 00:18:12 +02:00
Javier Segarra d734674eb6 fix: minor changes 2024-09-10 00:18:09 +02:00
Javier Segarra b4b65ad0fd fix: minor error whit dates 2024-09-10 00:17:59 +02:00
Javier Segarra 41939315be style: show subName value 2024-09-10 00:17:39 +02:00
Javier Segarra 9c86fd0ed5 perf: order by 2024-09-10 00:17:13 +02:00
Javier Segarra 7358dab1d0 fix: call upsert when crudModel haschanges 2024-09-10 00:16:01 +02:00
Jorge Penadés f3471fe5ab fix: refs #4074 await to watch 2024-09-09 17:20:16 +02:00
Jorge Penadés f8cbb0a762 chore: refs #4074 fix tests 2024-09-09 17:10:35 +02:00
Jorge Penadés 26c7dfde35 chore: refs #4074 fix tests 2024-09-09 16:44:43 +02:00
Javier Segarra 67b2cd3a0b feat: stateGroupedFilter 2024-09-09 14:58:26 +02:00
Javier Segarra b3f305a3fd Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-09 12:17:59 +00:00
Jorge Penadés ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-09 13:59:13 +02:00
Jon Elias 6248a4117d refactor: refs #7553 requested changes 2024-09-09 13:52:41 +02:00
Jorge Penadés ac421344d0 fix: refs #7909 add originFk 2024-09-09 13:41:04 +02:00
Jorge Penadés 803c02b80d fix: refs #7909 rollback scroll 2024-09-09 13:38:27 +02:00
Javi Gallego 7c22a5d0ac feat: fix refund parameters 2024-09-09 13:18:51 +02:00
Javier Segarra 52d8ff8ae2 fix: isFullMovable checkbox 2024-09-09 13:15:45 +02:00
Javier Segarra 7bc288ad71 fix: state cell 2024-09-09 13:15:37 +02:00
Jorge Penadés 5ce3ef8bea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll 2024-09-09 13:03:39 +02:00
Jorge Penadés 381b236a18 refactor: refs #4074 use acl & drop useless roles 2024-09-09 12:56:37 +02:00
Alex Moreno 070f0da757 Merge branch 'dev' into 7547-accessToken-security 2024-09-09 10:55:22 +00:00
Javier Segarra 83d3246377 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 10:48:44 +00:00
Carlos Satorres 15a764d1cf refs #7283 fix 2024-09-09 12:35:47 +02:00
Jorge Penadés 6438f36eca refactor: refs #4074 accept array 2024-09-09 12:28:14 +02:00
Javier Segarra 2667d3afae feat: show preparation field 2024-09-09 12:07:22 +02:00
Carlos Satorres 6c78fb1bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-09 12:06:01 +02:00
Carlos Satorres 3004d77d34 refs #7283 fix ItemDescriptor warehouse 2024-09-09 12:05:08 +02:00
Jorge Penadés 803ce3b909 refactor: refs #4074 rollback 2024-09-09 11:53:59 +02:00
Jorge Penadés c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router 2024-09-09 11:35:49 +02:00
Jon Elias f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:44 +02:00
Jorge Penadés bef9b05b45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-09 10:03:51 +02:00
Jon Elias 5f546a47bf Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-09 08:02:17 +00:00
Alex Moreno 684215fc46 feat(AccountBasicData): add twoFactorFk 2024-09-09 09:59:22 +02:00
Jon Elias 6a96b252b4 Merge branch 'dev' into 7889-KeyShortcuts 2024-09-09 07:47:40 +00:00
Jon Elias 0b961050a0 refactor: refs #7553 rollback ticket advance due to slot problems 2024-09-09 08:14:53 +02:00
Jon Elias 94ae74ca7f Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-09 08:10:06 +02:00
Jon Elias 4630496361 refactor: refs #7553 changed fields in ticket component & ticket filter 2024-09-09 08:10:05 +02:00
Jon Elias 459551b16e Merge branch 'dev' into 7889-KeyShortcuts 2024-09-09 05:30:14 +00:00
Jon Elias b61e2a5c28 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-09 05:27:53 +00:00
Javier Segarra 53e6c67ff9 perf: minor clean code 2024-09-08 12:56:40 +02:00
Pablo Natek e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-08 07:54:26 +02:00
Javier Segarra 754f047943 perf: order components 2024-09-07 21:55:08 +02:00
Javier Segarra 0c1cd47d38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-07 16:38:06 +02:00
Jorge Penadés 18c952c0fc refactor: refs #7323 drop useless code 2024-09-06 17:51:13 +02:00
Jorge Penadés b87e7ce750 refactor: refs #4074 use VnTitle 2024-09-06 17:01:23 +02:00
Jorge Penadés d0131dd552 fix: refs #4074 drop wrong acl 2024-09-06 15:52:06 +02:00
Jorge Penadés 3693ba0c99 feat: refs #4074 drop useless code 2024-09-06 15:37:33 +02:00
Carlos Satorres 27f25f611f refs #7283 fix ItemDescriptor warehouse 2024-09-06 14:57:10 +02:00
Javier Segarra 3276548f88 fix: editTableOptions 2024-09-06 14:47:29 +02:00
Javier Segarra 31b8088b5f perf: improve ItemFixedPricefilterPanel 2024-09-06 14:41:38 +02:00
Jorge Penadés 86e1396da4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 14:23:04 +02:00
Javier Segarra a8057b47dc feat: updates 2024-09-06 14:06:30 +02:00
Jon Elias 4636e2f2e6 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-06 12:05:07 +00:00
Jorge Penadés 635cc94652 Merge branch 'dev' into 7323-fetchFromScope 2024-09-06 12:01:24 +00:00
Jon Elias 04f4521a59 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-06 12:00:41 +00:00
Jon Elias 0e5607d685 feat: refs #7553 ticket component to vntable and fixed minor errors 2024-09-06 13:59:50 +02:00
Carlos Satorres dc39dd5a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-06 13:26:34 +02:00
Jorge Penadés 34a9b4d4d0 Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 13:23:02 +02:00
Javier Segarra 9bb298bbeb feat: handle create row 2024-09-06 13:14:46 +02:00
Jorge Penadés 2f7dd3c22e feat: refs #7847 remove reload fn 2024-09-06 12:49:33 +02:00
Jorge Penadés 64752bbace feat: refs #7847 remove reload btn 2024-09-06 12:44:20 +02:00
Jorge Penadés b13874e8a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-06 11:30:24 +02:00
Javier Segarra e592a76946 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-06 10:42:07 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu 2024-09-06 10:30:32 +02:00
Jon Elias 5d78f564dd refactor: refs #7889 deleted subtitle attr and use keyBinding instead 2024-09-06 10:00:07 +02:00
Jorge Penadés 5d91b03f9a fix: dynamic fetch 2024-09-06 09:27:55 +02:00
Jon Elias 585919a4d9 feat: refs #7889 added shortcuts to modules 2024-09-06 09:19:38 +02:00
Jorge Penadés f0351b0417 chore: refs #7323 worker changes 2024-09-06 09:05:29 +02:00
Carlos Satorres d6d5039f48 Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-06 07:50:42 +02:00
Carlos Satorres 6db1c8f083 fix traduction 2024-09-06 07:50:39 +02:00
Pablo Natek cd12343302 feat: refs #7404 add some style to the form and reorganize fields 2024-09-06 07:26:04 +02:00
Jon Elias 8ff9dae1d8 refactor: refs #7553 requested changes 2024-09-06 07:16:03 +02:00
Jon Elias 102f7fb13e Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-06 07:15:48 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog 2024-09-05 22:20:57 +02:00
Javier Segarra b3391ab522 perf: minor comments 2024-09-05 20:51:33 +02:00
Javier Segarra 31abd8b4c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-05 19:45:41 +02:00
Javier Segarra af91ca43e0 Merge branch 'dev' into 7283-fixItemDescriptor 2024-09-05 13:57:53 +00:00
Javier Segarra 6476a8307a perf: i18n 2024-09-05 15:08:59 +02:00
Javier Segarra 62cdc1d527 feat: CustomerCreateTicket 2024-09-05 14:56:50 +02:00
Jon Elias db6f4fd15a refactor: refs #7553 deleted logs 2024-09-05 14:32:22 +02:00
Jon Elias 6321ed4ee2 Merge branch 'dev' into plus_key_shortcut 2024-09-05 11:08:52 +00:00
Jon Elias b6e14c4e6a fix: refs #7911 fixed shortcut and related files 2024-09-05 13:08:02 +02:00
Carlos Satorres c8d6a67011 fix tootltip 2024-09-05 12:49:17 +02:00
Carlos Satorres d4da8fc69f fix branch 2024-09-05 12:48:31 +02:00
Carlos Satorres 99b65c564c fix branch 2024-09-05 12:41:21 +02:00
Carlos Satorres fc7cc86362 fix branch 2024-09-05 12:39:55 +02:00
Carlos Satorres 8fe6fad4a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-05 12:07:18 +02:00
Carlos Satorres 83969f1d57 fix traduction 2024-09-05 12:05:53 +02:00
Carlos Satorres 3999936ec1 Merge branch 'master' into 6943-fixCustomerSamples 2024-09-05 08:58:20 +00:00
Carlos Satorres 95b19b5cce refs #7283 refactor fix ItemDescriptor 2024-09-05 10:04:58 +02:00
Jon Elias 70806769ce feat: refs #7911 added shortcut to modules 2024-09-05 08:25:28 +02:00
Jon Elias 96cdb85258 Merge branch 'dev' of https: refs #7911//gitea.verdnatura.es/verdnatura/salix-front into 7911-plus_key_shortcut 2024-09-05 07:42:55 +02:00
Javi Gallego c2e2d5ca81 feat: minor fixes 2024-09-04 18:30:20 +02:00
Javi Gallego 91164da2eb feat: refuncInvoiceForm component 2024-09-04 18:16:40 +02:00
Javier Segarra cf3b9b2ef8 perf: CustomerSummary 2024-09-04 17:55:27 +02:00
Javi Gallego 5d7e6be17c Merge branch 'dev' into 7277-RefundInvoices 2024-09-04 17:51:02 +02:00
Jorge Penadés af5e47ed3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-04 16:06:31 +02:00
Carlos Satorres 716270ef92 Merge branch 'dev' into 7407-MedicalWorker2 2024-09-04 12:53:09 +00:00
Carlos Satorres 61c0f63eaf refs #6943 add try catch get 2024-09-04 14:46:21 +02:00
Carlos Satorres bcdd6965e6 refs #6943 add try catch 2024-09-04 14:43:48 +02:00
Carlos Satorres d08748b1a4 refs #6943 fix sampleType 2024-09-04 14:41:35 +02:00
Pablo Natek 717bf1c3e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-04 14:40:53 +02:00
Pablo Natek 3dc720e2d0 feat: refs #7404 add m3 and fix detail 2024-09-04 14:40:36 +02:00
Carlos Satorres b29a56d7dd refs #6943 remake, refactor, clean code Samples 2024-09-04 14:37:39 +02:00
Jon Elias 65e3fd874d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-04 14:15:58 +02:00
Jon Elias f5eacea483 refactor: refs #7553 modified QDrawer and table columns 2024-09-04 14:12:27 +02:00
Jon Elias 4602f4c7b3 refactor: deleted useless prop 2024-09-04 12:25:05 +02:00
Jon Elias 1889aa85b5 refactor: refs #7553 deleted expedition code and slot in VnTable 2024-09-04 11:49:49 +02:00
Jorge Penadés 763cf2e345 refactor: refs #6900 create setRectificative composable 2024-09-04 10:30:14 +02:00
Carlos Satorres 1f9d1b79ab refs #7283 refactor ItexDescriptor 2024-09-04 10:17:57 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias beaa9ab5c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 09:53:47 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2 2024-09-04 07:49:14 +00:00
Jon Elias 5edea7cad1 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-04 09:11:06 +02:00
Jon Elias 0d9773a30f refactor: refs #7553 added default date in new expedition modal 2024-09-04 09:11:05 +02:00
Jon Elias 4bc148f16b Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-04 06:19:20 +00:00
Jon Elias 5471607d32 refactor: refs #7553 added order to Expedition table and tootltip in delete button 2024-09-04 08:18:10 +02:00
Jon Elias cb7d729b0f fix: refs #7553 fixed details in summary and data-key in TicketList 2024-09-04 08:02:28 +02:00
Jorge Penadés 50cdb053f8 feat: refs #7663 fine tunning 2024-09-03 17:33:17 +02:00
Jorge Penadés edfc6ace0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-03 16:23:48 +02:00
Javi Gallego 5b53e9dc37 feat: transfer an invoice 2024-09-03 15:25:36 +02:00
Jorge Penadés 00beeaf51b feat: refs #6900 add tooltip 2024-09-03 14:37:24 +02:00
Jorge Penadés 6eb5435e25 chore: refs #6900 drop useless code 2024-09-03 13:03:38 +02:00
Jon Elias f35e33cf10 fix: refs #7553 fixed TicketTransfer 2024-09-03 12:54:44 +02:00
Jorge Penadés a5887114ef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning 2024-09-03 12:50:35 +02:00
Javier Segarra 397a2606f1 fix: cli warnings 2024-09-03 10:31:37 +02:00
Javier Segarra 4e73e74c2c fix: add border-top 2024-09-03 10:31:24 +02:00
Javier Segarra eca68b76a0 perf: improve mainShrotcutMixin 2024-09-03 10:31:01 +02:00
Carlos Satorres 64eeeb67fa refs #6899 fix InvoiceOut 2024-09-03 10:00:44 +02:00
Jon Elias 75e18a1e2f fix: added missing descriptors and small details 2024-09-03 09:55:58 +02:00
Pablo Natek 74b47361c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-03 09:42:35 +02:00
Jorge Penadés 3e81b34379 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-03 09:10:34 +02:00
Robert Ferrús 5a684e244f Merge branch 'dev' into 211153-businessDataLinkGrafana 2024-09-03 06:46:35 +00:00
Javier Segarra c4c4285b4b fix: remove unnecessary console.log 2024-09-03 08:16:01 +02:00
Pablo Natek 2fb974af0f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-03 08:01:19 +02:00
Jon Elias d18ca14b4e fix: refs #7553 merge changes 2024-09-03 07:45:46 +02:00
Jon Elias 3d683c1da3 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-03 07:45:23 +02:00
Jon Elias b622f6ef96 fix: refs #7553 fixed QChips like Salix 2024-09-03 07:36:40 +02:00
Pablo Natek f6fe05a47a Merge branch 'dev' into 7129-someFixesAfterMigration 2024-09-03 05:26:37 +00:00
Jon Elias a2eb298733 Merge branch 'dev' into 7354_ZoneMigration_End 2024-09-03 04:36:22 +00:00
Javier Segarra e9da8d44f0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36 2024-09-02 19:31:54 +02:00
Jorge Penadés 1824d9a0e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-02 17:02:58 +02:00
Jorge Penadés 3df86d20d2 chore: refs #6900 drop useless locale 2024-09-02 16:48:15 +02:00
Jorge Penadés b42385d7d6 refactor: refs #6900 create new expense form 2024-09-02 16:47:54 +02:00
Javier Segarra 9063f5e5a8 perf: change directive location 2024-09-02 15:26:06 +02:00
Javier Segarra e4bd19b02d Merge branch 'dev' into plus_key_shortcut 2024-09-02 15:25:42 +02:00
Jorge Penadés a382d8278c Merge branch 'dev' into testToDev 2024-09-02 13:11:08 +00:00
Carlos Satorres e73930a4eb refs #7407 Medical Section remove table 2024-09-02 15:11:04 +02:00
Carlos Satorres 7bd3c0802e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-MedicalWorker2 2024-09-02 15:05:51 +02:00
Javier Segarra c495698cac Merge branch 'dev' into plus_key_shortcut 2024-09-02 15:05:38 +02:00
Javier Segarra 7892e68e1b feat: updates 2024-09-02 15:03:47 +02:00
Javier Segarra 5d511c7b1b Merge branch 'dev' into 7889_main_shortcuts 2024-09-02 13:02:07 +00:00
Carlos Satorres 0475083a2b refs #7407 Medical Section 2024-09-02 14:57:01 +02:00
Javier Segarra c51af96ca7 fix: module icon 2024-09-02 12:56:44 +00:00
Pablo Natek 77d306ffeb Merge branch 'dev' into 7129-someFixesAfterMigration 2024-09-02 12:46:26 +00:00
Pablo Natek 9cd941a01c feat: refs #7129 add km start and end on create form 2024-09-02 14:45:43 +02:00
Jon Elias 8ffbe400d5 refactor: refs #7354 modified VnInputTime 2024-09-02 14:21:58 +02:00
Jorge Penadés 0faa42867d chore: refs #6900 drop comment 2024-09-02 13:52:13 +02:00
Jorge Penadés 136f9abeff chore: refs #6900 rollback 2024-09-02 13:39:13 +02:00
Jorge Penadés 8ea9742068 chore: refs #6900 rollback 2024-09-02 13:32:20 +02:00
Jorge Penadés 200481414f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev 2024-09-02 13:21:40 +02:00
Jorge Penadés f24daa4ebd feat: refs #6900 hide menu item 2024-09-02 13:15:06 +02:00
Jon Elias 1af4a559fc Merge branch 'dev' into 7354_ZoneMigration_End 2024-09-02 10:50:22 +00:00
Jon Elias 709f434e5d refactor: refs #7354 changed icon color in table and notification when deleting a zone 2024-09-02 12:49:15 +02:00
Carlos Satorres dfb098d440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-02 12:32:47 +02:00
Carlos Satorres 488dc74c1f refs #7283 itemRequest fix reload 2024-09-02 12:14:23 +02:00
Jon Elias 76a7f8a1b3 refactor: refs #7500 refactor vnimg when storage is dms 2024-09-02 12:09:48 +02:00
Jon Elias 5fc33cb4c3 Merge branch 'dev' of https: refs #7500//gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-02 11:33:10 +02:00
Javier Segarra 970c8473a2 fet: updates 2024-09-02 11:28:13 +02:00
Jon Elias 8bcecb91c6 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-02 11:25:11 +02:00
Jon Elias 45d9322892 feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes 2024-09-02 11:24:06 +02:00
Robert Ferrús a3b253c9eb feat: refs #211153 businessDataLinkGrafana 2024-09-02 11:14:46 +02:00
Carlos Satorres 3bf3e8eeaa refs #7283 itemRequest fix deny 2024-09-02 11:08:50 +02:00
Jorge Penadés 56d226b36b fix: refs #7524 dynamic fetching 2024-09-02 10:03:01 +02:00
Javier Segarra cfa5b84f4e feat 2024-09-02 09:56:52 +02:00
Javier Segarra fb15e90f0b Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-02 09:48:48 +02:00
Javier Segarra 6854b2f3c7 Merge branch '7889_main_shortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889_main_shortcuts 2024-09-02 09:34:35 +02:00
Javier Segarra d3ab56184b perf: remove console.log 2024-09-02 09:34:33 +02:00
Jorge Penadés ed2167e199 refactor: refs #7353 ease logic 2024-09-02 09:30:15 +02:00
Carlos Satorres 388036a2eb refs #7283 itemRequest fix 2024-09-02 09:19:49 +02:00
Jorge Penadés a8fc5a8d73 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-09-02 09:09:27 +02:00
Jorge Penadés be63c8a7fa fix: refs #6900 fine tunning wip 2024-09-02 08:43:32 +02:00
Javier Segarra c25b689685 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-31 00:14:42 +02:00
Javier Segarra af9a58a3df Merge branch 'dev' into 7889_main_shortcuts 2024-08-30 22:12:21 +00:00
Javier Segarra 0bac8d5633 Merge branch 'dev' into plus_key_shortcut 2024-08-30 22:12:02 +00:00
Javier Segarra 00acd5b0ab feat: CustomerCredit section 2024-08-30 14:24:25 +02:00
Carlos Satorres 268a27878c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-30 13:23:42 +02:00
Javier Segarra 4762c9fa53 perf: disable card option 2024-08-30 13:02:39 +02:00
Jorge Penadés 1cdbc0fcc1 fix: refs #7831 add locale & hide table params 2024-08-30 12:51:25 +02:00
Javier Segarra d155b40bde revert: vnUSerLink change 2024-08-30 12:41:59 +02:00
Javier Segarra 0314ca8397 fix: customerSummaryToTicketList button 2024-08-30 12:41:03 +02:00
Carlos Satorres 874cbfea9b refs #7366 fix travel hours 2024-08-30 12:31:42 +02:00
Carlos Satorres 859eb918cd refs #6897 fix entry 2024-08-30 11:50:05 +02:00
Jorge Penadés f9a509ac67 feat: refs #7353 add no one opt 2024-08-30 11:40:55 +02:00
Carlos Satorres f33733c7f2 refs #7355 fix total 2024-08-30 11:25:00 +02:00
Carlos Satorres 8dd462531a Merge branch '7355-accountMigrationFixes2' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigrationFixes2 2024-08-30 11:18:51 +02:00
Carlos Satorres 1544513a3e refs #7355 #7366 fix account, summary, list, travelList, tooltip 2024-08-30 11:18:48 +02:00
Carlos Satorres fa36f8d8af Merge branch 'dev' into 7355-accountMigrationFixes2 2024-08-30 07:55:09 +00:00
Carlos Satorres 76cb8c6b28 refs #7355 remove bug 2024-08-30 09:54:16 +02:00
Carlos Satorres d555b89598 refs #7355 remove bad code 2024-08-30 09:53:42 +02:00
Carlos Satorres 278f691ed2 refs #7355 fix views summarys, entryList, travelList refact 2024-08-30 09:52:43 +02:00
Javier Segarra 52883dfb52 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-30 09:31:32 +02:00
Jorge Penadés 90b2cf09b9 feat: refs #7353 add right icons 2024-08-29 16:54:09 +02:00
Jorge Penadés 6062c2d845 feat: refs #7353 salesPerson nickname & id 2024-08-29 16:51:55 +02:00
Jorge Penadés 956230d708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-29 16:40:34 +02:00
Jorge Penadés b335da8ff6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356-fixCreateClaimDialog 2024-08-29 16:36:23 +02:00
Jorge Penadés c7bb0333bd refactor: refs #7909 improve applyFilter 2024-08-29 16:28:59 +02:00
Jorge Penadés 77cb0ed7a8 feat: refs #7909 add scroll 2024-08-29 16:02:39 +02:00
Carlos Satorres a2254d145e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-29 15:40:43 +02:00
Javier Segarra 8b4fcbd888 feat: CustomerGreuges 2024-08-29 15:30:09 +02:00
Javier Segarra b66ff783be feat: CustomerBalance 2024-08-29 15:29:57 +02:00
Carlos Satorres 36a7618ef5 refs #7355 previews 2024-08-29 15:06:09 +02:00
Carlos Satorres 691c9a8e81 refs #7355 fix roles filters 2024-08-29 14:57:27 +02:00
Carlos Satorres 9899d73566 refs #7355 fix accounts, vnTable 2024-08-29 14:45:47 +02:00
Javier Segarra c727e5f669 feat: copy customer countryFk 2024-08-29 14:23:18 +02:00
Jorge Penadés 7bac607746 fix: refs #7524 add sort-by 2024-08-29 14:20:52 +02:00
Jorge Penadés 42e7629c40 fix: refs #7524 use limit ticket section 2024-08-29 13:53:10 +02:00
Jorge Penadés 35829c743b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit 2024-08-29 13:18:37 +02:00
Jorge Penadés 71c3e9095a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-29 13:06:33 +02:00
Jorge Penadés 58e47b3f24 refactor: refs #7353 order correction 2024-08-29 13:04:54 +02:00
Carlos Satorres e4aec1773b refs #7283 itemRequest fix deny 2024-08-29 12:38:57 +02:00
Jorge Penadés 76fa89c8bd refactor: refs #7353 clients correction 2024-08-29 12:32:00 +02:00
Javier Segarra 375e65aed0 fix: CustomerDescriptorAccount 2024-08-29 12:20:34 +02:00
Jorge Penadés 7a34309ec6 refactor: refs #7353 clients correction wip 2024-08-29 12:01:41 +02:00
Jorge Penadés ef1ba2ea4f feat: refs #7353 imporve toDateFormat 2024-08-29 12:01:23 +02:00
Jorge Penadés 966667bab7 refactor: refs #7353 tickets correction 2024-08-29 11:40:42 +02:00
Javier Segarra bdffdce966 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-29 10:55:25 +02:00
Javier Segarra 592ca3e43c Add shortcut value in AccountMailAliases, for example 2024-08-29 10:20:27 +02:00
Javier Segarra 4880da8feb perf: add v-shortcut in VnCard 2024-08-29 10:20:05 +02:00
Carlos Satorres 3de3a1ad33 Merge branch 'dev' into 6896-orderMigrationFixes 2024-08-29 08:18:14 +00:00
Carlos Satorres 8300109394 refs #6896 fix searchbar 2024-08-29 09:30:10 +02:00
Jorge Penadés eef127ddc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-29 09:29:39 +02:00
Jorge Penadés 7b015d8768 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356-fixCreateClaimDialog 2024-08-29 09:24:35 +02:00
Javier Segarra 7d526f4aa4 fix: CusomerSummary to Address 2024-08-28 20:33:22 +02:00
Javier Segarra e8f660ea37 perf: CustomerBasicData 2024-08-28 20:32:13 +02:00
Javier Segarra 391c908d1b perf: restore CustomerBasicData 2024-08-28 20:31:19 +02:00
Jorge Penadés 77c9311760 fix: refs #7524 use limit travels section 2024-08-28 17:39:39 +02:00
Javi Gallego 3051b13478 warmFix fields with wrong name 2024-08-28 17:31:39 +02:00
Javi Gallego 28fa876806 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-28 17:25:58 +02:00
Javi Gallego 306d7c6289 feat: fields with wrong name 2024-08-28 17:25:53 +02:00
Jorge Penadés 3fce76f2e2 Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit 2024-08-28 17:18:13 +02:00
Jorge Penadés c4665f6cc1 chore: refs #7356 fix type 2024-08-28 17:06:16 +02:00
Jorge Penadés 041b6561f8 fix: refs #7356 colors 2024-08-28 17:03:37 +02:00
Jorge Penadés 23bf9657aa fix: refs #7356 colors 2024-08-28 17:01:50 +02:00
Jorge Penadés 174c34b4e0 fix: refs #7356 create claim dialog 2024-08-28 16:17:34 +02:00
Javier Segarra d8e3f9dfd9 feat: apply mixin 2024-08-28 16:11:25 +02:00
Javier Segarra 57c9035751 feat: add plus shortcut in VnTable 2024-08-28 14:06:14 +02:00
Javier Segarra 72388af418 feat: keyShortcut directive 2024-08-28 14:04:48 +02:00
Javier Segarra 8619abdfb4 feat: change navBar buttons 2024-08-28 14:03:37 +02:00
Jorge Penadés 495cd2cc2f fix: refs #7353 iron out ticket table 2024-08-28 12:46:34 +02:00
Jorge Penadés 1312dbe2af fix: refs #7353 iron out filter 2024-08-28 12:13:58 +02:00
Carlos Satorres cd1b5f56f7 refs #7283 column-action 2024-08-28 11:35:57 +02:00
Carlos Satorres 98be567ead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-28 10:28:58 +02:00
Jorge Penadés ede1966449 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-28 09:41:05 +02:00
Javier Segarra 1b5658726e Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-27 20:47:09 +02:00
Javier Segarra ca74ad85b4 fix: Customerconsumption 2024-08-27 20:46:51 +02:00
Javier Segarra 20ddabcc01 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable 2024-08-27 16:30:32 +02:00
Javier Segarra cadd6a2b62 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable 2024-08-27 15:52:38 +02:00
Javier Segarra 3ea8490e98 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-27 15:46:04 +02:00
Javier Segarra 50de0aa072 fix: InvoiceIn sections 2024-08-27 14:55:36 +02:00
Javier Segarra ec979d11e0 Merge branch 'dev' into 6772_reload_sections 2024-08-27 14:50:01 +02:00
Carlos Satorres 6de59c6419 refs #7283 itemRequestFixed 2024-08-27 14:39:21 +02:00
Javier Segarra 636861234b fix: remove property 2024-08-27 14:00:21 +02:00
Javier Segarra 7567f1b13f Merge branch 'dev' into 7896_down_devToTest_2436 2024-08-27 13:59:06 +02:00
Javier Segarra b481876e81 fix: CustommerSummaryTable Proxy 2024-08-27 12:37:30 +02:00
Javier Segarra 452b084caf feat: change QBadge color 2024-08-27 12:13:49 +02:00
Javier Segarra b8dea8551d perf: TicketTransferSale 2024-08-27 12:04:33 +02:00
Javier Segarra 071f3ba4d0 perf: TicketSummary issues 2024-08-27 11:58:26 +02:00
Carlos Satorres 477984076b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-27 10:55:17 +02:00
Carlos Satorres c81cf638bc Merge branch 'dev' into 6899-fixInvoiceOutMigration 2024-08-27 08:49:22 +00:00
Javier Segarra d4dc461e41 Merge branch 'dev' into 7355-fixesAccountMigration 2024-08-27 08:40:00 +00:00
Javier Segarra 4a81598883 fix: ticketDescriptorMenu 2024-08-27 10:27:43 +02:00
Carlos Satorres 72e4f10287 refs #6899 fix order 2024-08-27 10:17:06 +02:00
Carlos Satorres 39656ee3f5 refs #7355 remove privileges 2024-08-27 10:11:38 +02:00
Javier Segarra b7c6c92ff8 Merge branch 'dev' into 6772_reload_sections 2024-08-27 08:04:59 +00:00
Carlos Satorres 64e776d311 refs #6899 fix invoiceFix 2024-08-27 10:02:59 +02:00
Jorge Penadés 4491d83a7a feat: refs #7353 add locale 2024-08-27 09:59:51 +02:00
Jorge Penadés 25be0df2e3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-27 09:55:52 +02:00
Jorge Penadés 4d7a4be2c0 fix: refs #7524 use limit entry Section wip 2024-08-27 09:54:21 +02:00
Javier Segarra 2ae482ff8c Merge branch 'test' into dev 2024-08-27 09:38:12 +02:00
Carlos Satorres 2ef56f9f97 refs #7283 fixedPrice 2024-08-27 08:00:07 +02:00
Javier Segarra 461b764f0e Merge branch 'test' into dev 2024-08-27 07:11:20 +02:00
Javier Segarra 61c7c622f7 perf: update CustommerDescriptor 2024-08-27 07:00:54 +02:00
Javier Segarra db97e8322e feat: change url CustomerList 2024-08-27 07:00:40 +02:00
Javier Segarra 10747d7a4f perf: customerSummaryTable 2024-08-27 07:00:28 +02:00
Jorge Penadés 3aa3d2d8d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-08-26 16:58:20 +02:00
Jorge Penadés 717c52fc02 fix: refs #7524 use id 2024-08-26 16:55:16 +02:00
Jorge Penadés 7c2a13db0b fix: refs #7524 use limit shelving Section 2024-08-26 16:39:17 +02:00
Jorge Penadés 566a649c20 fix: refs #7524 use limit item Section 2024-08-26 16:34:46 +02:00
Jorge Penadés c418899fb3 chore: refs #7323 improve vnselect 2024-08-26 13:54:48 +02:00
Jorge Penadés e1e768948e chore: refs #7323 improve vnselect 2024-08-26 13:44:35 +02:00
Jorge Penadés c47635fcf2 chore: refs #7323 refactor autofillbic 2024-08-26 13:42:08 +02:00
Carlos Satorres c4fc644a35 refs #7355 remove data 2024-08-26 13:08:47 +02:00
Jorge Penadés 6f9cd7fe15 fix: refs #7323 auto fill bic 2024-08-26 12:47:05 +02:00
Carlos Satorres 8568d36ee5 refs #7355 fix privileges 2024-08-26 12:40:01 +02:00
Javier Segarra 9a48cb0742 feat: VnImg draggable 2024-08-26 12:26:31 +02:00
Javier Segarra 6c887c36b1 fix: CustomerDescriptor.bussinessTypeFk 2024-08-26 12:26:21 +02:00
Carlos Satorres c84786e053 refs #7355 fix accountPrivileges 2024-08-26 11:41:35 +02:00
Javier Segarra 56f687ce36 perf: sendEmail customerConsumption 2024-08-23 21:06:15 +02:00
Jorge Penadés 1bbc6c1840 chore: refs #7353 fix warnings 2024-08-23 15:55:56 +02:00
Javi Gallego b82449b174 Merge branch 'dev' into 7710-cloneWithTicketPackaging 2024-08-23 13:41:17 +00:00
Javier Segarra 0d99c5f609 feat: CustomerConsumptionFilter 2024-08-23 15:30:22 +02:00
Javi Gallego a14c0f3fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-23 13:52:51 +02:00
Javi Gallego fb0ed9c4ce para que no de el fallo de muchos registros 2024-08-23 13:52:46 +02:00
Javier Segarra c382118492 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-23 13:32:23 +02:00
Javier Segarra e7ce2a0ef6 Merge branch 'dev' into feature/TicketFutureFilter 2024-08-23 11:17:02 +00:00
Jorge Penadés fdacdf1a12 feat: refs #7353 add filter & fix customTags 2024-08-23 12:43:27 +02:00
Javi Gallego efc7df5a60 delivery traducido a Reparto 2024-08-23 12:19:54 +02:00
Javier Segarra bc1ea611ce feat: CustomerConsumptionFilter 2024-08-23 10:36:31 +02:00
Javier Segarra 390ab9cfd1 feat: CustomerConsumptionFilter 2024-08-23 10:34:54 +02:00
Javi Gallego d0ccce2656 feat: refs #7346 elimino === 2024-08-23 10:32:36 +02:00
Javi Gallego 1984e1d0d8 feat: refs #7710 uses cloneAll 2024-08-23 10:25:05 +02:00
Javi Gallego defb11a6d7 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-23 08:20:06 +00:00
Javier Segarra 91e52432ea Merge branch 'dev' into feature/TicketFutureFilter 2024-08-23 07:13:43 +00:00
Jorge Penadés 2d05d5e03c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-23 09:11:35 +02:00
Javier Segarra 14961d0aec fix: change order column by default 2024-08-22 23:40:29 +02:00
Javier Segarra 54eb567e39 perf: date fields 2024-08-22 22:13:50 +02:00
Jorge Penadés b0c27027c0 chore: refs #7353 use Vue component nomenclature 2024-08-22 13:41:53 +02:00
Jorge Penadés 48277a5f20 fix: refs #7323 vertical align 2024-08-22 12:14:16 +02:00
Javier Segarra bae0b4de35 fix: itemBotanical 2024-08-22 10:38:15 +02:00
Javier Segarra 5b667366ae fix: remove condition duplicated 2024-08-22 09:53:26 +02:00
Javier Segarra 57ba26280d Merge branch 'dev' into 6772_reload_sections 2024-08-22 09:48:42 +02:00
Javier Segarra a70b65ec9e feat: add key to routerView 2024-08-22 09:47:13 +02:00
Jorge Penadés b77a10a57a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-hotfix-workerFineTunning 2024-08-21 16:04:52 +02:00
Jorge Penadés 9c99266da6 fix: refs #7323 replace day 2024-08-21 16:02:16 +02:00
William Buezas 6197d283e4 Create ticket future filter 2024-08-21 10:51:38 -03:00
Jorge Penadés 517ec87e16 fix: refs #7323 use timeStamp 2024-08-21 14:18:01 +02:00
Javi Gallego b71d24cf3d feat: refs #7346 sonarLint warnings 2024-08-21 14:13:36 +02:00
Javier Segarra aebf6d7a8e Merge branch 'dev' into 7017_formModel_validations 2024-08-21 13:55:28 +02:00
Javi Gallego 3d5807463b feat: refs #7346 refactor 2024-08-21 13:46:19 +02:00
Javier Segarra a131cb559d feat: add max rule 2024-08-21 13:34:40 +02:00
Jorge Penadés 635ac2716d fix: refs #7323 generate code & minor changes 2024-08-21 13:33:50 +02:00
Javier Segarra 292253fb45 fix: Show name in summary instead current value 2024-08-21 11:29:35 +00:00
Javier Segarra bac0a3ba6c fix: Show name in descriptor instead current value 2024-08-21 11:29:12 +00:00
Jon Elias ffa6ef57fe fix: refs #7553 refs #7356 fix generatePdf function 2024-08-21 13:18:43 +02:00
Jon Elias 6b2df03b06 Merge branch '7553_FixTicketExpedition' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-08-21 12:41:32 +02:00
Jon Elias 56c461f085 refactor: refs #7553 refs #7356 changed generatePdf name, fixed changeTime & added order in TicketVolume 2024-08-21 12:41:04 +02:00
Javier Segarra 6218463e7e perf: rename component 2024-08-21 12:16:29 +02:00
Javier Segarra 87eca93ef8 fix: use class link 2024-08-21 12:16:21 +02:00
Javier Segarra 89eaf02800 feat: #7323 handle workerPhoto 2024-08-21 11:45:26 +02:00
Jon Elias 79a26d7b94 feat: refs #7553 refs #7356 added VnTable in TicketVolume & fixed QBadge in summary 2024-08-21 11:42:03 +02:00
Jorge Penadés 79c96199f3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-21 11:35:16 +02:00
Jon Elias a31931f8cf Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-21 08:13:19 +02:00
Jorge Penadés 7f2407996f chore: const var 2024-08-20 17:02:38 +02:00
Jorge Penadés d89d324a7e chore: drop ref 2024-08-20 16:59:16 +02:00
Jorge Penadés 0277aa50ce fix: set right time 2024-08-20 16:55:39 +02:00
Jorge Penadés 03baef8231 fix: refs #7353 css 2024-08-20 12:14:05 +02:00
Javier Segarra a5fc366081 Merge branch 'dev' into 6336_claim_fix_states 2024-08-20 09:34:46 +00:00
Javier Segarra 472d477b15 fix: trim vnsearchbar input value 2024-08-20 09:32:50 +00:00
Javier Segarra 145c8b00d5 fix: limit and order TicketTracking 2024-08-20 09:32:01 +00:00
Javi Gallego 0eb699bcbe feat: refs #7346 formdata uses serialType 2024-08-20 10:10:11 +02:00
Jon Elias 5f63a9b058 refactor: refs #7553 & #7356 changed makeInvoice function and dialogs 2024-08-20 10:02:23 +02:00
Javier Segarra 6e814ed4a8 fix: remove full-height class 2024-08-20 08:02:06 +00:00
Jon Elias 85bc610298 feat: refs #7553 refs #7356 & #7553 added rest of missing functions in the descriptor menu 2024-08-20 09:36:27 +02:00
Jorge Penadés 12a5d6cec0 fix: refs #7283 css 2024-08-19 17:05:00 +02:00
Jorge Penadés f34f3a78cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-08-19 16:39:39 +02:00
Jorge Penadés 206253ac6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-19 16:03:23 +02:00
Jorge Penadés 1ec7b7a8c1 fix: refs #7353 css 2024-08-19 16:02:30 +02:00
Javier Segarra f927e9b722 fix: #6943 fix customerSummaryTable 2024-08-19 14:31:52 +02:00
Jorge Penadés 3f9bdfcc9c fix: refs #7353 saleTicketMonitors 2024-08-19 14:21:36 +02:00
Jon Elias 511d53d109 feat: refs #7553 added refund and add turn functions to descriptor 2024-08-19 13:48:55 +02:00
Jorge Penadés e6e61e5717 fix: refs #7353 vnTable colors 2024-08-19 13:40:35 +02:00
Jon Elias 574a2efc92 feat: refs #7553 added transferClient function 2024-08-19 13:03:38 +02:00
Javier Segarra c19585fb1b fix: quasar build warnings 2024-08-19 11:36:12 +02:00
Jon Elias 23e5072d38 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-08-19 11:31:30 +02:00
Jon Elias 4a57c53c3d fix: refs #7553 & #7356 migration 2024-08-19 11:30:20 +02:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-19 09:20:31 +00:00
Jon Elias f3d7590edf refactor: refs #7717 delete useless function and import 2024-08-19 10:49:04 +02:00
Jon Elias 6fd0083870 fix: refs #7354 fix validation in price field 2024-08-19 10:45:13 +02:00
Jorge Penadés 9a4a51fadb refactor: refs #7353 simplify code 2024-08-19 10:29:55 +02:00
Javi Gallego ca3406fbc0 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-19 10:27:48 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections 2024-08-19 10:14:02 +02:00
Javier Segarra 74f335b22e fix: #6336 ClaimListStates 2024-08-19 06:51:52 +00:00
Jorge Penadés bd9aea767a fix: refs #7353 salesorderTable 2024-08-16 18:10:10 +02:00
Jorge Penadés 1cca504c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-16 15:18:20 +02:00
Alex Moreno e45e551526 feat: customer consumption 2024-08-16 15:16:35 +02:00
Jorge Penadés a69f41834e fix: refs #7353 padding 2024-08-16 14:19:02 +02:00
Jorge Penadés a13ea900ce fix: refs #7353 salesClientTable 2024-08-16 13:54:37 +02:00
Alex Moreno fa0ca732fc feat(FormModel): trim data by default 2024-08-16 12:29:35 +02:00
Alex Moreno 4b2f4ffac1 fix(VnTable): orderBy v-model 2024-08-16 12:20:08 +02:00
Alex Moreno 0e8455888b Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-16 09:32:55 +00:00
Jon Elias 3c4fc9473d refactor: refs #7354 changed descriptor menu options 2024-08-16 11:20:03 +02:00
Alex Moreno b35bf85f4a fix(claim_summary): url links 2024-08-16 10:50:45 +02:00
Alex Moreno ed29088d76 typo 2024-08-16 10:49:52 +02:00
Javi Gallego 06c0f49128 feat: refs #7346 add seriaType option 2024-08-16 10:10:40 +02:00
Alex Moreno 51ee79b7f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-16 09:24:24 +02:00
Alex Moreno 83a8f7e147 fix(invoiceOutGlobal): formData is object 2024-08-16 09:20:53 +02:00
Jorge Penadés bdaba6b3ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-08-14 16:29:53 +02:00
Carlos Satorres 1df089cef7 refs #7283 fix itemFixedPrice 2024-08-14 15:50:13 +02:00