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
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
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
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 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 af56321377 Merge branch 'dev' into 6321_negative_tickets 2025-01-14 12:22:46 +01: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
Jon Elias 25dd028487 fix: modified setData in customerDescriptor to show the icons 2025-01-14 09:15:53 +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
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 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
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
Jose Antonio Tubau 86e0043fc7 Merge branch 'dev' into 8316-itemCardWithVnCardBeta 2025-01-13 08:07:27 +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 3e59d7881a Merge branch 'dev' into 8316-parkingCardWithVnCardBeta 2025-01-13 06:40:04 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Jose Antonio Tubau eed06282d8 Merge branch 'dev' into 8316-invoiceOutCardWithVnCardBeta 2025-01-13 07:12:13 +01:00
Jose Antonio Tubau 34cfd57589 refactor: refs #8316 restore exprBuilder function to filter invoice data 2025-01-13 07:02:11 +01: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
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
Jon Elias 95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary 2025-01-10 10:00:42 +01:00
PAU ROVIRA ROSALENY f834f3b754 feat: refs #8258 added button to pass to uppercase 2025-01-10 07:52:22 +01:00
PAU ROVIRA ROSALENY 3148461dc1 Merge branch 'dev' of https: refs #8258//gitea.verdnatura.es/verdnatura/salix-front into 8258-uppercaseInputs 2025-01-10 07:44:02 +01:00
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations 2025-01-10 07:34:29 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX 2025-01-09 14:46:53 +01:00
Jose Antonio Tubau 37a71f7594 refactor: refs #8316 used VnSection and VnCardBeta on ItemCard 2025-01-09 10:29:44 +01:00
PAU ROVIRA ROSALENY 343c1b538a Merge branch 'dev' into 8322-workerDepartment 2025-01-09 09:01:42 +00:00
Alex Moreno c95d2d7eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-09 09:54:26 +01:00
Alex Moreno e36e9b5617 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 09:54:15 +01:00
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef" 2025-01-09 09:52:44 +01:00
Carlos Satorres 5882ee8463 fix: fix confirmRequest 2025-01-09 09:44:37 +01:00
PAU ROVIRA ROSALENY e9ea70de19 fix: removed unused searchbar 2025-01-09 08:03:59 +00:00
Javi Gallego bd09090e11 fix: update button sizes in ExtraCommunity.vue for better visibility 2025-01-09 08:47:18 +01:00
Carlos Satorres 5e31b93675 fix: modelName 2025-01-09 08:00:30 +01:00
Alex Moreno 6d1478f703 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 07:59:34 +01:00
Carlos Satorres ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 13:04:00 +00:00
Jon Elias 1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 12:24:52 +00:00
Jose Antonio Tubau 663ca7c25d refactor: refs #8316 moved userFilter to array-data-props 2025-01-08 13:08:24 +01:00
Robert Ferrús 65b9da7b54 Merge branch 'master' into 8001-expeditionGrafanaHotFix 2025-01-08 12:02:23 +00:00
Alex Moreno e693323166 fix: workerTimeControl state week colors 2025-01-08 12:57:15 +01:00
Robert Ferrús 1a72eda359 fix: refs #8001 change link grafana 2025-01-08 12:44:35 +01:00
Alex Moreno 3ba37d515a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-08 12:19:51 +01:00
Alex Moreno b889bfd178 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-08 12:19:38 +01:00
Alex Moreno 70f692ffd5 fix(WorkerTimeControl): fix isoYear 2025-01-08 12:19:27 +01:00
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum 2025-01-08 10:32:15 +01:00
Carlos Satorres 96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 08:27:54 +00:00
Pablo Natek d392e93efd Merge branch 'master' into 8348-exportDataOnCsv 2025-01-08 07:15:05 +00:00
PAU ROVIRA ROSALENY dfd7ba9379 feat: refs #8258 added uppercase option to VnInput 2025-01-08 08:14:37 +01:00
Jose Antonio Tubau 7f1684ddfc refactor: refs #8316 added entryFilter 2025-01-08 08:14:05 +01:00
Jose Antonio Tubau 11642c075c refactor: refs #8316 added claimFilter 2025-01-08 08:10:00 +01:00
Jon Elias ec40dc6171 Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-08 07:15:52 +01:00
Jon Elias 39917e656e Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 06:13:35 +00:00
Jon Elias f4b443f2b0 fix: translations 2025-01-08 07:11:26 +01:00
Jose Antonio Tubau cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 06:08:44 +00:00
Jose Antonio Tubau eb6121cbb5 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:01:45 +00:00
Jose Antonio Tubau 6ce571a8ab Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 05:59:56 +00:00
Alex Moreno 5dcf77a226 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 15:05:44 +01:00
Alex Moreno 621d98b32b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-07 15:05:33 +01:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 8e1f888134 Merge branch 'dev' into 8322-worker 2025-01-07 12:24:44 +00:00
Jon Elias ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:22:32 +00:00
Jon Elias 548db113eb refactor: refs #8220 requested changes 2025-01-07 13:16:05 +01:00
Jon Elias 5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2025-01-07 13:13:12 +01:00