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

8532 Commits

Author SHA1 Message Date
Jorge Penadés ae137e8244 fix: refs #6919 update model references 2025-01-13 13:25:42 +01:00
Jorge Penadés 13490719c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-13 12:58:18 +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
PAU ROVIRA ROSALENY f0fc748c76 fix: changed translations to only use "invoicein" 2025-01-13 11:48:45 +01:00
Jorge Penadés c1108945ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-13 11:38:13 +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
Jorge Penadés e98cc7a92a feat: refs #6919 keep filter 2025-01-13 10:59:54 +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
Jorge Penadés 285ba4ef7b fix: refs #6919 data-key descriptor 2025-01-13 10:41:23 +01:00
Jorge Penadés 3ad63ed354 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-13 10:35:49 +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
Jorge Penadés b94df214ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-10 18:45:01 +01:00
Jorge Penadés ccb558f4e9 refactor: refs #6919 update reload default value and extract InvoiceIn filter to a separate file 2025-01-10 17:29:31 +01: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
Jorge Penadés 3a8808452d fix: refs #6919 ticket 2025-01-10 11:44:06 +01:00
Jorge Penadés 74f151800d chore: refs #6919 drop state 2025-01-10 11:37:12 +01:00
Jorge Penadés 105f149503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-10 11:24:20 +01: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
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations 2025-01-10 07:34:29 +01:00
Jorge Penadés 67b29c5d24 fix: refs #6919 roadmap 2025-01-09 18:27:29 +01:00
Jorge Penadés caa50a16ce feat: refs #6919 sync basicdata agency 2025-01-09 18:05:39 +01:00
Jorge Penadés 9084d918c0 fix: refs #6919 arrayData 2025-01-09 17:32:57 +01:00
Jorge Penadés a46d3affde refactor: refs #6919 fine tunning vnCard 2025-01-09 17:11:55 +01:00
Jorge Penadés 9e06a48841 refactor: refs #6919 fine tunning vnCard 2025-01-09 17:10:21 +01:00
Jorge Penadés b7f2a320c7 fix: refs #6919 item 2025-01-09 16:36:27 +01:00
Jorge Penadés ad8618a51b fix: refs #6919 arrayData 2025-01-09 16:27:11 +01:00
Jorge Penadés 622c875dc5 fix: refs #6919 department 2025-01-09 15:57:12 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX 2025-01-09 14:46:53 +01:00
Carlos Satorres db67b8f01a Merge pull request 'fix: fix confirmRequest' (!1191) from hotfix-7283itemRequestConfirm into master 
Reviewed-on: verdnatura/salix-front#1191
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-09 11:53:15 +00:00