0
0
Fork 0
Commit Graph

6784 Commits

Author SHA1 Message Date
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 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
Alex Moreno 7357559c48 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-21 07:32:21 +01:00
Javier Segarra c86dbcb456 Merge branch 'dev' into fix_customerList_departmentCode 2025-01-20 22:13:30 +00:00
Javier Segarra 0b52be2568 Merge branch 'dev' into Fix-TicketServicesSortByName 2025-01-20 21:33:13 +00:00
Javier Segarra c0144e78c4 Merge branch 'dev' into warning_defaultValue_firstParam 2025-01-20 17:29:21 +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
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
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 bdae839e50 fix: refs #7936 toggle option 2025-01-20 12:56:40 +01:00
Javier Segarra c3203b18e7 Merge branch 'master' into hotfix_checbox_css 2025-01-20 11:17:58 +00:00
Carlos Satorres a3cdb18535 fix: fix use-like 2025-01-20 12:04:59 +01:00
Jorge Penadés ae68f25c3c fix: refs #7936 rollback 2025-01-20 11:55:49 +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
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
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
Javier Segarra 7b42fac56c Merge branch 'dev' into warning_defaultValue_firstParam 2025-01-20 07:05:01 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order 2025-01-20 08:01:46 +01:00
Pau Rovira c4cf372333 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 13:54:22 +00:00
Javier Segarra 238817285d perf: remove warning default value 2025-01-17 12:35:14 +00:00
Pau Rovira 6d4405c1fe Merge branch 'dev' into 8258-uppercaseInputs 2025-01-17 12:19:46 +00:00
Pau Rovira 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
Javier Segarra 92311accb0 Merge branch 'master' into hotfix_checbox_css 2025-01-17 12:33:37 +01:00
Javier Segarra 7994f3c791 fix: remove departmentCode 2025-01-17 11:13:37 +00: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 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
Pau Rovira 98cdf00c88 Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-17 06:16:36 +00: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
Pau Rovira e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-16 11:41:04 +00:00
Pau Rovira 4b3c78dd65 fix: refs #8243 fixed SkeletonSummary 2025-01-16 12:40:28 +01:00
Alex Moreno 755fca504d Merge branch 'master' into 7936-hotfix-allowNegative 2025-01-16 11:06:49 +00:00