14993 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	5c2c99e397	refs #5172 changed icon name	2023-02-20 09:44:14 +01:00
Alexandre Riera	b926666b25	refs #5220 fonts updated	2023-02-20 09:38:24 +01:00
Alexandre Riera	0a81f78a72	Merge branch '5036-regularizar-historicos' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-20 09:20:37 +01:00
Alexandre Riera	77066b2005	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-20 09:20:30 +01:00
Alexandre Riera	2a8cb17297	Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-20 08:32:41 +01:00
Alexandre Riera	c1fe09ab5d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-20 08:32:33 +01:00
Alexandre Riera	08476fe2a6	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-17 13:30:47 +00:00
Joan Sanchez	86dd299292	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-17 13:33:52 +01:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Joan Sanchez	46fdaab649	Merge pull request 'test -> dev' (!1335) from test into dev ... Reviewed-on: #1335 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-17 12:23:11 +00:00
Vicent Llopis	e57cef4e5c	Merge pull request 'hotfix_test_item.avilable' (!1334) from hotfix_test_item.avilable into test ... Reviewed-on: #1334 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-17 12:09:42 +00:00
Vicent Llopis	677840e7cf	Merge pull request 'hotfix-item.tags_card_reload' (!1332) from hotfix-iten.tags_card_reload into master ... Reviewed-on: #1332	2023-02-17 12:08:53 +00:00
Vicent Llopis	39a3c8a7fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 13:06:30 +01:00
Vicent Llopis	cc942e9000	Merge pull request 'move changes sql' (!1333) from move_changes_sql into dev ... Reviewed-on: #1333 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-17 12:06:23 +00:00
Vicent Llopis	c1b6d949dd	delete changelog	2023-02-17 13:03:02 +01:00
Vicent Llopis	c6304898b4	refactor: borrado insert, se ha hecho directamente sobre produccion	2023-02-17 13:00:02 +01:00
Vicent Llopis	1db23b83c8	delete changelog	2023-02-17 12:56:47 +01:00
Vicent Llopis	7883723b8c	move changes sql	2023-02-17 12:54:59 +01:00
Vicent Llopis	853e06f523	fix: card reload automatic	2023-02-17 12:38:07 +01:00
Joan Sanchez	9525c17355	Merge pull request '5207 Deprecado zerofill' (!1331) from 5207-zerofill_deprecated into dev ... Reviewed-on: #1331	2023-02-17 11:05:17 +00:00
Joan Sanchez	31da648842	Updated e2e	2023-02-17 11:21:31 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Vicent Llopis	bbbb89d814	Merge pull request 'move sql changes' (!1330) from 5097-item.summary_moveChangesSql into dev ... Reviewed-on: #1330 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-02-17 09:47:55 +00:00
Vicent Llopis	77c454f953	move sql changes and add changelog	2023-02-17 10:45:08 +01:00
Vicent Llopis	373be40986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 10:42:50 +01:00
Vicent Llopis	d869cccdb9	add changelog	2023-02-17 10:39:12 +01:00
Vicent Llopis	5285ad9242	move sql changes	2023-02-17 10:19:12 +01:00
Joan Sanchez	a59dac2b9f	Added version 230801	2023-02-17 10:12:29 +01:00
Vicent Llopis	4001a75916	Merge branch 'dev' into 5180-invoice-out_refund	2023-02-17 08:57:48 +00:00
Vicent Llopis	af92aa60e9	Merge pull request '5097-item.summary_available' (!1312) from 5097-item.summary_available into dev ... Reviewed-on: #1312 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-02-17 08:54:22 +00:00
Vicent Llopis	874f459956	refactor: borrada variable innecesaria	2023-02-17 09:49:47 +01:00
Vicent Llopis	d25ebaec0b	Merge branch 'dev' into 5097-item.summary_available	2023-02-17 08:47:56 +00:00
Vicent Llopis	885a98457e	feat: sustido sql por loopback del report 'balance-compensation'	2023-02-17 09:11:20 +01:00
Alexandre Riera	c5fc4e4b81	Merge pull request 'hotFix #5194 cambios ticketFutureAdvance' (!1320) from 5194-cambios-ticketFutureAdvance into master ... Reviewed-on: #1320	2023-02-16 14:05:43 +00:00
Alexandre Riera	4cae4448f6	refs #5194 moved invoiceOut to 230402	2023-02-16 14:45:11 +01:00
Alexandre Riera	8b088e831a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:43:51 +01:00
Alexandre Riera	ef12a428cd	Merge pull request 'hotFix #5223 Mostrar cliente compensado al enviar email' (!1327) from 5223-cliente-compensado into master ... Reviewed-on: #1327	2023-02-16 13:40:33 +00:00
Alexandre Riera	ec16a0d66c	Merge branch '5194-cambios-ticketFutureAdvance' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:35:33 +01:00
Alexandre Riera	457fd3f5f9	refs #5194 sql moved to 230404	2023-02-16 14:35:03 +01:00
Joan Sanchez	3031ae2511	Updated version	2023-02-16 14:28:33 +01:00
Joan Sanchez	acf5981a5f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-16 14:20:05 +01:00
Vicent Llopis	c69679e204	test	2023-02-16 12:02:36 +01:00
Vicent Llopis	b5d2d53435	fix: test back	2023-02-16 10:45:13 +01:00
Vicent Llopis	3096738b84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-16 09:52:18 +01:00
Vicent Llopis	76f2030125	feat: add update sql	2023-02-16 09:50:25 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	dc2ab50f65	fix: test e2e	2023-02-16 09:44:06 +01:00
Alexandre Riera	ad5dcf5d75	Merge branch 'dev' into 5036-regularizar-historicos	2023-02-16 07:55:14 +00:00
Alexandre Riera	f42fbb80ec	refs #5036 changes	2023-02-16 08:54:45 +01:00
Vicent Llopis	bb2eddc462	fix: test front	2023-02-16 07:32:44 +01:00