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

942 Commits

Author SHA1 Message Date
Pablo Natek 6c524932ee feat(addSpecific): refs #6545 add feats and fixes 2023-12-06 14:14:47 +01:00
Pablo Natek 915f7ea45d Merge pull request 'feat(wagonCounter): refs #6545 add +30 button and correct images' (!120) from 6545-fixWagonCounter into test 
Reviewed-on: verdnatura/salix-front#120
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-06 11:51:18 +00:00
Pablo Natek e963eddfe6 feat(wagonCounter): refs #6545 add +30 button and correct images 2023-12-06 12:09:03 +01:00
Pablo Natek 3b018a58e6 Merge pull request 'feat(wagonCounter): refs #6545 move to test' (!119) from 6545-counters-to-test into test 
Reviewed-on: verdnatura/salix-front#119
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-06 08:57:25 +00:00
Pablo Natek 9a566ba87c feat(wagonCounter): refs #6545 move to test 2023-12-06 09:48:51 +01:00
Jorge Penadés ca9d3611af Merge pull request 'refs #6545 counters created' (!116) from 6545-trolleyCounter into dev 
Reviewed-on: verdnatura/salix-front#116
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-05 07:47:51 +00:00
Jorge Penadés e22c400326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6545-trolleyCounter 2023-12-05 08:32:15 +01:00
Jorge Penadés 7fb78ac298 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-05 08:31:44 +01:00
Carlos Satorres f8659c2153 Merge pull request 'refs #6334 fix amount, colors' (!117) from 6334-updateLinesAmount into dev 
Reviewed-on: verdnatura/salix-front#117
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-05 06:08:05 +00:00
Jorge Penadés b43985b9db refs #5835 refactor 2023-12-04 15:26:19 +01:00
Jorge Penadés a730f2c073 refs #6545 refactor 2023-12-04 15:07:40 +01:00
Jorge Penadés 3d046e4bf7 refs #5835 summary grid updated 2023-12-04 14:21:29 +01:00
Carlos Satorres b400a23d43 refs #5633 remove emit 2023-12-04 13:06:07 +01:00
Carlos Satorres b2b366032f refs #5633 create componente VnAccountNumber 2023-12-04 12:24:39 +01:00
Carlos Satorres 03e42f676b refs #6334 remove class 2023-12-04 12:02:27 +01:00
Carlos Satorres 4eee95b945 refs #6334 fix amount, colors 2023-12-04 11:40:17 +01:00
Jorge Penadés a3d6275b2f refs #6545 counters created 2023-12-04 10:38:35 +01:00
Javier Segarra 51a2e7244c refs #5736 fix: i18n broken test env 2023-12-01 13:57:48 +01:00
Jorge Penadés 8d04036836 refs #5835 change descriptor menu style 2023-12-01 08:28:05 +01:00
Javier Segarra 3a80b6b63b Merge pull request 'refs #5815-quasar-NODE_ENV' (!111) from 5815-vite_NODE_ENV into test 
Reviewed-on: verdnatura/salix-front#111
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-30 07:16:01 +00:00
Javi Gallego 1370ecbd8b Merge branch 'test' into 5815-vite_NODE_ENV 2023-11-29 08:54:04 +00:00
Alex Moreno 615c5c1477 warmFix: ticket with null zone 2023-11-29 08:44:16 +01:00
Jorge Penadés f75b81db71 refs #5835 fix conflicts 2023-11-28 12:08:20 +01:00
Jorge Penadés 0282f8dde8 refs #5835 rate fixed & options descriptor created 2023-11-28 12:05:39 +01:00
Alex Moreno cad5d830a0 Merge pull request 'refs #6062 feat(arrayData): support exprBuilder' (!112) from 6062-exprBuilder into dev 
Reviewed-on: verdnatura/salix-front#112
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-11-27 12:23:33 +00:00
Javier Segarra 6ac89e7aa2 Update quasar.config.js 2023-11-27 11:57:09 +00:00
Alex Moreno 54379b3e65 typo 2023-11-24 13:32:20 +01:00
Alex Moreno 023cfc6ac7 refs #6062 feat(arrayData): support exprBuilder 2023-11-24 13:31:08 +01:00
Javi Gallego 5719857d83 Merge branch 'test' into 5815-vite_NODE_ENV 2023-11-24 10:20:15 +00:00
Jorge Penadés 7595c01293 refs #5835 fix InvoiceInDescriptor 2023-11-24 11:09:12 +01:00
Jorge Penadés b49e2e28e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-24 11:03:02 +01:00
Alex Moreno dacfe1a96d refs #5654 fix(descriptors): add data-key 2023-11-24 10:36:31 +01:00
Jorge Penadés b00cff8b0b refs #5835 refactor getTotals 2023-11-24 10:08:51 +01:00
Pablo Natek 0114de4db5 feat(preview): refs #6475 add preview icon on descriptor 2023-11-24 09:41:57 +01:00
Jorge Penadés bc2256a021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-24 09:25:29 +01:00
Carlos Satorres 247f935334 Merge pull request '6157-actionClaim' (!106) from 6157-actionClaim into dev 
Reviewed-on: verdnatura/salix-front#106
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-24 07:46:29 +00:00
Carlos Satorres 98fa68bb80 refs 6157 markerlabel 2023-11-24 08:41:21 +01:00
Carlos Satorres c3d9085a57 refs #6157 minorFix 2023-11-24 08:10:44 +01:00
Carlos Satorres d03092f41d refs #6157 arrayData 2023-11-23 15:50:42 +01:00
Jorge Penadés d97f694563 refs #5835 upsert refactor 2023-11-23 08:42:09 +01:00
Alex Moreno f25baf2e27 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2023-11-23 08:26:42 +01:00
Jorge Penadés dfddde1d5c refs #5835 refactor upsert 2023-11-22 15:22:25 +01:00
Jorge Penadés 9388b873c6 refs #5835 refactor basicData 2023-11-22 15:18:18 +01:00
Javier Segarra 25e7c3231a refs #5815 ci: set custom NODE_ENV in environment 2023-11-22 12:40:12 +01:00
Jorge Penadés 7e7154525d refs #5835 fix front test 2023-11-22 10:08:51 +01:00
Jorge Penadés 195bd4c6d7 refs 5835 fix bordered box 2023-11-22 09:01:55 +01:00
Jorge Penadés bc8f6b643d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-21 08:33:59 +01:00
Carlos Satorres 1320db7bf0 refs #6157 e2e + front 2023-11-20 18:13:26 +01:00
Carlos Satorres ce4fe44b03 refs #6157 refactor 2023-11-17 14:06:43 +01:00
Carlos Satorres 9b11ca05a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-11-16 13:16:57 +01:00