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

6774 Commits

Author SHA1 Message Date
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
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
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
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
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
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 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 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
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
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
Jorge Penadés 8d1a095302 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 15:15:23 +00: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 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
PAU ROVIRA ROSALENY 2a8c2a1079 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-13 11:54:12 +00: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
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 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
PAU ROVIRA ROSALENY 1295f394f3 feat: refs #7087 added more test cases 2025-01-13 08:11:41 +01:00
Pablo Natek fb5d76737d feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit 2025-01-13 08:01:05 +01:00
Jose Antonio Tubau bd66d3aee5 Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-13 06:45:26 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Jose Antonio Tubau 7be5f9633b feat: refs #8316 add entryFilter prop to VnTable component in EntryList 2025-01-10 15:24:40 +01:00
Jose Antonio Tubau c896b66a50 feat: refs #8316 add entryFilter to VnTableEntryList component 2025-01-10 15:24:09 +01:00
PAU ROVIRA ROSALENY 6a01c9b746 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-10 13:54:08 +00:00
PAU ROVIRA ROSALENY e8105f312f Merge branch 'dev' into 7087-testCardSummary 2025-01-10 13:08:58 +00:00
PAU ROVIRA ROSALENY bb6fae5d08 feat: refs #7087 created CardSummary test 2025-01-10 14:08:25 +01:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX 2025-01-10 12:38:01 +00:00
PAU ROVIRA ROSALENY 47168cdeb8 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-10 10:53:10 +00:00
Jon Elias 57c538c9c9 fix: refs #8225 invoice in translations 2025-01-10 10:49:07 +01:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules 2025-01-10 10:27:03 +01:00
Jon Elias 69bcab0ec4 feat: refs #8225 added invoiceIn and travel module 2025-01-10 10:25:16 +01:00
Jon Elias 300d64b076 feat: refs #8225 added entry module and fixed translations 2025-01-10 10:22:37 +01:00
Jon Elias 774c714755 feat: refs #8225 added route and shelving module 2025-01-10 10:14:56 +01:00
Jon Elias 5d9227723e feat: refs #8225 added account and invoiceOut modules 2025-01-10 10:10:16 +01:00
Jon Elias 1b986f4b4c feat: refs #8225 use it in claim, item and order modules 2025-01-10 10:03:51 +01:00