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

7166 Commits

Author SHA1 Message Date
Jose Antonio Tubau 096f0c57ba refactor: refs #8380 remove unnecessary stubs in VnImg test wrapper 2025-01-20 14:47:04 +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
Javier Segarra 38d1beff5b feat: refs #6321 updates 2025-01-20 14:37:13 +01:00
Carlos Satorres d8edd443c7 fix: refs #6896 hotfix search 2025-01-20 14:11:42 +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
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
Jon Elias 773c917c20 Merge branch 'dev' into 7068-TableVisibleColumnsTest 2025-01-20 10:43:34 +00:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity 2025-01-20 11:26:57 +01:00
Jon Elias efb0162f9c feat: refs #7068 created VnVisibleColumns unit test 2025-01-20 10:58:49 +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 6965c5ea78 Merge branch 'dev' into update_quasar_version 2025-01-20 08:57:16 +00:00
Alex Moreno 83fb97ad9b feat: refs #8197 create advancedMenu and add in VnSection 2025-01-20 09:51:59 +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
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
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
Javier Segarra 238817285d perf: remove warning default value 2025-01-17 12:35:14 +00: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 92311accb0 Merge branch 'master' into hotfix_checbox_css 2025-01-17 12:33:37 +01:00
Robert Ferrús 8d428bbd13 feat: refs #8077 change request 2025-01-17 12:30:41 +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 6b90a083cb Merge branch 'dev' into 7073-createTestToVnDms 2025-01-17 10:35:06 +00:00
Jose Antonio Tubau 3305bb4222 Merge branch 'dev' into 8380-createTestToVnImg 2025-01-17 10:33:08 +00:00
Javier Segarra 179f5a684f Merge branch 'dev' into 8197-fix_filters 2025-01-17 09:09:11 +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 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
PAU ROVIRA ROSALENY 98cdf00c88 Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-17 06:16:36 +00:00
Alex Moreno 94c0cccb1e perf: refs #8197 default is object 2025-01-17 07:16:24 +01: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 a5a2feb8fd Merge branch 'dev' into 7308_warning 2025-01-16 11:49:25 +00:00
Javier Segarra 3ab3f146d4 feat: add acl in description button 2025-01-16 12:45:24 +01:00
PAU ROVIRA ROSALENY e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-16 11:41:04 +00:00
PAU ROVIRA ROSALENY 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
Pablo Natek 6c2fbea6d5 fix: refs #8407 close date and time popups on keydown 2025-01-16 11:59:08 +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 9b1554b123 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-16 09:34:14 +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 b41d5f19dc fix: refs #8316 translations 2025-01-16 07:37:19 +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
Alex Moreno a71da3a45d Merge branch 'dev' into update_quasar_version 2025-01-16 06:25:48 +00:00
PAU ROVIRA ROSALENY 8d508c82a0 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:18:40 +00:00
PAU ROVIRA ROSALENY f20c1f9422 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-16 07:18:07 +01:00
PAU ROVIRA ROSALENY 82e6cc0790 refactor: refs #7077 removed some comments 2025-01-16 07:18:05 +01:00
PAU ROVIRA ROSALENY a0f7905983 Merge branch 'dev' into 7087-testCardSummary 2025-01-16 06:15:51 +00:00
PAU ROVIRA ROSALENY ce7e529776 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:15:36 +00:00
Javier Segarra 1befb353a9 Merge branch 'dev' into update_quasar_version 2025-01-16 06:12:01 +00:00
Javier Segarra 442f74fce0 feat: refs #6321 tags 2025-01-16 07:02:13 +01:00
Javier Segarra 0da3bcdf40 Merge branch 'dev' into 7308_warning 2025-01-15 20:10:05 +00:00
Javier Segarra 2d8dd46d15 fix: remove console 2025-01-15 20:09:56 +00:00
Jorge Penadés 21958cfdb4 fix: catch mail err 2025-01-15 16:10:33 +01:00
Jose Antonio Tubau b5bdb975b8 test: refs #7075 add TODO for handling keydown behavior in VnInput component 2025-01-15 15:41:19 +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 3cef713058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:06:17 +01:00
Alex Moreno 56e0965499 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 12:05:38 +01:00
Alex Moreno 7661f9e633 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-15 11:04:39 +00: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
PAU ROVIRA ROSALENY 979353119a refactor: refs #7087 removed unused imports 2025-01-15 09:56:43 +01:00
PAU ROVIRA ROSALENY 46bfd3b115 Merge branch 'dev' into 7077-testVnInputTime 2025-01-15 08:54:58 +00:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 08:22:56 +00:00
PAU ROVIRA ROSALENY 76968fe6bd fix: refs #7087 fixed some tests 2025-01-15 09:01:37 +01:00
PAU ROVIRA ROSALENY 8e4a92b6be Merge branch 'dev' into 7087-testCardSummary 2025-01-15 07:58:00 +00:00
PAU ROVIRA ROSALENY 6ecbaf1a04 Merge branch '7087-testCardSummary' of https: refs #7087//gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-15 08:55:16 +01:00
PAU ROVIRA ROSALENY 54867597aa feat: refs #7087 added new test 2025-01-15 08:52:43 +01: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
Alex Moreno 2c67041030 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-itemCardWithVnCardBeta 2025-01-15 08:08:53 +01:00
Carlos Satorres 621d038133 Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB 2025-01-15 06:31:54 +00:00
Alex Moreno 6de8687be1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 07:12:09 +01:00
Alex Moreno dd41141cf1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-15 07:11:51 +01:00
Jose Antonio Tubau e884bab1ea test: refs #8380 add unit tests for VnImg component 2025-01-15 06:56:15 +01:00
Jon Elias 9f0d9bca29 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 05:03:43 +00:00
Jon Elias 35e4f91154 fix: fixed icons in descriptor 2025-01-15 05:59:47 +01:00
Jorge Penadés 24b20605d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter 2025-01-14 17:24:03 +01:00
Jorge Penadés df9e5f8059 refactor: refs #8198 simplify state management and data fetching in ItemDiary component 2025-01-14 17:13:59 +01:00
PAU ROVIRA ROSALENY 698c20550f Merge branch 'dev' into 7077-testVnInputTime 2025-01-14 13:49:32 +00:00
PAU ROVIRA ROSALENY 5ce78ba473 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-14 12:45:18 +00:00
Jorge Penadés 3cc5595e14 refactor: refs #8198 simplify data fetching and filtering logic 2025-01-14 13:08:52 +01:00
Javier Segarra 5c295ebd33 fix: refs #6321 ticket-router 2025-01-14 12:29:31 +01:00
Javier Segarra af56321377 Merge branch 'dev' into 6321_negative_tickets 2025-01-14 12:22:46 +01:00
Javier Segarra 4c4d5649ba Merge branch 'dev' into Fix-CustomerIcons 2025-01-14 11:01:43 +00:00
Javier Segarra 6f50d44772 Merge branch 'master' into hotfix_vnLocation_selectValue 2025-01-14 11:00:38 +00:00
Carlos Satorres 64fcf3c824 fix: hotfix 7366 6943 2025-01-14 11:36:46 +01:00
Jose Antonio Tubau bc53685765 Merge branch 'dev' into 8316-parkingCardWithVnCardBeta 2025-01-14 09:12:35 +00:00
Jose Antonio Tubau ec44bfbc11 Merge branch 'dev' into 7076-createTestVnInputDate 2025-01-14 08:43:15 +00:00
Jon Elias 8dc2955109 Merge branch 'dev' into Fix-CustomerIcons 2025-01-14 08:18:24 +00:00
Jon Elias 25dd028487 fix: modified setData in customerDescriptor to show the icons 2025-01-14 09:15:53 +01:00
Alex Moreno e61ce651ca Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 09:10:35 +01:00
Alex Moreno 6af26f0310 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-14 08:09:55 +00:00
Alex Moreno 30e501610d fix: parallelism 2025-01-14 09:09:26 +01:00
Jon Elias ad4a8beb0a Merge branch 'dev' into 7305-CustomerFiscalDataWarning 2025-01-14 07:53:18 +00:00
Jose Antonio Tubau f16e956a53 Merge branch 'dev' into 7075-createTestToVnInput 2025-01-14 07:45:54 +00:00
Jose Antonio Tubau 0a577e0524 Merge branch '7075-createTestToVnInput' of https://gitea.verdnatura.es/verdnatura/salix-front into 7075-createTestToVnInput 2025-01-14 08:45:23 +01:00
Jose Antonio Tubau d0e2093a1c test: refs #7075 update VnInput tests to include label and data-cy attribute 2025-01-14 08:45:21 +01:00
Javier Segarra 8b7337f9ee fix: vnlocation 2025-01-14 08:37:10 +01:00
Jose Antonio Tubau 702ae17d94 refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList 2025-01-14 08:25:10 +01:00
Alex Moreno 837c389f64 feat(cliamList): add auto-load, in this case they need it 2025-01-14 08:16:44 +01:00
Jose Antonio Tubau bd9c2ad4dc refactor: refs #8316 remove unused OrderSearchbar component 2025-01-14 07:57:54 +01:00
Jose Antonio Tubau 0fdff03715 refactor: refs #8316 remove unused ItemTypeSearchbar component 2025-01-14 07:48:18 +01:00
Jon Elias 6e5b703018 fix: refs #8247 conflicts 2025-01-14 07:47:33 +01:00
Jon Elias 179571e3e9 Merge branch 'dev' of https: refs #8247//gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:46:34 +01:00
Alex Moreno 63a6073cce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 07:37:37 +01:00
Jon Elias 3adec919dc Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:37:22 +01:00
Jon Elias e5d8bfcf3a refactor: refs #8247 use new acl for sysadmin 2025-01-14 07:37:17 +01:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs 2025-01-14 07:29:44 +01:00
PAU ROVIRA ROSALENY 34442c8577 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-14 05:59:53 +00:00
Javier Segarra 449a790427 test: fix component 2025-01-14 06:15:40 +01:00
Javier Segarra eb008e8330 Merge branch 'dev' into update_quasar_version 2025-01-14 05:59:46 +01:00
Jorge Penadés 8d1a095302 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 15:15:23 +00:00
Jose Antonio Tubau 1485166fdd Merge branch 'dev' into 7075-createTestToVnInput 2025-01-13 14:05:49 +00:00
Jose Antonio Tubau 10767615de test: refs #7075 add unit tests for VnInput component 2025-01-13 15:05:15 +01:00
Alex Moreno 863d6deb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 14:49:15 +01:00
Alex Moreno 5a58012f80 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 14:49:02 +01:00
Alex Moreno 01a6d714eb Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 13:36:56 +00:00
Alex Moreno 074bb6c94c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:34:55 +01:00
Alex Moreno 671f308006 revert: revert header 2025-01-13 13:29:39 +01:00
PAU ROVIRA ROSALENY a22330b15e Merge branch 'dev' into 7077-testVnInputTime 2025-01-13 12:20:33 +00:00
Alex Moreno d0e6c28ea2 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:49 +01:00
Alex Moreno e9645cf86c Merge branch '8316-customerCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-13 13:15:05 +01:00
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-13 11:54:12 +00:00
Javier Segarra 7f281b8630 perf: refs #7308 call 1 time useSession 2025-01-13 12:30:07 +01:00
PAU ROVIRA ROSALENY 50008ce7f1 fix: refs #7055 #7055 #7055 fixed some tests 2025-01-13 12:27:26 +01:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00
Javier Segarra 70000e3eca Merge branch 'dev' into 7308_warning 2025-01-13 12:19:44 +01:00
Alex Moreno dd335ef409 fix: refs #8197 not use yet 2025-01-13 12:18:52 +01:00
Alex Moreno ed0730df22 feat: refs #8197 useHasContent and use in VnSection and RightMenu 2025-01-13 12:17:55 +01:00
PAU ROVIRA ROSALENY 7a5de9f708 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-13 11:07:04 +00:00
Jon Elias a9ac5106cf Merge branch 'test' into Warmfix-OrderProblems 2025-01-13 10:56:32 +00:00
Jon Elias 5272e5aaae fix: redirect to sales when confirming lines 2025-01-13 11:53:55 +01:00
PAU ROVIRA ROSALENY f0fc748c76 fix: changed translations to only use "invoicein" 2025-01-13 11:48:45 +01:00
Javi Gallego 803b8d508d feat: refs #8381 add initial and final temperature fields to entry forms and summaries 2025-01-13 11:27:00 +01:00
PAU ROVIRA ROSALENY f5003687eb Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn 2025-01-13 11:06:06 +01:00
PAU ROVIRA ROSALENY eb92c69475 fix: changed invoiceIn for InvoiceIn 2025-01-13 11:06:01 +01:00
PAU ROVIRA ROSALENY 49f54c6efe Merge branch 'dev' into traduccionesInvoiceIn 2025-01-13 09:55:20 +00:00
PAU ROVIRA ROSALENY 2a121dbbb3 fix: added missing translations in InvoiceIn 2025-01-13 10:54:28 +01:00
Alex Moreno ce698522c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 10:23:41 +01:00
Alex Moreno d761af6537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 10:23:27 +01:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 09:14:24 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev 
Reviewed-on: verdnatura/salix-front#1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 08:41:49 +00:00
Jose Antonio Tubau 278faeb533 Merge branch 'dev' into 7073-createTestToVnDms 2025-01-13 08:10:51 +00:00
Jose Antonio Tubau 5b6ad1a7c0 test: refs #7073 add test to defaultData if formInitialData has value 2025-01-13 09:10:41 +01:00
Jose Antonio Tubau 1af67db644 refactor: refs #8316 move order localization 2025-01-13 08:37:01 +01:00
Jon Elias f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 07:35:38 +00:00
Jon Elias 413d567ffb refactor: refs #8225 requested changes 2025-01-13 08:34:32 +01:00
PAU ROVIRA ROSALENY 5bd72c830d Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-13 08:11:46 +01:00