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

9253 Commits

Author SHA1 Message Date
Javier Segarra 21251a5167 fix: init 2025-01-21 13:25:45 +01:00
Jon Elias 627289c58d feat: refs #7317 deleted warnings in fiscalData and dms 2025-01-21 13:22:40 +01:00
Alex Moreno 350dedd78d feat: refs #8316 add slots on VnTable from VnFilterPanel 2025-01-21 13:19:46 +01:00
Jon Elias a1ef002a24 Merge pull request '#7305 deleted warnings' (!1196) from 7305-CustomerFiscalDataWarning into dev 
Reviewed-on: verdnatura/salix-front#1196
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 12:15:41 +00:00
Jon Elias 9cb0292361 Merge branch 'dev' into 7305-CustomerFiscalDataWarning 2025-01-21 12:12:21 +00:00
Jon Elias 9383a3b4fb Merge pull request '#7068: Created VnVisibleColumns test' (!1250) from 7068-TableVisibleColumnsTest into dev 
Reviewed-on: verdnatura/salix-front#1250
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-21 12:11:44 +00:00
Jon Elias befbbf3f73 Merge branch 'dev' into 7068-TableVisibleColumnsTest 2025-01-21 12:10:56 +00: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
Javier Segarra 4e0967a26c Merge pull request 'HOTFIX: use clientFk to filter data' (!1258) from hotfix_customerConsumption_clientFk into master 
Reviewed-on: verdnatura/salix-front#1258
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 11:45:10 +00: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
Javier Segarra b0c23b03fd Merge pull request 'update_quasar_version' (!1259) from update_quasar_version into dev 
Reviewed-on: verdnatura/salix-front#1259
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 11:40:25 +00:00
Javier Segarra 26e6ceb24d Merge branch 'dev' into 7068-TableVisibleColumnsTest 2025-01-21 11:22:14 +00:00
Robert Ferrús b969824474 Merge branch '8387-itemTagCrudModelFront' of https://gitea.verdnatura.es/verdnatura/salix-front into 8387-itemTagCrudModelFront 2025-01-21 12:20:34 +01:00
Javier Segarra 61e410aa1d fix: use clientFk to filter data 2025-01-21 11:16:38 +00:00
Jon Elias a6e57127f9 Merge branch 'dev' into 7305-CustomerFiscalDataWarning 2025-01-21 11:16:24 +00:00
Robert Ferrús dbd5b8f95f Merge branch 'dev' into 8387-itemTagCrudModelFront 2025-01-21 11:14:16 +00:00
Robert Ferrús 78745cf7ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8387-itemTagCrudModelFront 2025-01-21 12:13:36 +01:00
Alex Moreno 57fb85d278 Merge branch 'dev' into 8322-route 2025-01-21 11:07:51 +00:00
Javier Segarra fe99bdf3fd Merge branch 'dev' into update_quasar_version 2025-01-21 11:04:36 +00:00
Alex Moreno 1b394e3cac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-21 11:58:54 +01:00
Alex Moreno b35952928c build: init version 2025-01-21 11:57:37 +01:00
Javi Gallego ab0343582e Merge branch 'dev' into 8381-thermographTravel 2025-01-21 11:56:08 +01:00
Alex Moreno 9f280c6089 Merge pull request 'perf: refs #8197 fix and imrpove filters' (!1234) from 8197-fix_filters into dev 
Reviewed-on: verdnatura/salix-front#1234
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-21 10:48:31 +00:00
Alex Moreno a2499f11e1 Merge branch 'dev' into 8197-fix_filters 2025-01-21 10:45:42 +00:00
Alex Moreno f3fbfe41bb Merge pull request '8448-devToTest' (!1254) from 8448-devToTest into test 
Reviewed-on: verdnatura/salix-front#1254
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-21 10:44:45 +00:00
Robert Ferrús d4a7a9374a Merge branch 'dev' into 8387-itemTagCrudModelFront 2025-01-21 10:43:48 +00:00
Jon Elias 28db925645 refactor: refs #7068 adjust variables 2025-01-21 11:05:24 +01:00
Alex Moreno 6c6e4ca950 fix: refs #8448 not use croppie 2025-01-21 10:58:46 +01:00
Javier Segarra df7ab77225 Merge branch 'dev' into update_quasar_version 2025-01-21 09:53:29 +00:00
Jorge Penadés a0fc8a528c Merge pull request '#8087 hotfix-addFilterFields' (!1257) from 8087-hotfix-addFilterFields into master 
Reviewed-on: verdnatura/salix-front#1257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 09:52:21 +00:00
Robert Ferrús 3a95bdbbf7 Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-21 09:48:11 +00:00
Jon Elias 96d1ef7f68 fix: refs #8448 e2e 2025-01-21 10:48:04 +01:00
Jorge Penadés ae507167b7 feat: refs #8087 add additional filter fields to TravelCard component 2025-01-21 10:43:44 +01:00
PAU ROVIRA ROSALENY 9dd53855b5 Merge pull request 'feat: #8395 added total column in invoiceInVat' (!1243) from 8395-invoiceInVatTotal into dev 
Reviewed-on: verdnatura/salix-front#1243
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-21 09:10:48 +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
Robert Ferrús b1d18de23e Merge branch 'dev' into 6822-createEntryTransferOption 2025-01-21 08:48:40 +00:00
PAU ROVIRA ROSALENY df403e35e6 Merge branch 'dev' into 7103-testVnSearchbar 2025-01-21 08:46:12 +00:00
PAU ROVIRA ROSALENY e8cee99b78 feat: refs #7103 created test for VnSearchbar 2025-01-21 09:45:47 +01:00
Carlos Satorres 836f40867c Merge pull request 'fix: refs #6896 hotfix search' (!1255) from 6896-hotfixOrdersSearch into master 
Reviewed-on: verdnatura/salix-front#1255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 08:25:53 +00:00
Jon Elias eb1c621066 Merge branch '7068-TableVisibleColumnsTest' of https://gitea.verdnatura.es/verdnatura/salix-front into 7068-TableVisibleColumnsTest 2025-01-21 09:06:55 +01:00
Jon Elias b36c53119c refactor: refs #7068 requested changes 2025-01-21 09:06:53 +01:00
Jon Elias d178a77bc6 Merge pull request 'Fix: Move dialog to descriptorMenu' (!1246) from Fix-InvoiceInDescriptorDialog into dev 
Reviewed-on: verdnatura/salix-front#1246
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-21 07:52:42 +00:00
Alex Moreno e9555a6017 Merge branch 'master' into 6896-hotfixOrdersSearch 2025-01-21 07:52:20 +00:00
Jon Elias 7c91869c8b Merge branch 'dev' into Fix-InvoiceInDescriptorDialog 2025-01-21 07:51:35 +00:00
Javi Gallego 23bff237a5 Merge branch 'dev' into 8381-thermographTravel 2025-01-21 07:52:20 +01:00
Alex Moreno e6c16356be Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev 
Reviewed-on: verdnatura/salix-front#1253
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-21 06:50:57 +00:00