12000 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	4118f52a2f	Force master update	2022-06-20 10:04:00 +02:00
Juan Ferrer	504fb9acea	docker-compose fixes	2022-06-19 13:17:48 +02:00
Joan Sanchez	70632ddc7c	Clean	2022-06-04 12:58:58 +02:00
Joan Sanchez	5918ddce3c	Fix table cleaning	2022-06-04 12:45:02 +02:00
Joan Sanchez	0bb142a5d9	Removed rmdir	2022-06-04 12:25:05 +02:00
Joan Sanchez	96f500d161	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-06-03 14:00:05 +02:00
Joan Sanchez	5059f72ea5	Clean directory	2022-06-03 13:54:58 +02:00
Joan Sanchez	bdb581db94	Disable file delete	2022-06-03 13:47:40 +02:00
Joan Sanchez	391960b390	Fixed sql table name	2022-06-03 13:27:58 +02:00
Joan Sanchez	3752ca2347	Changed when file is removed	2022-06-03 13:22:32 +02:00
Joan Sanchez	33049c507f	Transaction fix	2022-06-03 13:01:39 +02:00
Joan Sanchez	b790ee88d9	Edi fixes	2022-06-03 12:57:39 +02:00
Joan Sanchez	9bb264da38	Fixes	2022-06-03 12:52:41 +02:00
Joan Sanchez	d0e7ef8f47	Fixed SQL templates	2022-06-03 12:44:39 +02:00
Joan Sanchez	b1ce77d362	Debug logs	2022-06-03 12:35:45 +02:00
Joan Sanchez	b98ac4f233	Debugging logs	2022-06-03 12:18:06 +02:00
Joan Sanchez	f3eb36f8ee	Edi fixes	2022-06-03 11:47:43 +02:00
Joan Sanchez	77f3af7679	Merge pull request 'MASTER_hotFix(ticket_expedition): delete e.checked in filter' (#992) from hotFix_ticket_expedition_filter into master ... Reviewed-on: #992 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-06-02 13:46:30 +00:00
Alex Moreno	4e3380cf65	hotFix(ticket_expedition): delete e.checked in filter	2022-06-02 15:28:11 +02:00
Joan Sanchez	fab4705618	Rollback	2022-06-01 14:01:19 +02:00
Joan Sanchez	4ac26895ba	fix(regularizeClaim): refound with negative quantity ... Refs: #4148	2022-06-01 09:36:47 +02:00
Joan Sanchez	54fdcb354f	Merge pull request 'MASTER-4141-fix(monitor_ticket): add isTooLittle problem' (#988) from 4141-monitor_ticket_problems into master ... Reviewed-on: #988	2022-05-31 11:37:27 +00:00
Alex Moreno	7c7c64415d	fix(monitor_ticket): add isTooLittle problem	2022-05-31 12:00:15 +02:00
Joan Sanchez	b3f0133ece	Merge pull request '4128-hotFix(client): fiscal-data edit by salesAssistant' (#986) from 4128-client_fiscalData into master ... Reviewed-on: #986 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-27 08:13:54 +00:00
Alex Moreno	2b10abbe24	typo	2022-05-27 10:08:40 +02:00
Alex Moreno	ff264ab930	hotFix(client): fiscal-data edit by salesAssistant	2022-05-27 09:45:08 +02:00
Joan Sanchez	2ec03a5b99	Merge pull request '4049-hotFix_changesWithReferenceTable' (#984) from 4049-hotFix_changesWithReferenceTable into master ... Reviewed-on: #984	2022-05-24 13:03:32 +00:00
Alex Moreno	47ab4fc2c1	intro	2022-05-24 14:52:26 +02:00
Alex Moreno	7a69d53642	fix(changes): add reference table	2022-05-24 14:50:33 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Joan Sanchez	e294582039	Merge pull request '4058-fix(entry_latest-buys): fix multi_check_TEST' (#978) from 4058-multi-check_fix into test ... Reviewed-on: #978	2022-05-18 08:24:54 +00:00
Alex Moreno	4a9c5742c0	fix(entry_latest-buys): fix multi_check	2022-05-17 13:50:06 +02:00
Joan Sanchez	576cad16ad	SQL fixes	2022-05-16 11:34:29 +02:00
Carlos Jimenez Ruiz	d7c790de4f	Merge pull request '4037-fix(multi-check)' (#973) from 4037-multi-check_align into dev ... Reviewed-on: #973 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-16 08:35:54 +00:00
Carlos Jimenez Ruiz	5747fbbd2f	Merge branch 'dev' into 4037-multi-check_align	2022-05-16 08:29:42 +00:00
Carlos Jimenez Ruiz	9f246f08d5	Merge pull request '3409-clientCredit_maxRows' (#963) from 3409-clientCredit_maxRows into dev ... Reviewed-on: #963 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-05-16 08:24:40 +00:00
Alex Moreno	1707ff7f0f	duplicate test	2022-05-16 10:24:02 +02:00
Alex Moreno	ef9158ee36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4037-multi-check_align	2022-05-16 10:23:12 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Joan Sanchez	c88fe629cd	Removed duplicated version	2022-05-16 08:21:12 +02:00
Joan Sanchez	a71e53fdf4	Merge pull request '3893-supplier.fiscal-data' (#947) from 3893-supplier.fiscal-data into dev ... Reviewed-on: #947 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-16 06:05:30 +00:00
Vicent Llopis	10cd9c5b87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data	2022-05-16 07:22:16 +02:00
Vicent Llopis	40bcc56758	refactor: change acl	2022-05-16 07:22:01 +02:00
Joan Sanchez	3c738efb2a	Merge pull request 'gulp-jasmine replaced by jasmine' (#971) from gulp-jasmine_deprecation into dev ... Reviewed-on: #971 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-13 17:03:57 +00:00
Carlos Jimenez Ruiz	6e9fedf2b5	tests batteries command updated on readme	2022-05-13 18:41:53 +02:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz	7bafc48d68	removed CI references for e2e	2022-05-13 18:29:20 +02:00
Carlos Jimenez Ruiz	39413c145d	e2e test battery moved out of gulp to npm script	2022-05-13 17:09:41 +02:00
Joan Sanchez	567d5b1ad9	Merge pull request '3771-ticket.expedition' (#970) from 3771-ticket.expedition into dev ... Reviewed-on: #970 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-05-13 13:38:35 +00:00