947 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	82536847f5	Merge branch 'dev' into 6098_lilium_token_copy	2024-01-02 07:32:56 +00:00
Jorge Penadés	c09848a1cf	Merge pull request 'logs added: refs #6605' (!139) from 6605-invoiceInLog into dev ... Reviewed-on: #139 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-02 07:31:00 +00:00
Jorge Penadés	d374709d4a	logs added: refs #6605	2023-12-29 08:58:32 +01:00
Javier Segarra	3cdaa57403	Merge branch 'dev' into 6098_lilium_token_copy	2023-12-22 11:25:13 +00:00
Carlos Satorres	8761f4baaa	Merge pull request 'refs #6128 recharge photo' (!134) from 6128-rechargePhotos into dev ... Reviewed-on: #134 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-21 13:19:41 +00:00
Carlos Satorres	f71f341aad	refs #6128 change stateColor	2023-12-21 12:15:01 +01:00
Carlos Satorres	8499bcbe19	refs #6218 refactor dmsFilter	2023-12-21 08:28:03 +01:00
Carlos Satorres	350bc5a3c9	refs #6128 recharge photo	2023-12-20 15:25:45 +01:00
Javier Segarra	bce4551847	refs #6098 feat: copy userToken to clipboard	2023-12-20 09:51:57 +01:00
Alex Moreno	c9023449c9	refs #6062 fix: correct version	2023-12-15 08:18:48 +01:00
Alex Moreno	eed3267a11	refs #6062 test: fixed e2e due to change of style in the indexes	2023-12-15 08:16:54 +01:00
Alex Moreno	f5cf47b60d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2023-12-15 07:25:47 +01:00
Alex Moreno	f7ebb86960	refs #6576 fix: correct version	2023-12-14 11:42:37 +01:00
Alex Moreno	a149928015	refs #6062 fix: invoiceIn translation	2023-12-13 14:44:56 +01:00
Alex Moreno	6a440e053b	Merge pull request 'refs #6062 fix: migration errors' (!126) from 6062-migration-v1 into dev ... Reviewed-on: #126 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2023-12-13 13:40:38 +00:00
Alex Moreno	bbb2dadc9d	refs #6062 test: fix value name	2023-12-13 14:36:01 +01:00
Alex Moreno	7557096af6	refs #6062 fix: migration errors	2023-12-13 14:19:42 +01:00
Jorge Penadés	055f10e6ff	Merge pull request 'refs #5835 migrateInvoiceIn' (!110) from 5835-migrateInvoiceIn into dev ... Reviewed-on: #110 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-13 10:25:06 +00:00
Jorge Penadés	d1a5029ef7	refs #5835 refactor	2023-12-12 12:11:45 +01:00
Jorge Penadés	2c5dc276b2	refs #5835	2023-12-12 09:01:32 +01:00
Jorge Penadés	22a634e7eb	refs #5835 refactor taxRate	2023-12-11 13:49:50 +01:00
Jorge Penadés	61955268f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-11 12:36:07 +01:00
Jorge Penadés	0e6417ff6a	Merge pull request 'ref #6104 recreate vnlog' (!96) from 6104-changeVnLog into dev ... Reviewed-on: #96 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-12-11 11:34:36 +00:00
Jorge Penadés	e7c9a18f36	refs #6104 fix package	2023-12-11 12:29:31 +01:00
Jorge Penadés	d2e9a4cde4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-11 12:00:10 +01:00
Jorge Penadés	63372df35a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog	2023-12-11 11:59:46 +01:00
Jorge Penadés	52622d9a00	refs #6104 fix tests	2023-12-11 11:59:01 +01:00
Carlos Satorres	fbb59b8d61	Merge pull request 'refs #5633 create componente VnAccountNumber' (!118) from 5633-accountNumberComponent into dev ... Reviewed-on: #118 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-12-11 08:36:32 +00:00
Carlos Satorres	f5e89a9edc	Merge branch 'dev' into 5633-accountNumberComponent	2023-12-11 08:31:08 +00:00
Jorge Penadés	42c34f7a46	refs #6104 merge conflicts	2023-12-11 09:11:39 +01:00
Pablo Natek	5c84a68ca6	Merge pull request '6475-descriptor_preview' (!109) from 6475-descriptor_preview into dev ... Reviewed-on: #109 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-11 07:27:42 +00:00
Jorge Penadés	ea12508fff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-11 08:27:07 +01:00
Pablo Natek	e7d22052a7	merge(dev): refs #6475 merge dev	2023-12-11 06:45:48 +01:00
Pablo Natek	1c3fc57e3d	feat: refs #6475 open descriptor proxy an show summary dialog button	2023-12-11 06:35:54 +01:00
Jorge Penadés	479c782492	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog	2023-12-07 16:25:13 +01:00
Jorge Penadés	09ff922c94	Merge pull request 'refs #5876 spinnerOnLoading' (!125) from 5876-spinnerOnLoading into dev ... Reviewed-on: #125 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 15:23:53 +00:00
Jorge Penadés	e15b14cd81	refs #5876 use palette color	2023-12-07 16:18:16 +01:00
Jorge Penadés	89198ffe11	Merge pull request 'ref #6175 VnLinkPhone and MicroSIP icon created' (!87) from 6175-addMicrosipLink into dev ... Reviewed-on: #87 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 15:09:18 +00:00
Jorge Penadés	4ac353bcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5876-spinnerOnLoading	2023-12-07 16:07:56 +01:00
Jorge Penadés	575fa58dc6	Merge branch '6175-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink	2023-12-07 15:52:53 +01:00
Jorge Penadés	97789f2cdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink	2023-12-07 15:51:58 +01:00
Jorge Penadés	2f63a7f1fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn	2023-12-07 15:49:53 +01:00
Pablo Natek	fd1f46ffc6	feat(claimList): refs #6475 claimList add links	2023-12-07 12:51:47 +01:00
Javier Segarra	745fcfe2c9	Merge pull request 'Merge dev-test' (!123) from dev into test ... Reviewed-on: #123 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 08:44:38 +00:00
Javier Segarra	e45f4b38bb	Merge pull request 'ci: dev-test' (!124) from #6527_dev-test into dev ... Reviewed-on: #124 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 08:23:39 +00:00
Javier Segarra	84226d48ed	ci: dev-test	2023-12-07 08:46:38 +01:00
Javi Gallego	e82c675d7d	Merge branch 'test' into dev	2023-12-07 07:54:39 +01:00