1320 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	9a9bb2fa44	refs #6618 invoiceOut fix	2024-01-03 13:24:49 +01:00
Carlos Satorres	3c98d099b3	refs #6618 component Cards	2024-01-03 13:00:45 +01:00
Carlos Satorres	92127b766b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar	2024-01-03 13:00:25 +01:00
Kevin Martinez	134f1e0195	Merge pull request 'Create order lines' (#46) from feature/order into dev ... Reviewed-on: hyervoni/salix-front-mindshore#46	2024-01-03 10:52:20 +00:00
Kevin Martinez	733baa1310	Merge branch 'dev' into feature/order ... # Conflicts: # src/i18n/en/index.js	2024-01-03 06:51:38 -04:00
Javier Segarra	8bde0073f0	Merge pull request '#6098 - Show Toast when copy token' (!141) from 6098_lilium_token_copy into dev ... Reviewed-on: #141 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-03 10:44:26 +00:00
Carlos Satorres	6b23c988b3	refs #6618 component vnSubToolBar	2024-01-03 11:06:03 +01:00
Carlos Satorres	3acc4b0d58	vn qtoolbar	2024-01-03 09:59:27 +01:00
Javier Segarra	6a6e38bb60	Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy	2024-01-03 09:39:31 +01:00
Javier Segarra	c4cf9842cb	refs #6098 perf: add vite-ignore	2024-01-03 09:39:28 +01:00
Javier Segarra	e05a49e7b7	Merge branch 'dev' into 6098_lilium_token_copy	2024-01-03 08:22:20 +00:00
Javier Segarra	b00b2941c7	refs #6098 perf: define locale equivalences in i18n folder	2024-01-03 09:18:35 +01:00
Carlos Satorres	013a00d653	Merge pull request 'refs #6256 lv breakword' (!104) from 6256-breakWord into dev ... Reviewed-on: #104 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-03 08:18:14 +00:00
Javier Segarra	899ccc097a	refs #6098 perf: remove import.meta.glob	2024-01-03 09:18:13 +01:00
Javier Segarra	ac660fadd7	refs #6098 feat: add translate for copyToken	2024-01-03 09:17:28 +01:00
Carlos Satorres	be02a1f47a	Merge branch 'dev' into 6256-breakWord	2024-01-03 08:16:56 +00:00
Jorge Penadés	e711040876	Merge pull request 'refactor: refs #5835' (!129) from 5835-fixListAndSummary into dev ... Reviewed-on: #129 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-03 08:04:37 +00:00
Alex Moreno	09cd5464fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-03 09:00:42 +01:00
Alex Moreno	0a44c43715	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-03 09:00:39 +01:00
Alex Moreno	ba0b3f260f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-01-03 09:00:13 +01:00
Jorge Penadés	a93ffda59b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2024-01-03 08:59:09 +01:00
Carlos Satorres	9f4962750f	Merge pull request 'refs #6578 order claimState' (!133) from 6578-orderClaim into dev ... Reviewed-on: #133 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-03 07:55:34 +00:00
Carlos Satorres	f2c29baeb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-amountClaimLines	2024-01-03 08:20:40 +01:00
Carlos Satorres	de57e6400b	Merge pull request 'refs #6584 hotfix await' (!132) from 6584-hotfixRegularize into master ... Reviewed-on: #132 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-03 07:10:46 +00:00
Alex Moreno	046b69d89e	warmFix(ticketSummary): change this. → .value	2024-01-03 07:47:38 +01:00
Alex Moreno	41066387f9	Merge branch 'dev' into 6578-orderClaim	2024-01-03 06:45:19 +00:00
Pablo Natek	660906fa0e	Merge branch 'dev' into 6259-ticketSmsToClientSms	2024-01-02 17:35:31 +00:00
Kevin Martinez	a5cbc55a7e	Fix form model feedback	2024-01-02 12:36:09 -04:00
Kevin Martinez	c29586632c	Fix order feedback	2024-01-02 12:29:34 -04:00
William Buezas	36ae5ab538	Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2	2024-01-02 12:57:35 -03:00
William Buezas	49bb222343	create form popup reutilizable component	2024-01-02 12:57:13 -03:00
Carlos Fonseca	74a9d8dbb9	Merge pull request 'Se hacen maquetado general de menu izquierdo en summary de clientes' (#52) from features/ms_93_items_left_menu into dev ... Reviewed-on: hyervoni/salix-front-mindshore#52	2024-01-02 15:44:15 +00:00
Kevin Martinez	606f4f0892	Implement orders catalog tag filter	2024-01-02 11:40:07 -04:00
Carlos Fonseca	3118d64d5d	Merge pull request 'Solucion comentario' (#51) from fixes/issuecomment_37214 into branch-PR-2 ... Reviewed-on: hyervoni/salix-front-mindshore#51	2024-01-02 15:30:32 +00:00
carlosfonseca	b0b8205b52	Solucion comentario	2024-01-02 10:28:52 -05:00
Carlos Fonseca	73128cbf99	Merge pull request 'fixes-pr-2' (#50) from fixes-pr-2 into branch-PR-2 ... Reviewed-on: hyervoni/salix-front-mindshore#50	2024-01-02 13:38:17 +00:00
William Buezas	219bacaebc	merge with branch branch-PR2	2024-01-02 10:35:48 -03:00
carlosfonseca	bf259b5fad	Correcciones a branch pr 2	2024-01-02 08:12:44 -05:00
carlosfonseca	677660f5cc	Se hacen maquetado general de menu izquierdo en summary de clientes	2024-01-02 06:54:15 -05:00
Jorge Penadés	c6f8bbd616	Merge pull request 'add filter: refs #6606' (!140) from 6606-fixExportBtn into dev ... Reviewed-on: #140 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 11:49:20 +00:00
Jorge Penadés	34e71c1900	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary	2024-01-02 12:48:03 +01:00
William Buezas	9b9ac4dfe1	PR fixes	2024-01-02 08:47:38 -03:00
William Buezas	a2c96d276e	Supplier Basic data, Billing data and Fiscal data	2024-01-02 08:17:04 -03:00
Jorge Penadés	9b069fbddd	add filter: refs #6606	2024-01-02 11:38:43 +01:00
Javier Segarra	a6484964dd	Merge pull request 'refs #6363 - Fix style in LoginMain when darkmode is activated' (!131) from 6363_lilium_darkMode_login into dev ... Reviewed-on: #131 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 09:23:54 +00:00
Javier Segarra	855164015a	Merge branch 'dev' into 6363_lilium_darkMode_login	2024-01-02 09:22:12 +00:00
Javier Segarra	1b5fd42b96	Merge pull request 'Add button to copy current token' (!130) from 6098_lilium_token_copy into dev ... Reviewed-on: #130 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 09:21:30 +00:00
Javier Segarra	9c6de604f3	Merge branch 'dev' into 6098_lilium_token_copy	2024-01-02 09:18:50 +00:00
Alex Moreno	7f3cfddb25	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-02 09:21:06 +01:00
Alex Moreno	24818f5daa	refs #5835 fix(invoiceOutSummary): add ?.	2024-01-02 09:19:29 +01:00