14811 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Joan Sanchez	d9f4227ffa	Merge pull request 'refs #5368 Fix expedition-pallet-label' (!1378) from 5368-fix-expedition-pallet-label into dev ... Reviewed-on: #1378	2023-03-13 09:38:01 +00:00
Joan Sanchez	b58135f611	Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev ... Reviewed-on: #1379 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-13 09:37:42 +00:00
Joan Sanchez	60c137b280	Merge branch 'dev' into 5368-fix-expedition-pallet-label	2023-03-13 09:19:39 +00:00
Joan Sanchez	9bc86b1617	Added missing relation	2023-03-10 13:29:11 +01:00
Vicent Llopis	c105316a04	delete testBack	2023-03-09 10:05:24 +01:00
Vicent Llopis	9094c4f1cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-tryToSolve_intermittentBackTest	2023-03-09 09:42:08 +01:00
Vicent Llopis	223b8f6d00	fix: intermittentBack test	2023-03-09 09:41:51 +01:00
Joan Sanchez	24f0ca5168	Merge pull request '5240-ticket.sale-tracking_2' (!1376) from 5240-ticket.sale-tracking_2 into dev ... Reviewed-on: #1376 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-09 08:05:48 +00:00
Vicent Llopis	b85624085a	fix backTest: add columns to table tpvTransaction	2023-03-09 08:24:21 +01:00
Vicent Llopis	c46d325e23	fix: add transaction	2023-03-09 07:58:39 +01:00
Guillermo Bonet	0c22c1b0de	refs #5368 Fix expedition-pallet-label	2023-03-08 17:30:28 +01:00
Vicent Llopis	e20464cc7c	update css	2023-03-08 13:14:06 +01:00
Joan Sanchez	c3cf3f3d91	Merge pull request '5090-renameGoLabel' (!1362) from 5090-renameGoLabel into dev ... Reviewed-on: #1362 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-08 09:52:53 +00:00
Joan Sanchez	63694f4478	Merge branch 'dev' into 5090-renameGoLabel	2023-03-08 09:47:47 +00:00
Joan Sanchez	4d2d75e066	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 10:19:11 +01:00
Joan Sanchez	aeb50b2c19	Removed callback syntax	2023-03-08 10:19:02 +01:00
Joan Sanchez	56d3b32af5	Merge branch 'dev' into 5090-renameGoLabel	2023-03-08 09:12:53 +00:00
Joan Sanchez	c93d3f8846	Updated front unit test	2023-03-08 07:47:25 +01:00
Javi Gallego	bb691ccf1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 07:45:25 +01:00
Javi Gallego	98c8cd67e5	minor bug	2023-03-08 07:45:22 +01:00
Joan Sanchez	9050c06994	Updated unit test	2023-03-08 07:44:56 +01:00
Joan Sanchez	3ad96b6ad7	Endpoint fixes	2023-03-07 11:55:13 +01:00
Joan Sanchez	445a0b0e1f	Claim fixes	2023-03-07 10:20:10 +01:00
Joan Sanchez	44e7abd6d3	Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev ... Reviewed-on: #1370 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-07 08:28:13 +00:00
Javi Gallego	0a44a39d28	Merge pull request '5187-error-permisos' (!1366) from 5187-error-permisos into dev ... Reviewed-on: #1366 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-07 07:50:26 +00:00
Javi Gallego	a856b20dc9	Merge branch 'dev' into 5187-error-permisos	2023-03-07 07:20:21 +00:00
Joan Sanchez	0c36c737e2	Merge pull request '5177-smart_check_fix' (!1371) from 5177-smart_check_fix into dev ... Reviewed-on: #1371	2023-03-07 07:16:26 +00:00
Joan Sanchez	14a5c78303	Updated unit test	2023-03-07 08:13:07 +01:00
Joan Sanchez	0d2339686c	Updated changelog	2023-03-07 08:10:52 +01:00
Joan Sanchez	e8e8392e5d	Updated changelog	2023-03-07 07:58:08 +01:00
Joan Sanchez	c0ff6bea57	fix(smartTable): fixed filtering with an intermediate check ... Refs: #5177	2023-03-07 07:47:30 +01:00
Javi Gallego	4a32c164a6	template string	2023-03-07 07:34:08 +01:00
Joan Sanchez	bc0a6c33c4	Merge branch 'dev' into 5187-error-permisos	2023-03-06 13:50:21 +00:00
Joan Sanchez	9f4aed7d83	Updated unit test	2023-03-06 13:44:03 +01:00
Joan Sanchez	4f091330a7	feat(claimLog): added claim log section ... Refs: #5340	2023-03-06 12:37:37 +01:00
Alexandre Riera	6e984d8527	Merge pull request 'refactor tests ticketFutureAdvance' (!1369) from refactor-e2e-ticketFutureAdvance into dev ... Reviewed-on: #1369 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-06 11:17:14 +00:00
Alexandre Riera	7f076109f5	Merge branch 'dev' into refactor-e2e-ticketFutureAdvance	2023-03-06 11:05:00 +00:00
Alexandre Riera	a6bf61033f	refactor tests	2023-03-06 12:04:16 +01:00
Vicent Llopis	0f021c5183	Merge pull request '5035-intermittent_backTest2' (!1365) from 5035-intermittent_backTest2 into dev ... Reviewed-on: #1365 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-06 08:32:14 +00:00
Juan Ferrer	47f1ad9a0c	Merge pull request 'master' (!1367) from master into test ... Reviewed-on: #1367	2023-03-06 08:28:29 +00:00
Juan Ferrer	e83b518470	refs #3723 Set docker memory limit	2023-03-06 09:23:24 +01:00
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +01:00
Juan Ferrer	99f8bc6bac	refs #5174 TpvTransaction.confirm code refator to improve debugging	2023-03-03 18:55:58 +01:00
Vicent Llopis	727ae1d4e0	Merge branch 'dev' into 5035-intermittent_backTest2	2023-03-03 12:11:28 +00:00
Joan Sanchez	5984d6820b	Merge pull request '5349-hotfix_report_invoice' (!1364) from 5349-hotfix_report_invoice into master ... Reviewed-on: #1364	2023-03-03 11:43:28 +00:00
Vicent Llopis	8ac575419a	fix: no mostraba la factura rectificada correcta	2023-03-03 12:31:20 +01:00
Juan Ferrer	73c988b18e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-03-03 10:57:59 +01:00
Juan Ferrer	6eaf4bdd1b	refs #5174 tpvTransaction: Añadidas columnas para depuración	2023-03-03 10:57:57 +01:00
Alexandre Riera	f9f58c28d5	Merge pull request 'hotfix itemWaste' (!1363) from hotfix-itemWaste-openOtherTab into master ... Reviewed-on: #1363	2023-03-03 09:01:30 +00:00