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

8516 Commits

Author SHA1 Message Date
Javier Segarra ea9e099523 perf: refs #7134 currencies fetch 2025-01-21 14:53:48 +01:00
Javier Segarra b2b36289c7 Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix-front into 7134-supplierBalance 2025-01-13 23:13:11 +01:00
Javier Segarra 06eb72764d feat: refs #7134 default currency parameter 2025-01-13 23:13:08 +01:00
Javier Segarra 3e4934fae1 Merge branch 'dev' into 7134-supplierBalance 2025-01-13 22:05:39 +00:00
Javier Segarra 2f3c5245c0 perf: refs #7134 imports 2025-01-13 23:05:17 +01:00
Javier Segarra 5af5c518b5 fix: refs #7134 params filter 2025-01-13 23:03:58 +01:00
Javier Segarra 21cc6b3ecd test: refs #7134 remove conditions 2025-01-13 23:02:46 +01:00
Javier Segarra 252dd21492 fix: refs #7134 remove risk 2025-01-13 22:58:36 +01:00
Javier Segarra a8e1bdc684 revert: refs #7134 change 2025-01-13 22:55:57 +01:00
Javier Segarra edceac850d fix: refs #7134 minor change 2025-01-13 22:52:06 +01:00
Javier Segarra fce1068fbb fix: refs #7134 remove supplierRisk 2025-01-13 22:33:07 +01:00
Javier Segarra 1f1fc4d6b9 revert: refs #7134 customer changes 2025-01-13 19:20:10 +01:00
Javier Segarra 9fcea12580 fix: refs #7134 getRiskComposable 2025-01-13 19:17:54 +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
Jon Elias 07ecd93fe0 Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test 
Reviewed-on: verdnatura/salix-front#1203
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 13:33:35 +00:00
Alex Moreno 671f308006 revert: revert header 2025-01-13 13:29:39 +01:00
Jorge Penadés a32ec49efd Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master 
Reviewed-on: verdnatura/salix-front#1205
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 11:25:23 +00:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00
PAU ROVIRA ROSALENY 221df5fa8c Merge pull request 'fix: added missing translations in InvoiceIn' (!1201) from traduccionesInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#1201
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-13 11:05:54 +00:00
Jon Elias a9ac5106cf Merge branch 'test' into Warmfix-OrderProblems 2025-01-13 10:56:32 +00:00
Javier Segarra 6c96089445 Merge branch 'dev' into 7134-supplierBalance 2025-01-13 11:55:04 +01: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
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
Jon Elias 330d0dd637 Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev 
Reviewed-on: verdnatura/salix-front#1194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 09:17:17 +00: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
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
Pablo Natek 8ce4fc38e2 Merge pull request 'feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit' (!1199) from fixDecimalP into master 
Reviewed-on: verdnatura/salix-front#1199
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-13 07:03:16 +00: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 e65b53fad0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1140) from 8316-claimCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 06:35:51 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Alex Moreno 6b8f6c464c Merge pull request 'feat: refs #8372 workerPBX' (!1192) from 8372-workerPBX into dev 
Reviewed-on: verdnatura/salix-front#1192
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-10 12:39:00 +00:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX 2025-01-10 12:38:01 +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 6cc400a975 Merge pull request 'fix: fixed InvoiceIn filter translations' (!1193) from invoiceInTranslations into dev 
Reviewed-on: verdnatura/salix-front#1193
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-10 08:38:46 +00:00