11318 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	9501d93217	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys	2022-02-04 15:25:12 +01:00
Carlos Jimenez Ruiz	912ea12ff7	Merge pull request '3587-ticket_isEmpty' (#871) from 3587-ticket_isEmpty into dev ... Reviewed-on: #871 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-04 12:02:33 +00:00
Carlos Jimenez Ruiz	7b2702ccbf	Merge branch 'dev' into 3587-ticket_isEmpty	2022-02-04 10:38:39 +00:00
Alex Moreno	9df70cb30d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale	2022-02-04 07:41:34 +01:00
Joan Sanchez	1fd84f583d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-03 12:02:35 +01:00
Joan Sanchez	2fa284cd4b	Updated report anchor	2022-02-03 12:02:20 +01:00
Alex Moreno	460923464a	fix(icon): icon-plant	2022-02-03 11:52:55 +01:00
Alex Moreno	dc47af7224	feat(ticket): isEmpty ticketRequest not necessary isOk	2022-02-03 11:51:50 +01:00
Carlos Jimenez Ruiz	fe13b33efc	Merge pull request '3552-feat(monitor_ticket): classColor in db' (#864) from 3552-monitor_ticket_state into dev ... Reviewed-on: #864 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-03 09:51:35 +00:00
Carlos Jimenez Ruiz	e9189509c2	Merge branch 'dev' into 3552-monitor_ticket_state	2022-02-03 09:50:01 +00:00
Carlos Jimenez Ruiz	5c75050e11	Merge pull request '3586-claim_filter and non ECMA compatible bugs' (#870) from 3586-claim_filter into dev ... Reviewed-on: #870 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-03 09:49:19 +00:00
Carlos Jimenez Ruiz	4641f53108	Merge branch 'dev' into 3586-claim_filter	2022-02-03 09:37:48 +00:00
Carlos Jimenez Ruiz	3c13bbbf5f	Merge pull request '3563-feat(item_index): add column producer' (#866) from 3563-item_index_producer into dev ... Reviewed-on: #866 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-03 09:37:23 +00:00
Alex Moreno	c004ee638c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer	2022-02-03 10:34:48 +01:00
Alex Moreno	902714ba7d	feat(item_index): add producer basic filter	2022-02-03 10:32:59 +01:00
Alex Moreno	1250382209	missing zero	2022-02-03 09:52:17 +01:00
Alex Moreno	386155f242	feat(setQuantitySale): transaction	2022-02-02 14:55:21 +01:00
Alex Moreno	9296ff83aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale	2022-02-02 14:54:57 +01:00
Alex Moreno	91b6dcee05	fix(test): fixed bugs non compatible ECMA options	2022-02-02 14:33:16 +01:00
Alex Moreno	001aed3cb5	fix(claim): filter created	2022-02-02 14:32:16 +01:00
Joan Sanchez	58cbdb3c52	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-02 09:45:08 +01:00
Joan Sanchez	483a67e8b5	fix(salesFilter): search by ticket id	2022-02-02 09:26:33 +01:00
Joan Sanchez	4de2220b5c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-02 09:07:03 +01:00
Alex Moreno	77d0dcae0d	feat(setQuantitySale): back route and test	2022-02-02 08:28:07 +01:00
Alex Moreno	e5548fe2a0	remove delete.keep	2022-02-02 07:24:15 +01:00
Alex Moreno	cb5c4146cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-02 07:23:17 +01:00
Joan Sanchez	8be7f9153e	Removed non compatible ECMA options	2022-02-01 14:50:24 +01:00
Joan Sanchez	d6ba1247d4	Added version 10420-valentines	2022-02-01 14:37:34 +01:00
Carlos Jimenez Ruiz	2aceff56f3	Merge pull request 'Import entry buys from lastest buy' (#861) from 3258-import_buys into dev ... Reviewed-on: #861 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-01 12:12:18 +00:00
Carlos Jimenez Ruiz	5a9523642d	Merge branch 'dev' into 3258-import_buys	2022-02-01 12:07:41 +00:00
Joan Sanchez	52e5c6bc6b	Ammends	2022-02-01 13:01:56 +01:00
Joan Sanchez	2428e2fc6f	Merge branch 'dev' into 3563-item_index_producer	2022-02-01 11:55:11 +00:00
Joan Sanchez	87ae05c997	Added translation	2022-02-01 12:51:38 +01:00
Carlos Jimenez Ruiz	41d8656708	Merge pull request 'fix(loggable): removed private properties from logs' (#867) from 2894-loggable into dev ... Reviewed-on: #867 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-01 11:47:26 +00:00
Joan Sanchez	a4186ce577	Updated e2e	2022-02-01 12:45:06 +01:00
Joan Sanchez	76d3415ece	Merge branch 'dev' into 2894-loggable	2022-02-01 11:42:23 +00:00
Alex Moreno	b5fce504a8	Merge branch '3563-item_index_producer' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer	2022-02-01 12:40:10 +01:00
Alex Moreno	13230a2fe9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer	2022-02-01 12:40:04 +01:00
Alex Moreno	f90607c8c7	change changes folder name	2022-02-01 12:39:58 +01:00
Alex Moreno	a012740742	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-01 12:38:22 +01:00
Alex Moreno	128612a5ab	Merge branch '3552-monitor_ticket_state' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state	2022-02-01 12:38:09 +01:00
Alex Moreno	90ed2fdfac	change changes folder name	2022-02-01 12:38:05 +01:00
Carlos Jimenez Ruiz	dca77ba66f	Merge branch 'dev' into 3563-item_index_producer	2022-02-01 11:28:17 +00:00
Carlos Jimenez Ruiz	44119db16b	Merge pull request '3582-feat(icons): import new icons' (#868) from 3582-icons_import into dev ... Reviewed-on: #868 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-01 11:26:24 +00:00
Carlos Jimenez Ruiz	bce66899c5	corrected a typo	2022-02-01 12:24:11 +01:00
Joan Sanchez	a8900b06b7	Merge branch 'dev' into 3258-import_buys	2022-02-01 10:57:39 +00:00
Alex Moreno	0eb5d8fe1c	feat(icons): import new icons	2022-02-01 11:48:47 +01:00
Joan Sanchez	67985077e7	fix(loggable): removed private properties from logs	2022-02-01 11:24:04 +01:00
Carlos Jimenez Ruiz	054b112223	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys	2022-02-01 11:06:25 +01:00
Carlos Jimenez Ruiz	9fac23038f	Merge pull request '3052-feat(client_defaulter): section and tests' (#858) from 3052-client_defaulter into dev ... Reviewed-on: #858 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-01 09:12:04 +00:00