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

5414 Commits

Author SHA1 Message Date
Javier Segarra d4fecd8d85 Merge branch 'dev' into 6321_negative_tickets 2025-01-21 23:44:12 +01:00
Alex Moreno 7054ad1d40 feat: refs #7196 update vite and q-calendar 2025-01-21 14:15:57 +01:00
Alex Moreno 350dedd78d feat: refs #8316 add slots on VnTable from VnFilterPanel 2025-01-21 13:19:46 +01:00
Alex Moreno aee29345a5 build: refs #8316 merge dev 2025-01-21 13:05:55 +01:00
Alex Moreno ed5ce3c459 fix: refs #8322 add userFilter 2025-01-21 12:50:30 +01:00
Alex Moreno 5c593697b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8322-travel 2025-01-21 12:45:00 +01:00
Alex Moreno a2499f11e1 Merge branch 'dev' into 8197-fix_filters 2025-01-21 10:45:42 +00:00
PAU ROVIRA ROSALENY 0f64477763 fix: refs #8395 update label for total column 2025-01-21 10:08:26 +01:00
PAU ROVIRA ROSALENY 1fbcd0ccd5 Merge branch '8395-invoiceInVatTotal' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal 2025-01-21 10:04:21 +01:00
PAU ROVIRA ROSALENY 402b2882da feat: refs #8395 added computed to calculate and display amounts 2025-01-21 10:04:18 +01:00
PAU ROVIRA ROSALENY e169031c19 Merge branch 'dev' into 8395-invoiceInVatTotal 2025-01-21 09:03:26 +00:00
Jon Elias 7c91869c8b Merge branch 'dev' into Fix-InvoiceInDescriptorDialog 2025-01-21 07:51:35 +00:00
Alex Moreno bee5a1e82d Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-21 06:49:28 +00:00
Javi Gallego 545cb19dce feat: refs #8381 add initial and final temperature labels in English and Spanish locales 2025-01-21 07:46:14 +01:00
Javi Gallego d21e11cc3d Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:44 +01:00
Javi Gallego 45c4e08191 Merge branch 'dev' into 8381-entryTemperature 2025-01-21 07:45:20 +01:00
Alex Moreno 1feb26bd6d Merge branch 'dev' into 8197-fix_filters 2025-01-21 06:37:59 +00:00
Alex Moreno 3cb21d7117 fix: use entryFilter 2025-01-21 07:34:48 +01:00
Alex Moreno 824b60df57 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-21 07:33:09 +01:00
Javier Segarra c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode 2025-01-20 22:13:30 +00:00
Jorge Penadés 0a97d0504b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete 2025-01-20 15:41:55 +01:00
Alex Moreno ce0bfe12d7 Merge branch 'dev' into 8197-advancedMenu 2025-01-20 14:06:22 +00:00
Jon Elias 84dd46b22c Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-20 13:45:43 +00:00
Jon Elias 5a5adbd165 fix: sort by name in description 2025-01-20 14:42:51 +01:00
Jon Elias 7eadb62af7 Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog 2025-01-20 14:39:33 +01:00
Jon Elias f1fb2f9904 fix: fixed rectificative class 2025-01-20 14:39:32 +01:00
Javier Segarra 38d1beff5b feat: refs #6321 updates 2025-01-20 14:37:13 +01:00
Jon Elias f7a3bdf997 Merge branch 'dev' into Fix-InvoiceInDescriptorDialog 2025-01-20 12:54:22 +00:00
Jon Elias 5ed5554495 refactor: move remaining data to descriptorMenu 2025-01-20 13:52:38 +01:00
Carlos Satorres 77857e9d31 Merge branch 'master' into 6898-hotfixFiscalData 2025-01-20 12:47:27 +00:00
Carlos Satorres c7b24adc5a fix: refs #6898 hotfix filter 2025-01-20 13:39:56 +01:00
Jorge Penadés ff14d81f51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8395-invoiceInVatTotal 2025-01-20 13:21:32 +01:00
Jorge Penadés bdae839e50 fix: refs #7936 toggle option 2025-01-20 12:56:40 +01:00
Carlos Satorres a3cdb18535 fix: fix use-like 2025-01-20 12:04:59 +01:00
Jorge Penadés ff95882e42 fix: refs #7936 rollback 2025-01-20 11:51:53 +01:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity 2025-01-20 11:26:57 +01:00
Alex Moreno 58b8b2f7b0 fix: refs #8197 use rightMenu 2025-01-20 10:42:23 +01:00
Jorge Penadés 7795fd1524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-20 10:30:33 +01:00
Jorge Penadés 8843318b66 fix: refs #7936 update select model-value WIP 2025-01-20 10:10:45 +01:00
Alex Moreno bb3ce4f862 fix: refs #8197 use RightMenu in subsections 2025-01-20 10:03:49 +01:00
Javier Segarra 24eaaacb19 feat: refs #6321 updates 2025-01-20 09:43:21 +01:00
Jon Elias ad2e502010 fix: move dialog to descriptorMenu 2025-01-20 08:44:48 +01:00
Jon Elias ed0e4fadf8 Merge branch 'master' into Hotfix-RedirectOrderToTicketSale 2025-01-20 07:06:14 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order 2025-01-20 08:01:46 +01:00
Robert Ferrús e71018866e Merge branch 'dev' into 8398-mergeSendCheckingPresence 2025-01-19 07:38:46 +00:00
Jose Antonio Tubau 957bc34f00 Merge branch 'dev' into 8316-parkingCardWithVnCardBeta 2025-01-17 14:00:24 +00:00
Jose Antonio Tubau fcb34c9309 refactor: refs #8316 added shelvingCardBeta and localizations 2025-01-17 14:58:23 +01:00
PAU ROVIRA ROSALENY c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 13:54:22 +00:00
PAU ROVIRA ROSALENY dd88598072 Merge branch 'dev' into 8395-invoiceInVatTotal 2025-01-17 13:23:18 +00:00
Jose Antonio Tubau f4ac7c1539 Merge branch 'dev' into 8316-itemCardWithVnCardBeta 2025-01-17 13:15:26 +00:00
PAU ROVIRA ROSALENY 57804f9f2d feat: refs #8395 added total column in invoiceInVat 2025-01-17 14:08:36 +01:00
Jose Antonio Tubau 9d32f6af3b refactor: refs #8316 add new localization keys and update existing ones for invoiceOut components 2025-01-17 14:08:14 +01:00
PAU ROVIRA ROSALENY 6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 12:19:46 +00:00
PAU ROVIRA ROSALENY 32909a96bd feat: refs #8258 added uppercase validation on supplier create 2025-01-17 13:19:12 +01:00
Jon Elias 63f433a6d3 Merge branch 'dev' into Fix-RedirectOrderToTicketSale 2025-01-17 12:09:37 +00:00
Jon Elias e1a395b015 refactor: redirect using params 2025-01-17 13:07:30 +01:00
Jose Antonio Tubau 0a7ac85729 Merge branch 'dev' into 8316-itemCardWithVnCardBeta 2025-01-17 13:00:53 +01:00
Jose Antonio Tubau 508b6f226d Merge branch 'dev' into 8316-invoiceOutCardWithVnCardBeta 2025-01-17 11:50:09 +00:00
Jose Antonio Tubau 833c4e1392 refactor: refs #8316 add new localization keys and update existing ones for invoiceOut components 2025-01-17 12:48:03 +01:00
Javier Segarra 7994f3c791 fix: remove departmentCode 2025-01-17 11:13:37 +00:00
Robert Ferrús e25896fa77 feat: refs #8077 sumDefaulter 2025-01-17 12:11:14 +01:00
Jose Antonio Tubau 872cf63b5f Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-17 08:21:17 +00:00
Jose Antonio Tubau c2cbcb3309 refactor: refs #8316 add new localization keys and update existing ones for entry components 2025-01-17 08:58:25 +01:00
PAU ROVIRA ROSALENY 11e05433b8 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 07:40:49 +00:00
Jon Elias 972b377e13 fix: redirect when confirming lines 2025-01-17 07:35:23 +01:00
Alex Moreno a738fe1579 Merge branch 'dev' into 8197-fix_filters 2025-01-17 06:16:53 +00:00
Alex Moreno d95350a8eb perf: refs #8197 fix and imrpove filters 2025-01-16 13:32:12 +01:00
Jon Elias eed895b21c fix: redirect to TicketSale from OrderLines 2025-01-16 13:25:00 +01:00
Javier Segarra 3ab3f146d4 feat: add acl in description button 2025-01-16 12:45:24 +01:00
Jorge Penadés 39adfb3693 fix: refs #8198 update query param 2025-01-16 10:43:40 +01:00
Jorge Penadés 64c4729edb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-16 10:40:50 +01:00
Robert Ferrús a6e3fd3480 Merge branch 'dev' into 8398-mergeSendCheckingPresence 2025-01-16 08:59:19 +00:00
Jorge Penadés ee66704a92 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-allowNegative 2025-01-16 09:53:13 +01:00
PAU ROVIRA ROSALENY 5fef000e02 Merge branch 'dev' into 8322-travel 2025-01-16 08:50:00 +00:00
Jorge Penadés e335322d5f fix: refs #7936 allow negative values 2025-01-16 09:45:15 +01:00
Guillermo Bonet 86169d980c feat: refs #7882 Added coords to create a address 2025-01-16 09:34:12 +01:00
Javi Gallego 8c7747999d feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries 2025-01-16 09:09:05 +01:00
Alex Moreno b5a1d05ff0 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta 2025-01-16 08:11:06 +01:00
Alex Moreno b8c8610781 feat: refs #8316 parking inside shelving 2025-01-16 08:06:16 +01:00
Alex Moreno 885bd631ff Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta 2025-01-16 07:36:20 +01:00
Robert Ferrús 8182bf7b91 feat: refs #8398 modify previous changes 2025-01-16 07:29:37 +01:00
Javier Segarra 442f74fce0 feat: refs #6321 tags 2025-01-16 07:02:13 +01:00
Jorge Penadés 21958cfdb4 fix: catch mail err 2025-01-15 16:10:33 +01:00
Jose Antonio Tubau 80413eef3e refactor: refs #8316 moved localizations to local locale 2025-01-15 15:19:47 +01:00
PAU ROVIRA ROSALENY 0ee3aa12a3 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-15 13:42:01 +00:00
Jose Antonio Tubau 36473d979b feat: refs #7322 add address selection for ticket transfer 2025-01-15 13:38:45 +01:00
Javier Segarra 518dc56eb2 fix: refs #6321 solve conflicts 2025-01-15 13:19:30 +01:00
Robert Ferrús 764eef13c3 feat: refs #8398 moveTicketsFuture 2025-01-15 12:32:46 +01:00
Alex Moreno a95f6f56bd fix: refs #8316 userFilter 2025-01-15 12:17:06 +01:00
Alex Moreno 3f3e8cfe42 Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-15 11:11:49 +00:00
Alex Moreno a153dd8860 fix: refs #8316 use section-searchbar 2025-01-15 12:11:10 +01:00
Alex Moreno 9765066493 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:03:02 +01:00
Jon Elias c193ce33f6 Merge branch 'dev' into 8247-EnableAccount 2025-01-15 10:51:33 +00:00
Alex Moreno 7e0096cf30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 11:50:11 +01:00
Alex Moreno 4c7a35f142 refactor: refs #8316 unify router item and itemType 2025-01-15 10:38:16 +01:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 08:22:56 +00:00
Pablo Natek a7fd073886 fix: update SIM serial number binding in WorkerPda.vue 2025-01-15 08:23:44 +01:00
Javier Segarra 17f067144c Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 07:18:34 +00:00
PAU ROVIRA ROSALENY f8efb9e6e9 Merge branch 'dev' into 8322-travel 2025-01-15 07:14:51 +00:00
PAU ROVIRA ROSALENY c1e2e434ac refactor: refs #8322 changed Travel component to use VnSection/VnCardBeta 2025-01-15 08:14:33 +01:00