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

7249 Commits

Author SHA1 Message Date
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
Javier Segarra 4415216ea2 Merge branch 'dev' into plus_key_shortcut 2024-09-02 11:14:29 +00: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 e4e9496cac Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-02 11:33:15 +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 63f5f85e8d Merge pull request 'fix: refs #7524 dynamic fetching' (!662) from 7524-warmfix-useLimit into test 
Reviewed-on: verdnatura/salix-front#662
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 08:54:27 +00: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
Jorge Penadés d55bf0ff75 Merge pull request '#7524 useLimit' (!645) from 7524-useLimit into test 
Reviewed-on: verdnatura/salix-front#645
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 07:50:45 +00: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 f0055d7b36 Merge pull request '#7353 fine tunning monitors' (!624) from 7353-fineTunningMonitor into dev 
Reviewed-on: verdnatura/salix-front#624
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-02 07:33:42 +00: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
Jorge Penadés 124194ddcb Merge pull request 'fix: refs #7831 add locale & hide table params' (!660) from 7831-hotfix-addLocale into master 
Reviewed-on: verdnatura/salix-front#660
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-30 14:08:36 +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
Carlos Satorres 5b0df1124e Merge pull request '7355-accountMigrationFixes2' (!658) from 7355-accountMigrationFixes2 into dev 
Reviewed-on: verdnatura/salix-front#658
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-08-30 10:58:09 +00: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