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

5399 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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 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
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 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 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
Jorge Penadés ecfdf0b6b9 fix: refs #6900 improve loading 2024-08-14 15:27:36 +02:00
Javier Segarra 6378be5933 Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-14 15:26:49 +02:00
Javier Segarra c878fc9cff feat: remove duplicity 2024-08-14 15:26:47 +02:00
Jon Elias 95cda2bad7 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 13:10:25 +00:00
Jon Elias ea43df81fd Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-14 15:09:30 +02:00
Jon Elias d12fcd3b34 refactor: refs #7354 refactor deliveryPanel 2024-08-14 15:09:28 +02:00
Jorge Penadés 3bba5db1b5 fix: refs #6900 improve logic 2024-08-14 14:52:47 +02:00
Jorge Penadés 65d893e128 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:30:47 +02:00
Jorge Penadés 760dc0e6f4 Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:27:57 +02:00
Jorge Penadés 6dd9029871 fix: refs #6900 improve logic 2024-08-14 14:27:54 +02:00
Alex Moreno 793001be6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables 2024-08-14 13:40:49 +02:00
Alex Moreno 895441a8e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:40:25 +02:00
Alex Moreno c7f53635d9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-14 13:40:13 +02:00
Alex Moreno a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:39:54 +02:00
Jorge Penadés e07d573788 Merge branch 'test' into 6900-addSerial 2024-08-14 10:13:39 +00:00
Alex Moreno dae71dacfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables 2024-08-14 10:49:11 +02:00
Jon Elias 926fba27b8 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 08:45:37 +00:00
Jon Elias ed4bf3cfa8 refactor: refs #7354 requested changes 2024-08-14 10:44:45 +02:00
Jorge Penadés 9bb67511e6 fix: refs #7323 vnsubtoolbar css 2024-08-14 10:34:42 +02:00
Alex Moreno bd83a959f7 fix: customer credit opinion 2024-08-14 10:11:52 +02:00
Jorge Penadés d7eb3af48d fix: refs #7323 add locale 2024-08-14 10:10:22 +02:00
Javier Segarra 9eff6b56ea fix: remove print variable 2024-08-14 09:48:59 +02:00
Javier Segarra 8acd008f42 feat: handle newValue 2024-08-14 09:47:27 +02:00
Javier Segarra 55b9cd9ff4 feat: handle same multiple CP 2024-08-14 09:18:24 +02:00
Jorge Penadés 30cadb5697 fix: refs #7323 use workerFilter 2024-08-14 09:11:14 +02:00
Alex Moreno 07e4dca361 refactor(invoiceOutList): create dialog 2024-08-14 08:55:18 +02:00
Javier Segarra 92130b4c9c WIP: 59262019 Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev 2024-08-14 08:09:27 +02:00
Javier Segarra 3e44c6e404 Merge branch 'dev' into 7677_vnLocation_perf 2024-08-14 08:01:26 +02:00
Pablo Natek c31aa3258f fix: refs #7830 remove console.log 2024-08-13 18:15:16 +02:00
Pablo Natek 40e46f5a72 fix: refs #7830 customer credit 2024-08-13 18:13:46 +02:00
Pablo Natek ffd7d98e9c feat: travel m3 2024-08-13 17:56:07 +02:00
Jorge Penadés e7def05d40 feat: refs #7323 add flex-wrap 2024-08-13 16:59:43 +02:00
Jorge Penadés e780dcda05 fix: refs #7323 load all opts 2024-08-13 16:45:30 +02:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword 2024-08-13 14:41:23 +00:00
Alex Moreno 3cbdf25410 delete name default 2024-08-13 16:40:02 +02:00
Jorge Penadés c8ab5b3bfd feat: refs #7663 add setWeight menu opt (wip) 2024-08-13 14:57:09 +02:00
Jon Elias 0e9739f2a5 refactor: refs #7354 refactor zones section and fixed e2e tests 2024-08-13 14:39:50 +02:00
Carlos Satorres 405092f66d fix: account subsections cards 2024-08-13 13:11:23 +02:00
Carlos Satorres aae881c24a fix(account_card): redirection 2024-08-13 12:59:22 +02:00
Jorge Penadés a24caa9393 fix: refs #7323 use global locale 2024-08-13 12:56:39 +02:00
Carlos Satorres e144f0be01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-13 12:52:14 +02:00
Alex Moreno e88e7fa9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 12:25:47 +02:00
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Jon Elias 4401a6108f Merge branch 'master' into hotfix_InvoiceOut_List&NegativeBases 2024-08-13 09:19:46 +00:00
Jon Elias de7251e16d fix: InvoiceOut List and negative bases 2024-08-13 11:18:07 +02:00
Jorge Penadés 81c70c9511 chore: refs #7323 remove unused import 2024-08-13 10:06:58 +02:00
Jorge Penadés e428da4a29 feat: refs #7323 add my account" btn & fix models log selectable 2024-08-13 10:05:07 +02:00
Alex Moreno d27821c100 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 08:37:15 +02:00
Jorge Penadés de24a3efdb feat: refs #6900 add locale 2024-08-12 15:34:09 +02:00
Jon Elias aefcfdba51 fix: refs #7354 fix zoneSearchbar 2024-08-12 14:28:35 +02:00
Jorge Penadés c7679fd142 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-12 14:22:47 +02:00
Jon Elias 563ab2de9c Merge branch 'master' into hotfix_TicketList_WarehouseFilter 2024-08-12 12:05:51 +00:00
Jorge Penadés c4de1beabf feat: refs #6900 add InvoiceInSerial 2024-08-12 13:46:56 +02:00
Jon Elias 72c8379b20 fix: new field's order in warehouse filter 2024-08-12 13:18:31 +02:00
Jon Elias b955ded123 fix: refs #7354 fix list searchbar and filters 2024-08-12 12:58:19 +02:00
Jorge Penadés 2cf669b479 Merge branch 'dev' into 7283-itemSectionsMigration 2024-08-12 10:51:40 +00:00
Carlos Satorres 94878b700b refs #7355 account cards loads 2024-08-12 12:39:06 +02:00
Alex Moreno 3222a7a42c fix(orderLines): reload when delete and redirect when confirm 2024-08-12 11:51:21 +02:00
Alex Moreno 1e4a309a84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-12 11:47:01 +02:00
Alex Moreno 65a80e006b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-12 11:46:09 +02:00
Jorge Penadés 9708214462 chore: refs #7283 drop array types 2024-08-12 11:01:32 +02:00
Jorge Penadés 239e796d2e chore: refs #7283 update VnAvatar title handling 2024-08-12 11:00:03 +02:00
Jon Elias 9387082fc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-12 10:35:55 +02:00
Jon Elias 41afc52f65 fix events and descriptor menu 2024-08-12 10:33:40 +02:00
Alex Moreno 190579e7fd fix: orderCatalogFilter order 2024-08-12 10:22:52 +02:00
Jorge Penadés f5ffe2a07b refactor: refs #7283 update avatar size and color 2024-08-12 10:18:14 +02:00
Alex Moreno e11e51f432 fix: order description to vnTable 2024-08-12 09:17:51 +02:00
Alex Moreno 5e88004e79 fix(customerDescription): fix action buttons 2024-08-12 08:34:16 +02:00
Jorge Penadés 6b80c52b71 chore: refs #7283 drop import 2024-08-09 15:42:31 +02:00
Jorge Penadés f17ca4fe30 fix: refs #7283 itemLastEntries filter 2024-08-09 15:34:10 +02:00
Jorge Penadés bb1f507b27 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 15:29:37 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes 2024-08-09 14:55:49 +02:00
Alex Moreno dc7c686508 feat(orderList): correct create order 2024-08-09 14:19:08 +02:00
Carlos Satorres b21ba3dc2c refs #7355 account cards roles cards 2024-08-09 13:55:29 +02:00
Alex Moreno ee71ae9d24 feat(orderList): use orderFilter and fixed this 2024-08-09 13:07:37 +02:00
Alex Moreno 5741cca878 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-09 12:39:00 +02:00
Alex Moreno 08972d62b0 Merge branch 'dev' into warmFix_vnFilterPanel_setUserParams 2024-08-09 10:37:09 +00:00
Jorge Penadés bf11a184c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:34:04 +02:00
Alex Moreno 02cfa54a40 unify watchers 2024-08-09 12:27:24 +02:00
Jorge Penadés 7a2170e7c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:12:59 +02:00
Jorge Penadés 3680321ae8 fix: refs #6900 use type number 2024-08-09 11:44:32 +02:00
Alex Moreno bd05460b90 console.log 2024-08-09 11:41:29 +02:00
Alex Moreno 43ca7e1667 fix(VnFilterPanel): emit userParams better 2024-08-09 11:40:05 +02:00
Jorge Penadés f1047328c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning 2024-08-09 10:19:33 +02:00
Alex Moreno 6df6e53f30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-09 09:32:23 +02:00
Alex Moreno 2dd8376bcd typo 2024-08-09 09:32:04 +02:00
Jorge Penadés 3f6b20270d chore: refs #6900 drop console log 2024-08-09 09:15:12 +02:00
Jorge Penadés 81ed679a2b chore: refs #6900 mv rectificative logic 2024-08-09 09:11:35 +02:00
Jorge Penadés 88b6d7c9ae fix: refs #6900 rectificative btn reactivity 2024-08-09 09:09:16 +02:00
Alex Moreno d3f50ec9b2 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-09 06:52:13 +00:00
Alex Moreno a4d0483f89 typo 2024-08-09 08:48:24 +02:00
Alex Moreno 3ee7692bbc fix(zone): zoneLocation and the others searchbar 2024-08-09 08:45:48 +02:00
Jon Elias 3f76b5496a fix: refs #7717 fix order sections 2024-08-09 07:46:32 +02:00
Jorge Penadés 4dc12cf119 chore: refs #6900 responsive code 2024-08-08 17:14:31 +02:00
Jorge Penadés 12bb88f7f8 chore: refs #6900 drop vnCurrency 2024-08-08 17:05:31 +02:00
Jorge Penadés 344ca7d243 fix: refs #6900 vat, dueday & intrastat 2024-08-08 16:54:21 +02:00
Jorge Penadés 1a4cf51246 fix: refs #6900 vat & dueday 2024-08-08 16:44:00 +02:00
Jorge Penadés 2afe9b445e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning 2024-08-08 15:30:19 +02:00
Pablo Natek eb74297d06 Merge branch 'master' into 6820-remove-rule 2024-08-08 12:59:36 +00:00
Carlos Satorres 40c3ba15e6 refs #7355 account acls roles cars 2024-08-08 14:55:53 +02:00
Pablo Natek c5358313df fix: route form 2024-08-08 14:54:17 +02:00
Carlos Satorres 3eaa5c864d refs #7355 account fixes 2024-08-08 13:57:01 +02:00
Alex Moreno 1512801f02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 12:52:55 +02:00
Alex Moreno 6fb6e07be0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-08 12:52:37 +02:00
Alex Moreno 80f63f1ae2 fix: VnCard VnSearchbar props 2024-08-08 12:52:36 +02:00
Jorge Penadés 85edc28a9b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-6449-summaryId 2024-08-08 12:42:10 +02:00
Alex Moreno 2f3ad52d48 duplicate notify 2024-08-08 12:36:20 +02:00
Alex Moreno ea8aca29a6 fix(twoFactor): unify code login and twoFactor 2024-08-08 12:33:26 +02:00
Jorge Penadés 0782b3ff5f chore: #6900 order params 2024-08-08 12:15:11 +02:00
Pablo Natek 26628c5f2a fix: refs #7129 fix vehicle filter 2024-08-08 11:18:37 +02:00
Alex Moreno 5ac2d34125 hotFix: vnVisibleColumn fix userId 2024-08-08 10:27:27 +02:00
Jorge Penadés dc5142c20a feat: refs #6900 use VnTable & sort filter fields 2024-08-08 10:12:54 +02:00
Alex Moreno cc8afa2f99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 08:57:38 +02:00
Alex Moreno ac1434fb9c Merge branch 'dev' into vnCard-unify-searchbarParams 2024-08-08 05:56:39 +00:00
Alex Moreno 3a77be0043 change searchbar to searchbarProps 2024-08-08 07:56:29 +02:00
Alex Moreno ce878b5201 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 07:43:58 +02:00
Alex Moreno afe178216c invoiceOut 2024-08-07 14:45:43 +02:00
Alex Moreno 12bd66b9ca typo 2024-08-07 14:41:57 +02:00
Alex Moreno 2f7dd0a4cb remove unecessary props 2024-08-07 14:41:30 +02:00
Alex Moreno 44e3eb779d feat(VnCard): use props searchbar 2024-08-07 14:40:28 +02:00
Jorge Penadés baf0981233 chore: refs #7323drop commented code 2024-08-07 13:37:37 +02:00
Jorge Penadés 855483cefd fix: refs #7323 css righ menu 2024-08-07 13:37:01 +02:00
Jorge Penadés 4ee6c7436f fix: refs #7323 righ menu bug 2024-08-07 13:18:13 +02:00
Jorge Penadés 98656aa2c8 fix: refs #7323 add department popup 2024-08-07 12:29:19 +02:00
Carlos Satorres df1b63da98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-07 12:23:22 +02:00
Carlos Satorres 6b69a16122 refs #7355 changes BasicData 2024-08-07 12:22:52 +02:00
Jorge Penadés 017d5382bb fix: refs #7323 data-key & add select 2024-08-07 12:19:26 +02:00
Jorge Penadés bd67218a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fixErrors 2024-08-07 11:58:41 +02:00
Jorge Penadés 08ed134b12 fix: refs #7323 wrong css 2024-08-07 11:57:27 +02:00
Alex Moreno c2e59856df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-07 11:54:55 +02:00
Alex Moreno dafa8cdebd Merge branch 'dev' into 6943-customer_migration_subsection-v2 2024-08-07 08:54:36 +00:00
Alex Moreno 9e0fba49ea fix: accountMailAlias 2024-08-07 10:38:20 +02:00
Jorge Penadés c6c2245a2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-07 10:17:14 +02:00
Alex Moreno 2cb99eb025 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-07 10:04:13 +02:00
Alex Moreno b781cfb131 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-08-07 10:03:21 +02:00
Alex Moreno f9ba6e155d hotFix: VnInputTIme 2024-08-07 10:03:20 +02:00
Alex Moreno 88d0a09324 Merge branch 'master' into hotfix_InvoiceOutMigration 2024-08-07 07:18:37 +00:00
Jon Elias 3dc2ac8bac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-08-07 07:25:57 +02:00
Alex Moreno 3f5a8218d0 Merge branch 'master' into 7129-fixFilter 2024-08-06 12:56:32 +00:00
Alex Moreno ffcab60a06 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 14:31:28 +02:00
Pablo Natek 990fe65a63 fix: filter and correct list 2024-08-06 14:17:17 +02:00
Alex Moreno 1db7fd8412 hotFix(routeTicket): limit 0 2024-08-06 13:01:07 +02:00
Alex Moreno c3fb30e72b Merge branch 'master' into 7129-hotfix 2024-08-06 10:15:38 +00:00
Jon Elias e8396ea338 refactor: refs #6899 added descriptors to VnTable and fix descriptor redirect 2024-08-06 11:55:44 +02:00
Alex Moreno 7e7fddb86b fix(router_basicData): transalation kmMax 2024-08-06 11:50:33 +02:00
Pablo Natek 7d6520fdaa fix: routeForm 2024-08-06 11:44:38 +02:00
Carlos Satorres 75866f2d27 refs #6898 fix new list 2024-08-06 11:00:59 +02:00
Alex Moreno 4c46e419e3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 09:43:50 +02:00
Alex Moreno 28efe4aacf hotFix(route_list): columnFilter change "from" to "to" 2024-08-06 09:43:16 +02:00
Jorge Penadés 90073a0a68 fix: refs #7283 locale 2024-08-06 09:12:12 +02:00
Jorge Penadés 50468d22cc fix: refs #7283 min-width vnImg 2024-08-06 08:56:12 +02:00
Jorge Penadés db38270ed5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-06 08:47:09 +02:00
Alex Moreno f38a70c040 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-06 08:01:41 +02:00
Jorge Penadés 005f571ecf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-05 17:14:06 +02:00
Jorge Penadés b8d38f15e4 fix: refs #7283 use vnAvatar & add optional zoom 2024-08-05 17:13:15 +02:00
Pablo Natek cf1545d5e8 Merge branch 'dev' into 7404-stockBought 2024-08-05 14:25:47 +00:00
Pablo Natek de94b3629e fix: remove console.log 2024-08-05 15:44:37 +02:00
Pablo Natek f2be2b4300 fea: stockBought add form and formDetail 2024-08-05 15:42:57 +02:00
Alex Moreno 8c754dd196 hotFix(claim_development): reload when change route id 2024-08-05 15:22:34 +02:00
Alex Moreno 6abce3c7d0 hotFix(VnPaginate): watch when is mounted 2024-08-05 15:20:07 +02:00
Alex Moreno dcc2ef3d18 typo 2024-08-05 14:25:42 +02:00
Jorge Penadés 5bd0bbb3ac fix: refs #7283 userPanel pic 2024-08-05 14:03:55 +02:00
Alex Moreno 5bac9143e6 fix(customer_sms: fix reload 2024-08-05 14:02:39 +02:00
Alex Moreno 88ea25cb83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection-v2 2024-08-05 13:46:17 +02:00
Alex Moreno 98a16b9453 refactor(customer_log: use VnLog 2024-08-05 13:44:35 +02:00
Alex Moreno 7612260359 refactor(customer_webAccess): FormModel 2024-08-05 13:36:27 +02:00
Jorge Penadés 16cfd84fab fix: refs #7283 itemTags & VnImg 2024-08-05 13:01:26 +02:00
Alex Moreno 810e579ea9 refactor(customer_recovery): to vnTable 2024-08-05 12:10:15 +02:00
Guillermo Bonet 59b709b57d Merge branch 'test' into dev 2024-08-05 11:59:15 +02:00
Guillermo Bonet da911f80f6 Merge branch 'master' into test 2024-08-05 11:58:58 +02:00
Guillermo Bonet d12c0de144 feat: refs #7644 Optimized entry labels report 2024-08-05 11:29:44 +02:00
Alex Moreno c83b3d54ae typo 2024-08-05 10:07:47 +02:00
Alex Moreno 30961c796d feat(customer_balance): refs #6943 translations 2024-08-05 10:05:41 +02:00
Alex Moreno 460b166a17 feat(customer_balance): refs #6943 add functionality from salix 2024-08-05 09:04:08 +02:00
Alex Moreno 91e066e18a Merge branch 'test' into hotfix_TicketList_itemName 2024-08-05 05:44:41 +00:00
Jorge Penadés 6f771c7ae6 fix: refs #7283 basicData locale 2024-08-02 14:31:41 +02:00
Jon Elias 954a6ff6c0 refacotr: refs #7553 refactor sales, purchaseRequest and saleTracking 2024-08-02 13:55:51 +02:00
Jon Elias 2a4180a1c3 refactor: refs #6346 deleted front error checking 2024-08-02 13:20:46 +02:00
Jon Elias bdf4c793dc Merge branch 'test' into hotfix_ItemDiary 2024-08-02 11:04:47 +00:00
Jorge Penadés 27e7d30158 fix: refs #7283 basicData locale 2024-08-02 12:50:58 +02:00
Jorge Penadés bc4ee5c8a5 fix: refs #7283 basicData locale 2024-08-02 12:50:09 +02:00
Alex Moreno eb55743bc0 Merge branch 'test' into hotfix_6101_FixTicketList 2024-08-02 10:28:44 +00:00
Jorge Penadés 51fec90607 feat: refs #4074 useAcl in vnSelectDialog 2024-08-02 12:04:19 +02:00
Guillermo Bonet 0d016e0898 Merge branch 'test' into dev 2024-08-02 10:01:16 +02:00
Guillermo Bonet 33da5dd8a8 Merge branch 'master' into test 2024-08-02 10:01:01 +02:00
Guillermo Bonet 8450830b59 Merge branch 'master' into 7413-filterValueFix 2024-08-02 07:55:30 +00:00
Jorge Penadés 6c3c03722f feat: refs #4074 useAcl in vnSelectDialog 2024-08-02 09:37:48 +02:00
Jon Elias 2367550bc1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ItemDiary 2024-08-02 09:25:46 +02:00
Jon Elias 276202f0c7 fix: refs CAU 207504 fix itemDiary and logs 2024-08-02 09:23:30 +02:00
Jorge Penadés 53aec24790 chore: refs #4074 drop workerCreate 2024-08-02 09:04:16 +02:00
Jon Elias b6bb8e0952 hotfix: refs CAU #207614 fix sale.concept field 2024-08-02 08:41:46 +02:00
Jon Elias c5f2075148 fix: refs #6101 fix TicketList 2024-08-02 08:25:57 +02:00
Jorge Penadés 199ed80212 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-08-01 16:39:20 +02:00
Jorge Penadés 9e9a530803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-08-01 16:37:12 +02:00
Jorge Penadés db18e8c937 fix: refs #4074 workerCard data-key 2024-08-01 16:10:26 +02:00
Jorge Penadés fb496d7fc6 chore: refs #4074 admit several acls 2024-08-01 16:08:40 +02:00
Jorge Penadés 27034d1dc2 chore: refs #4074 admit several acls 2024-08-01 14:46:04 +02:00
Jorge Penadés dcc2f4dfde chore: refs #4074 admit several acls 2024-08-01 14:14:28 +02:00
Jorge Penadés c766110bd9 chore: refs #4074 wip replace useRole for useAcl 2024-08-01 14:13:37 +02:00
Alex Moreno 545f7c8039 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 14:11:15 +02:00
Alex Moreno fa60467e76 fix(claim): small details 2024-08-01 10:51:13 +02:00
Alex Moreno 3a64929c05 feat(VnLocation): onCityCreated refresh provinces 2024-08-01 10:35:33 +02:00
Carlos Satorres 8d8bd095f6 Merge branch 'dev' into 7355-accountMigration 2024-08-01 08:15:21 +00:00
Alex Moreno 0b7c8c41d2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-01 10:12:56 +02:00
Alex Moreno 5f6eeb77ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-01 10:12:41 +02:00
Carlos Satorres 68e4831ea5 refs #7355 fix conflicts 2024-08-01 09:56:54 +02:00
Carlos Satorres 2d467016b2 refs #7355 fix roles 2024-08-01 09:51:18 +02:00
Alex Moreno d9fb0d9186 nullishToTrue fn 2024-08-01 09:47:38 +02:00
Jorge Penadés 351c2a07dc chore: refs #4074 wip replace useRole for useAcl 2024-08-01 09:15:35 +02:00
Alex Moreno 5233c1455a refactor: refs #7679 better way to update model 2024-07-31 14:57:25 +02:00
Guillermo Bonet f09308d956 fix: refs #7413 No id tag 2024-07-31 12:50:34 +02:00
Carlos Satorres ed032badac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-31 09:37:20 +02:00
Carlos Satorres e41078b973 refs #7355 traduccions 2024-07-31 08:34:31 +02:00
Alex Moreno 287abcf90c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-31 08:10:30 +02:00
Alex Moreno 2ad72c3209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-31 08:01:44 +02:00
Jon Elias 68ce5880dd refactor: refs #7717 deleted useless code 2024-07-31 07:35:59 +02:00
Carlos Satorres 5b214b58ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-31 07:22:43 +02:00
Jon Elias cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 14:33:28 +02:00
Alex Moreno ed110beda6 Merge branch 'dev' into 6943-customer_migration_subsection 2024-07-30 11:33:11 +00:00
Jon Elias 7e3bfce732 fix: refs #7717 fix basic data form & minor errors 2024-07-30 13:31:12 +02:00
Jorge Penadés 3bb261376d chore: refs #6449 refactor model-value text 2024-07-30 13:16:45 +02:00
Alex Moreno 108ffbe7a8 Merge branch 'master' into 7679-hotFix_vnLocation 2024-07-30 11:12:10 +00:00
Alex Moreno ecb201edce delete unnesessary class 2024-07-30 12:45:18 +02:00
Jorge Penadés df907a7280 fix: refs #6449 fix summaryId 2024-07-30 12:43:26 +02:00
Carlos Satorres 7ff20f3064 hotFix: supplierList correct filter 2024-07-30 11:50:23 +02:00
Jorge Penadés 1fe2ba7f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName 2024-07-30 09:52:29 +02:00
Jon Elias 2cd696aeb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 08:03:46 +02:00
Alex Moreno b5cb28a0cf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-30 07:47:46 +02:00
Alex Moreno 9179e13dcd fix: vnLocation 2024-07-29 15:03:21 +02:00
Jorge Penadés 839af6d50c fix: refs #6989 show entity name & default time from config table 2024-07-29 13:41:44 +02:00
Jorge Penadés 979b3b2a6c fix: refs #7197 drop character 2024-07-29 08:46:47 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-29 08:04:51 +02:00
Jon Elias be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:56:27 +02:00
Jon Elias 4d7fe0fd86 fix: refs #7717 fix volume and lines redirect 2024-07-26 14:56:26 +02:00
Alex Moreno f079ba4022 hotFix: twoFactor add required import 2024-07-26 14:51:22 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Jon Elias 4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:09:10 +02:00
Jon Elias d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style 2024-07-26 14:09:09 +02:00
Robert Ferrús bfbe4d64b3 Merge branch 'master' into 7039-hotFixSupplierSummary 2024-07-26 11:59:32 +00:00
Guillermo Bonet 7b13250a16 Merge branch 'test' into dev 2024-07-26 13:57:11 +02:00
Guillermo Bonet 621de11890 fix: refs #6769 Requested changes 2024-07-26 13:14:45 +02:00
Guillermo Bonet 48e133ffc7 fix: refs #6769 Fix worker images 2024-07-26 13:00:55 +02:00
Robert Ferrús d4ff3ab993 fix: refs #7039 supplierSummary 2024-07-26 12:55:36 +02:00
Guillermo Bonet 86ab161302 fix: refs #6769 Fixes item diary 2024-07-26 12:37:53 +02:00
Alex Moreno 21b642a7c5 typo 2024-07-26 12:15:57 +02:00
Carlos Satorres f4c0288ca0 refs #6898 filters sortby 2024-07-26 12:01:46 +02:00
Carlos Satorres 1ad15869e8 refs #6898 filters select 2024-07-26 11:45:13 +02:00
Carlos Satorres d575c3cdae refs #6898 filters 2024-07-26 11:25:44 +02:00
Jon Elias 7c5f5aee77 Merge branch 'dev' into 7553_FixTicketExpedition 2024-07-26 09:25:37 +00:00
Jon Elias 1dace39882 refactor: refs #7553 changed isScanned field & fixed cardDescriptor warning 2024-07-26 11:24:40 +02:00
Jon Elias 2ab7d48b0c feat: refs #7553 added VnTable in Expedition, new field & minor changes in rest of section 2024-07-26 09:55:24 +02:00
Alex Moreno 28e50512ba remove console.log 2024-07-26 09:51:46 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00
Pablo Natek 81463cf129 Merge branch 'dev' into 7401-add-option-on-descriptor-menu 2024-07-26 07:46:32 +00:00
Pablo Natek 2d8eecca1c fix: refs #7401 fix routeForm 2024-07-26 09:46:00 +02:00
Pablo Natek ed60793381 fix: refs #7401 remove console.log 2024-07-26 09:42:53 +02:00
Pablo Natek eae2144e1d feat: refs #7401 add menu options 2024-07-26 09:41:47 +02:00
Alex Moreno c5927f14c3 warmFix: rollback VnRow 2024-07-26 09:27:38 +02:00
Carlos Satorres 2f617f4b92 passwordAccount 2024-07-26 09:09:38 +02:00
Javier Segarra 662ffeac0a fix: minor changes 2024-07-26 07:44:46 +02:00
Javier Segarra a27ac46f9f fix: disable firstInput.focus 2024-07-26 06:21:39 +02:00
William Buezas 7432396cea Ticket expedition initial load fix 2024-07-25 13:55:41 -03:00
Javier Segarra 1a9cdee838 fix: remove columnFilter 2024-07-25 15:12:15 +02:00
Javier Segarra 6bba14cac9 test: e2e fixed 2024-07-25 14:31:31 +02:00
Carlos Satorres 8b2b618d35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-25 12:42:34 +02:00
Javier Segarra ebbe6ef3b1 feat: add customfilter label 2024-07-25 12:36:16 +02:00
Javier Segarra 60708f4a6c feat: improve qFormMixin in production environment 2024-07-25 12:36:04 +02:00
Javier Segarra aef83b7e9a feat: modify myentries filters 2024-07-25 12:35:47 +02:00
Jon Elias 2de11d3ecf Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-25 08:07:26 +00:00
Jon Elias 4188569908 feat: refs #7500 added VnImg to show files 2024-07-25 10:03:20 +02:00
Alex Moreno 454c229f13 hotFix: try to fix myEntries 2024-07-25 09:53:59 +02:00
Alex Moreno 687262e78c hotFix: try to fix myEntries 2024-07-25 09:50:30 +02:00
Jon Elias 8ceee6f182 fix: fix conflicts 2024-07-25 07:06:27 +02:00
Alex Moreno f0be377951 hotFix: try to fix myEntries 2024-07-24 20:52:14 +02:00
Alex Moreno 3dd6bf8802 hotFix: try to fix myEntries 2024-07-24 20:48:05 +02:00
Alex Moreno f18bc80c0b hotFix: try to fix myEntries 2024-07-24 20:44:55 +02:00
Alex Moreno 80f34edb66 hotFix: try to fix myEntries 2024-07-24 20:41:34 +02:00
Alex Moreno 38de6867b7 hotFix: try to fix myEntries 2024-07-24 20:38:25 +02:00
Alex Moreno e3204e0ce3 hotFix: try to fix myEntries 2024-07-24 20:34:09 +02:00
Alex Moreno c926b047e2 hotFix: try to fix myEntries 2024-07-24 20:29:52 +02:00
Alex Moreno c904f7f88b hotFix: try to fix myEntries 2024-07-24 20:25:46 +02:00
Alex Moreno f88ec2a2ae hotFix: try to fix myEntries 2024-07-24 20:22:31 +02:00
Alex Moreno 29299970f4 hotFix: try to fix myEntries 2024-07-24 20:19:55 +02:00
Alex Moreno 369736f362 hotFix: try to fix myEntries 2024-07-24 20:17:23 +02:00
Alex Moreno 68c4c93f9f hotFix: try to fix myEntries 2024-07-24 20:14:45 +02:00
Alex Moreno 3d6ba060c2 hotFix: try to fix myEntries 2024-07-24 20:10:50 +02:00
Alex Moreno 64a62ca208 hotFix: try to fix myEntries 2024-07-24 20:10:18 +02:00
Alex Moreno 3023d83739 hotFix: myEntries 2024-07-24 20:00:02 +02:00
Alex Moreno ae5ec1328b hotFix: myEntries 2024-07-24 19:55:13 +02:00
Javier Segarra 3a0204d27b feat: vnLocation changes 2024-07-24 14:58:51 +02:00
Carlos Satorres 2e56100623 refs #6898 fix 2024-07-24 11:36:00 +02:00
Jon Elias 3a9116987c Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-24 08:35:24 +00:00
Jon Elias cc518d5a80 perf: refs #7717 right menu filter 2024-07-24 10:33:22 +02:00
Alex Moreno 4d8ba2bca0 Merge branch 'dev' into 6943-fixCustomer 2024-07-24 05:52:29 +00:00
Javier Segarra 6c7509856e Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 21:08:56 +00:00
Javier Segarra 2c0b215023 Merge branch 'dev' into 6943-fixCustomer 2024-07-23 18:44:08 +00:00
Javier Segarra e013e5571d perf: use ref at component start 2024-07-23 20:18:53 +02:00
Javier Segarra 1ac0a85969 updates 2024-07-23 15:09:42 +02:00
Alex Moreno e6709db3a2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-23 14:46:44 +02:00
Alex Moreno 38437aa2f9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-23 14:46:27 +02:00
Alex Moreno db3813ccf0 warmFix: orderBy tableActions false 2024-07-23 14:46:05 +02:00
Alex Moreno eb90fe359f fix: customer defaulter add amount order 2024-07-23 14:03:45 +02:00
Jon Elias a7a1b7801c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-07-23 13:25:58 +02:00
Jon Elias 12370b6437 feat: refs #6346 new wagon type section 2024-07-23 13:22:54 +02:00
Carlos Satorres 369e730670 refs #7355 fix search exprBuilder 2024-07-23 13:03:12 +02:00
Alex Moreno 0cd42e6fac Merge branch 'dev' into 6943-fixCustomer 2024-07-23 09:47:01 +00:00
Jon Elias ce6a94bab8 fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) 2024-07-23 11:46:21 +02:00
Jon Elias 67275e435e refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality 2024-07-23 10:38:45 +02:00
Alex Moreno 451619fb88 hotFix(VnTable): add ctrl + click 2024-07-23 10:09:42 +02:00
Alex Moreno ad87fd8311 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:36:23 +02:00
Jon Elias e76d8bf269 fix: fix conflicts 2024-07-23 09:15:06 +02:00
Jon Elias a3256c7dc8 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:53 +02:00
Alex Moreno ca9425cfb7 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:14:22 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Jon Elias 33ad8fcb9d refactor: refs #7014 improved route.js & deleted RouteMain 2024-07-23 09:12:00 +02:00
Alex Moreno c7d54668e6 hotfix(entry_latest-buys): refs #6897 redirect to entry 2024-07-23 08:45:54 +02:00
Jon Elias 92b053013f Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 06:18:17 +00:00
Carlos Satorres b4f801e328 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-23 07:26:51 +02:00
Pablo Natek 1a091e5b5a Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters 2024-07-22 17:50:59 +02:00
Pablo Natek 3ceb0771a7 fix: refs #7129 remove templates 2024-07-22 17:50:58 +02:00
Pablo Natek f2b56c92c6 Merge branch 'test' into 7129-fixFilters 2024-07-22 15:37:35 +00:00
Javier Segarra 368b8404fa updates: OrderCatlago 2024-07-22 15:13:03 +02:00
Pablo Natek 5f0c4fea3c feat: refs #7129 add e2e 2024-07-22 13:19:41 +02:00
Jon Elias def3ca33a2 fix: refs #7717 fixed searchbar filter with rightmenu filters' applied 2024-07-22 12:52:58 +02:00
Pablo Natek 6f959ff99c fix: refs #7129 fix filters 2024-07-22 09:18:53 +02:00
Pablo Natek af6a20729b fix: refs #7129 fixFilters 2024-07-22 09:12:56 +02:00
Guillermo Bonet 0a431ef5cb Merge branch 'test' into dev 2024-07-22 08:20:16 +02:00
Guillermo Bonet 580777af65 Deleted repeated labeler i18n 2024-07-22 08:20:08 +02:00
Jon Elias 02e1de083a fix: duplicate key 2024-07-19 15:00:05 +02:00
Jon Elias eb2df02ad6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-19 14:55:09 +02:00
Jon Elias 7f376c8ea4 fix: refs #7717 fix catalog filter, searchbar redirect and search 2024-07-19 14:53:44 +02:00
Guillermo Bonet 76517d102d Merge branch 'test' into dev 2024-07-19 13:09:19 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test 2024-07-19 13:08:41 +02:00
Guillermo Bonet 50c8b3c672 fix: refs #7648 Fix order property 2024-07-19 13:07:30 +02:00
Javier Segarra 569b86c2c1 Merge branch 'master' into 7648_myEntries 2024-07-19 10:27:57 +00:00
Jon Elias e60f846464 refactor: refs #7354 fix tableFilters 2024-07-19 12:11:00 +02:00
Alex Moreno 1de9462003 Merge branch 'dev' into 7547-accessToken-security 2024-07-19 07:50:06 +00:00
Javier Segarra bcde62afb5 Merge branch 'dev' into 6943-fixCustomer 2024-07-19 07:41:55 +00:00
Jon Elias daa4a41f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-19 09:25:28 +02:00
Javier Segarra 55c8de78fc perf: VnFilterPanel 2024-07-19 09:20:33 +02:00
Jon Elias 89aa987c58 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-19 06:20:57 +00:00
Jon Elias 26cdae2384 refactor: refs #7323 hidden column filter proposal 2024-07-19 08:18:41 +02:00
Alex Moreno dbe56fa3a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-19 08:02:58 +02:00
Alex Moreno 9b1636355d fix: customerNotifications filter 2024-07-19 07:58:34 +02:00
Jon Elias 6f6ab74220 Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-19 07:42:59 +02:00
Jon Elias f171774605 fix: refs #7323 fixed left filter 2024-07-19 07:42:58 +02:00
Javier Segarra 7cbc52d700 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-18 15:21:01 +02:00
Javier Segarra 7cbdf0d98b feat: fix bugs and filters 2024-07-18 15:20:44 +02:00
Alex Moreno 3fe566796b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-18 14:01:28 +02:00
Alex Moreno f8026dd3f6 feat: improve VnSelectCache add find by Object 2024-07-18 13:54:22 +02:00
Alex Moreno 5833b4d856 fix(VnTable): autoload when has url parameters 2024-07-18 13:53:57 +02:00
Jon Elias 4495223735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-18 13:03:53 +02:00
Jon Elias f4fa9b3c1f Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 10:14:26 +00:00
Jon Elias 4a544b0b6c Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-18 12:13:39 +02:00
Jon Elias 901a9e1f6d fix: refs #7323 fix department & email table filter 2024-07-18 12:13:38 +02:00
Jon Elias 108375bb69 perf: refs #7356 TicketList state column 2024-07-18 12:05:10 +02:00
Jon Elias 78e074d2fb refactor: refs #7356 requested changes 2024-07-18 10:53:44 +02:00
Javier Segarra b24c7b0352 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-18 10:21:42 +02:00
Alex Moreno 71d6e57ea5 Merge branch 'dev' into 6943-fixCustomer 2024-07-18 06:26:19 +00:00
Alex Moreno 83596daf76 fix: customerDefaulter correct functionality 2024-07-18 08:19:08 +02:00
Javier Segarra ac89c4f328 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 05:49:58 +00:00
Javier Segarra ebf329bfc6 feat: addRow withour dialog 2024-07-17 20:33:55 +02:00
Jon Elias b2b613a1d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 14:58:25 +02:00
Alex Moreno ea5fef9d7f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-17 14:19:25 +02:00
Alex Moreno 1c006a278e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-17 14:19:08 +02:00
Alex Moreno 3999d93268 fix(WorkerTimeControl): url 2024-07-17 14:17:00 +02:00
Alex Moreno 725b7053f7 fix(workerTimeControl): correct request 'updateMailState' 2024-07-17 13:32:04 +02:00
Jon Elias a544ea224b Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 13:02:22 +02:00
Jon Elias 1e959307d8 refactor: refs #7356 fixed VnTable filters 2024-07-17 13:02:21 +02:00
Javier Segarra 0e5e7c3fda feat: with VnTable 2024-07-17 12:07:50 +02:00
Javier Segarra 9fe09bcffc Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-17 11:45:56 +02:00
Javier Segarra 7662e1a9a1 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-17 11:45:31 +02:00
Jon Elias 0d60f63771 Merge branch 'dev' into 7356_TicketMigration_End 2024-07-17 06:52:42 +00:00
Jon Elias cb610608df feat: refs #7356 list & weekly to VnTable and style fixes 2024-07-17 08:49:38 +02:00
Jon Elias 9e78d30a4c Merge branch dev of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-17 07:45:24 +02:00
Alex Moreno c253959e01 feat: customerPayments card view 2024-07-16 14:08:03 +02:00
Alex Moreno 3cd185360b fix: columns style 2024-07-16 14:03:14 +02:00
Javier Segarra c7c6f0f1c6 filter: vnfilterPanel 2024-07-16 13:50:16 +02:00
Javier Segarra 86a84784b1 feat: userPanel 2024-07-16 13:50:07 +02:00
Alex Moreno 90db8b403f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 13:15:17 +02:00
Javier Segarra f7135008a2 feat: entryBuys 2024-07-16 12:22:08 +02:00
Javier Segarra ace529a4ba feat: vnTable template 2024-07-16 12:22:01 +02:00
Javier Segarra 5fbbd27273 fat: i18n 2024-07-16 12:21:50 +02:00
Javier Segarra d467657928 feat: myEntries 2024-07-16 12:21:36 +02:00
Alex Moreno 4f36a78681 feat: curso in start when is 00:00 2024-07-16 12:13:16 +02:00
Javier Segarra 305a06aaee Merge branch 'dev' into 7017_formModel_validations 2024-07-16 09:50:25 +00:00
Javier Segarra fabf9a2024 perf: remove print variables 2024-07-16 11:26:13 +02:00
Javier Segarra 734f8807ff perf: examples 2024-07-16 11:25:28 +02:00
Javier Segarra bd359d13e4 feat: vnInput* 2024-07-16 11:25:21 +02:00
Javier Segarra fb2e3f1f9c feat: required validation 2024-07-16 11:25:06 +02:00
Alex Moreno 9cc11f0a28 variable 2024-07-16 10:18:28 +02:00
Alex Moreno c13f7fe237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inputTime_improviments 2024-07-16 10:11:50 +02:00
Alex Moreno 493081254d feat: improve to set time 2024-07-16 10:11:27 +02:00
Javier Segarra d2a17bc376 Merge branch 'dev' into 7353-MonitorsFixes 2024-07-16 07:28:14 +00:00
Javier Segarra 8798598f41 Merge branch 'dev' into 7017_formModel_validations 2024-07-16 09:26:22 +02:00
Javier Segarra 2620fd2d94 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-16 09:23:18 +02:00
Alex Moreno 4f802a4786 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 07:40:51 +02:00
Javier Segarra da43760688 Merge branch 'dev' into '7353-MonitorFixes' 2024-07-15 15:00:01 +02:00
Alex Moreno b488a013c7 fix(arrayData): reset 2024-07-15 14:55:06 +02:00
Alex Moreno bfa61d9bea refactor: CustomerNotifications use VnTable 2024-07-15 14:54:31 +02:00
Alex Moreno fd11259f74 refactor: CustomerPayments use VnTable 2024-07-15 14:18:21 +02:00
Alex Moreno 81a9719207 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-15 13:13:24 +02:00
Jon Elias 94aa3bc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-15 12:47:59 +02:00
Jon Elias 243a8cbdc6 fix: refs #7323 fix workerTimeControl form 2024-07-15 12:42:14 +02:00
Alex Moreno ea3effd7f4 feat: VnInputDate & VnInputTime improviments 2024-07-15 12:33:58 +02:00
Alex Moreno 1ccf515509 fix: editable columns 2024-07-15 12:33:33 +02:00
Javier Segarra be86b69079 fix: ticket menu order and i18n 2024-07-15 11:53:10 +02:00
Javier Segarra 5d58676288 Merge branch 'dev' into feature/TicketAdvanceFilter 2024-07-15 09:31:22 +00:00
Javier Segarra 8ea1fb6793 Merge branch 'dev' into feature/TicketDms 2024-07-15 09:30:10 +00:00
Javier Segarra c56610515c Merge branch 'dev' into TicketDms 2024-07-15 11:29:27 +02:00
Pablo Natek 35a165b9f3 Merge branch 'dev' into 7129-finishMigration 2024-07-15 09:25:52 +00:00
Javier Segarra ae55983405 Merge branch 'dev' into feature/SaleTracking 2024-07-15 09:23:53 +00:00
Javier Segarra a779853095 Merge branch 'dev' into 7648_myEntries_filter 2024-07-15 09:22:46 +00:00
Jon Elias c016e96904 fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests 2024-07-15 10:44:28 +02:00
Pablo Natek a4f11fb497 Merge branch 'dev' into 7129-finishMigration 2024-07-15 08:42:30 +00:00
Pablo Natek 9a115dac3c Merge branch '7129-finishMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-15 10:42:12 +02:00
Pablo Natek 6007e0c7cc fix: refs #7129 fix e2e 2024-07-15 10:42:11 +02:00
Alex Moreno cc8062785a Merge branch 'dev' into feature/SaleTracking 2024-07-15 08:17:01 +00:00
Alex Moreno 3f3d0c7337 fix(claimList): claimList client column 2024-07-15 09:39:57 +02:00
Javier Segarra d84fd34c4b Merge branch 'dev' into 7648_myEntries_filter 2024-07-15 07:38:45 +00:00
Pablo Natek fea9c8b7fb Merge branch 'dev' into 7129-finishMigration 2024-07-15 07:37:15 +00:00
Alex Moreno dbba7589ef fix: VnBreadcrumbs return if not has matched 2024-07-15 08:32:53 +02:00
Alex Moreno a4afba6000 Merge branch 'dev' into 6825-vnSelectCache 2024-07-15 05:19:53 +00:00
Alex Moreno b3d14ebeee fix: order left panel 2024-07-15 07:11:02 +02:00
Javier Segarra dbe6e86ba7 ticketComponent i18n 2024-07-13 00:06:33 +02:00
Javier Segarra 1e668d1fbd Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 20:42:05 +00:00
Javier Segarra 7f7bf9c0e6 feat: remove empty locales 2024-07-12 22:40:34 +02:00
Javier Segarra 20403287dd feat: scopeDays replace by daysOnward 2024-07-12 22:38:38 +02:00
Javier Segarra 65381e6536 perf: #7648 remove default value 2024-07-12 22:38:23 +02:00
Javier Segarra fceeaea1f5 feat: replace stickyButtons by subtoolbar 2024-07-12 15:22:29 +02:00
Alex Moreno bfab1ec314 useAttrs 2024-07-12 14:13:35 +02:00
Alex Moreno b30da92c1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnSelectCache 2024-07-12 14:09:06 +02:00
Alex Moreno 3087dbf512 fix(CrudModel): onChange $index 2024-07-12 14:02:29 +02:00
Guillermo Bonet 9494a30ddd feat: refs #7704 Added min quantity label in catalog 2024-07-12 13:59:03 +02:00
Alex Moreno 904acfd48f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-12 13:37:04 +02:00
Alex Moreno 73c5e0f1f4 fix: formModelPoup defaultActions false 2024-07-12 13:34:31 +02:00
Javier Segarra 4cbca1ca64 feat: showdate icons 2024-07-12 13:13:50 +02:00
Javier Segarra 5518fa98e0 perf: remove icons in header slot 2024-07-12 13:13:37 +02:00
Jon Elias 74c36a28b2 fix: workerCreate form street field to be always upperCase 2024-07-12 13:05:46 +02:00
Alex Moreno 58d029c5bb fix(vnTable_order): default value 2024-07-12 13:03:49 +02:00
Pablo Natek eaea8a50f0 fix: refs #7129 fix styles 2024-07-12 11:49:37 +02:00
Carlos Satorres f7d0b30eb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration 2024-07-12 11:47:31 +02:00
Alex Moreno de814f9881 Merge branch 'dev' into 6825-vnSelectCache 2024-07-12 09:20:02 +00:00
Alex Moreno a77bf93e0d feat: create VnSelectCache and add in VnColumn 2024-07-12 11:19:37 +02:00
Javier Segarra 7ddf84ac11 Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 11:09:01 +02:00
Alex Moreno 79928910ca Merge branch 'dev' into 6825-improve-css 2024-07-12 09:02:42 +00:00
Pablo Natek a736867e6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration 2024-07-12 11:02:41 +02:00
Javier Segarra 1d4454604b Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 10:51:19 +02:00
Pablo Natek 72b86c0eec remove: refs #7129 remove console log 2024-07-12 10:43:15 +02:00
Pablo Natek 9098e63793 refactor: refs #7129 refactor with vnTable 2024-07-12 10:41:18 +02:00
Guillermo Bonet 686bbc26bd Merge branch 'dev' into 6769-itemDiary 2024-07-12 08:02:11 +00:00
Guillermo Bonet 3e0c495f97 Merge branch 'dev' into 7704-itemMinimalQuantity 2024-07-12 07:43:04 +00:00
Carlos Satorres fc3fc27461 refs #7355 fix list 2024-07-12 09:33:32 +02:00
Jon Elias a4a9572c96 feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate 2024-07-12 09:16:32 +02:00
Alex Moreno b41dc28fde fix(VnTable): check column skipped only onMounted 2024-07-12 09:08:37 +02:00
Alex Moreno e1049f660e fix(VnTable): max-width vn-select 2024-07-12 08:33:44 +02:00
Alex Moreno b4853af69d fix(VnTable): max-width vn-select 2024-07-12 08:33:06 +02:00
Alex Moreno ada666a26c feat(VnTable): improve css columns 2024-07-12 08:23:18 +02:00
Javier Segarra b770567036 Merge branch 'dev' into warmfix_ticketList 2024-07-12 05:39:12 +00:00
Guillermo Bonet dc20b7f027 Merge branch 'dev' into 6769-itemDiary 2024-07-12 05:20:10 +00:00
Alex Moreno a2bb9bdf32 Merge branch 'dev' into warmfix_ticketList 2024-07-12 04:59:00 +00:00
Javier Segarra 68192e5074 perf: onRowchange 2024-07-12 01:20:36 +02:00
Javier Segarra e862a6534b Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-12 00:28:23 +02:00
Javier Segarra 77c7a9e03a feat: remove future itemFixedPrices 2024-07-12 00:26:45 +02:00
Javier Segarra 8a4b3302cf feat: add row 2024-07-11 23:45:59 +02:00
Javier Segarra 73049f7282 add new filter by days 2024-07-11 19:56:37 +02:00
Alex Moreno fdb8f92a10 typo 2024-07-11 15:05:21 +02:00
Alex Moreno 5232df2595 feat: claimList better support vnTable, claimSummary redesign. 
BREAKING CHANGE: VnTable default-mode table
 2024-07-11 15:03:39 +02:00
Guillermo Bonet 8fad2f1a27 Merge branch 'dev' into 7704-itemMinimalQuantity 2024-07-11 11:36:32 +00:00
Javier Segarra 4a12fd08e0 feat: handle dates 2024-07-11 12:29:48 +02:00
Alex Moreno d005fa3787 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable-orderColumn 2024-07-11 10:37:29 +02:00
Alex Moreno b3570878bf fix(VnTable): moreFilterPanel slot 2024-07-11 10:30:54 +02:00
Alex Moreno fd6b395f34 feat(VnTable): order column 2024-07-11 10:22:02 +02:00
Javier Segarra 8018a3ac46 fix: options QDate 2024-07-11 10:13:50 +02:00
Javier Segarra f038f0a60f Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-11 09:54:19 +02:00
Guillermo Bonet b1e6e725cf feat: refs #7704 Deleted minQuantity label 2024-07-11 08:50:10 +02:00
Jon Elias 74bc4eb7db refactor: refs #7354 reverse deliveryPanel changes 2024-07-11 07:13:54 +02:00
Javier Segarra a9bab6ab2c feat: show bad dates 2024-07-11 06:16:51 +02:00
Jon Elias d7f8b11da7 fix: refs #7354 requested changes 2024-07-10 15:40:38 +02:00
Javier Segarra 3f1c0b95fa fix: proposal to avoid notify error 2024-07-10 15:03:25 +02:00
Carlos Satorres 29405a8771 refs #7355 remove spaces 2024-07-10 14:55:55 +02:00
Carlos Satorres 06f88c8cb3 refs #7355 fix alias summary 2024-07-10 13:36:08 +02:00
Guillermo Bonet 5a4be3de4a feat: refs #6769 Requested changes 2024-07-10 13:09:35 +02:00
Javier Segarra 9077c1651b perf: width SalesTicketsTable 2024-07-10 12:25:30 +02:00
Javier Segarra 5ad317df65 feat: VnTable SalesTicketTable 2024-07-10 12:19:17 +02:00
Javier Segarra 167ba2aed0 perf: LeftMenu show/hide 2024-07-10 12:19:05 +02:00
Guillermo Bonet 3b43505c3e feat: refs #6769 Requested changes 2024-07-10 12:07:01 +02:00
Guillermo Bonet f701b6387a Merge branch 'dev' into 6769-itemDiary 2024-07-10 12:05:26 +02:00
Javier Segarra 85f94fa1f4 feat: salesTicketTable 2024-07-10 10:41:39 +02:00
Javier Segarra 44294bb46a feat: salesOrderTable 2024-07-10 09:56:37 +02:00
Jon Elias d86915fdd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-10 09:42:10 +02:00
Jon Elias 8913c6a31b fix: refs #7354 fix VnTable filters and agency field 2024-07-10 09:37:32 +02:00
Javier Segarra f45b623f24 feat: SalesClientTable 2024-07-10 09:25:15 +02:00
Jon Elias 6a4161de66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-10 08:53:16 +02:00
Javier Segarra 93076f459c Actualizar src/pages/Ticket/TicketList.vue 2024-07-09 19:33:48 +00:00
Javier Segarra 4b720d9b67 warmfix: ticketList add imports 2024-07-09 19:33:02 +00:00
Javier Segarra 5e53a7d9a0 Merge branch 'dev' into 7353-MonitorsFixes 2024-07-09 20:41:16 +02:00
Javier Segarra e23a30c693 feat: handle dates 2024-07-09 16:05:19 +02:00
Alex Moreno 36fc988df2 fix(VnTable): visible if is nullish 2024-07-09 14:56:27 +02:00
Javier Segarra 32d11edb2f updates 2024-07-09 14:34:38 +02:00
Alex Moreno c10f62b717 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-09 14:21:42 +02:00
Alex Moreno 58a2a32027 warmFix(workerDescriptor): ?. 2024-07-09 14:21:41 +02:00
Jon Elias 24368d99b5 fix: refs #6896 fixed list & lines error 2024-07-09 14:09:04 +02:00
Jon Elias 0b135bbd52 fix: refs #7354 fix delivery days 2024-07-09 12:54:42 +02:00
Jon Elias 8c744fac5a refactor: refs #7354 Zone migration changes 2024-07-09 12:51:01 +02:00
Carlos Satorres c7952092ad remove log 2024-07-09 12:20:31 +02:00
Javier Segarra f347755ea5 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-09 12:19:59 +02:00
Javier Segarra 2dc75db122 feat: unnecessary changes 2024-07-09 12:11:10 +02:00
Carlos Satorres c61cf2d4bf refs #6897 fix entry summary 2024-07-09 12:09:38 +02:00
Javier Segarra 4df52d2692 Merge branch 'dev' into 6772_reload_sections 2024-07-09 11:51:16 +02:00
Alex Moreno 1978157a08 fix: props 2024-07-09 11:43:32 +02:00
Alex Moreno bb8f0b43f0 Merge branch 'dev' into 6336-migrationClaim-v5 2024-07-09 09:27:16 +00:00
Alex Moreno 66a5516116 warmFix: delete params.filter url query 2024-07-09 10:34:15 +02:00
Javier Segarra 38dd54b2f5 fix: i18n components 2024-07-09 10:18:01 +02:00
Javier Segarra 4eaab6f4ae fix warning when quasar build 2024-07-09 10:07:22 +02:00
Javier Segarra a9e19309ee fix warning 2024-07-09 09:59:39 +02:00
Javier Segarra c5c96bf51b Merge branch 'dev' into feature/SaleTracking 2024-07-09 09:41:45 +02:00
Javier Segarra 3f2b675d07 feat: change ticketDms leftMenuItem position 2024-07-09 09:15:20 +02:00
Javier Segarra cededb54e8 Merge branch 'dev' into feature/TicketDms 2024-07-09 09:14:40 +02:00
Javier Segarra 6482dbad22 fix: TicketDmsImportForm 2024-07-09 09:13:44 +02:00
Carlos Satorres 31056ea5c9 refs #7355 fix lists redirects summary 2024-07-09 07:56:38 +02:00
Javier Segarra 6bd119abc3 Merge branch 'dev' into 6896_Order_End 2024-07-08 13:01:34 +00:00
Javier Segarra 20eb26127a fix: Right menu double icon 2024-07-08 15:00:45 +02:00
Javier Segarra 286fbc5aba fix: Right menu double icon 2024-07-08 14:59:12 +02:00
Alex Moreno 092909512a feat(ClaimSummary): add workerDescriptor in development 2024-07-08 14:25:50 +02:00
Alex Moreno 75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 14:25:01 +02:00
Javier Segarra 339fba72a7 updates 2024-07-08 14:15:24 +02:00
Alex Moreno b23915ea2d fix: vnTable filter class 2024-07-08 14:14:24 +02:00
Alex Moreno 54ca806ad9 Merge branch '6825-visibleColumns' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns 2024-07-08 13:51:57 +02:00
Alex Moreno dd872dba3b fix: areAllChecksMarked 2024-07-08 13:51:56 +02:00
Alex Moreno 4588897752 Merge branch 'dev' into 6825-visibleColumns 2024-07-08 11:47:23 +00:00
Alex Moreno 4a8493f035 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns 2024-07-08 13:25:14 +02:00
Alex Moreno 41deb82174 feat(VnTable): add visibleColumns 2024-07-08 13:23:42 +02:00
Jon Elias 960c011024 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-08 13:16:06 +02:00
Jon Elias e70adce488 feat: refs #7323 fix descriptors, added VnTable and minor changes 2024-07-08 13:15:14 +02:00
Javi Gallego 32d2087bce feat: #7348 restore template 2024-07-08 12:56:34 +02:00
Javi Gallego 815a544244 Merge branch 'dev' into 7348-client-hasDailyInvoice 2024-07-08 12:44:06 +02:00