11309 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	17b178b6bf	Merge branch 'test' into dev	2022-02-19 14:06:18 +01:00
Juan Ferrer	6f1bfbd955	roleConfig: fixes & refactor	2022-02-19 14:05:35 +01:00
Joan Sanchez	b4c4c6dfff	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-18 08:50:50 +01:00
Joan Sanchez	c260917e20	fix(closure): removed transaction	2022-02-18 08:49:31 +01:00
Alex Moreno	46488aa600	fix(icon): icon-plant	2022-02-18 08:12:37 +01:00
Joan Sanchez	3c0ee8bd5b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-17 12:30:07 +01:00
Vicent Llopis	05aa579156	fix: add role salesBoss to filter	2022-02-17 12:29:09 +01:00
Joan Sanchez	d15623cbe1	Merge pull request '3599-claim_search-panel' (#879) from 3599-claim_search-panel into dev ... Reviewed-on: #879 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-17 11:28:49 +00:00
Vicent Llopis	e1c17246ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3599-claim_search-panel	2022-02-17 12:02:25 +01:00
Joan Sanchez	dc04ed8e3a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-17 11:41:15 +01:00
Joan Sanchez	2bdb1075fb	fix(invoice): prevent report empty pages	2022-02-17 11:25:20 +01:00
Joan Sanchez	743972e9c3	fix(invoice): prevent report empty pages	2022-02-17 11:23:27 +01:00
Joan Sanchez	525d16335f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-17 09:29:49 +01:00
Joan Sanchez	8b60dbacfa	fix(report): Check ticket property first	2022-02-17 09:27:11 +01:00
Vicent Llopis	34730f48ed	fix: add role salesBoss to filter	2022-02-16 12:51:45 +01:00
Joan Sanchez	3e33436bf6	fix(report): Check ticket property first	2022-02-16 09:53:38 +01:00
Joan Sanchez	59ad70c4ac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-16 08:16:17 +01:00
Joan Sanchez	9a1b90eec4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-02-15 13:36:06 +01:00
Joan Sanchez	5a2677c7de	Removed icons font color	2022-02-15 13:21:13 +01:00
Carlos Jimenez Ruiz	9ec8eb6e16	Merge pull request '3315 - feat(notification): notify client metrics' (#876) from 3315-notify_metrics into dev ... Reviewed-on: #876 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-15 11:19:40 +00:00
Joan Sanchez	633679e26e	Merge branch 'dev' into 3315-notify_metrics	2022-02-15 10:52:34 +00:00
Joan Sanchez	5518fac357	Updated unit tests	2022-02-14 08:44:22 +01:00
Carlos Jimenez Ruiz	0c93e0fa70	Merge pull request '3591-feat(order_summary): change salesPersonFk for clientFk' (#874) from 3591-order_summary into dev ... Reviewed-on: #874 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-02-10 08:29:43 +00:00
Joan Sanchez	f4ff854a1f	feat(notification): notify client metrics ... Refs: 3315	2022-02-09 14:06:06 +01:00
Alex Moreno	ef281bb663	feat(order_summary): change salesPersonFk for clientFk	2022-02-09 12:39:08 +01:00
Joan Sanchez	db0fe766b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-02-09 08:24:25 +01:00
Alex Moreno	2e649e81d6	fix(test): fixed bugs non compatible ECMA options	2022-02-09 08:23:41 +01:00
Joan Sanchez	2809b6c7c1	Merge pull request '3570-feat(setQuantitySale): back route and test' (#869) from 3558-setQuantitySale into dev ... Reviewed-on: #869 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-08 12:11:22 +00:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Alex Moreno	d7a3821d05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale	2022-02-08 12:16:41 +01:00
Joan Sanchez	b9c83cba1b	Merge pull request '3585-invoiceIn_dueDate' (#872) from 3585-invoiceIn_dueDate into dev ... Reviewed-on: #872 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-08 08:43:40 +00:00
Joan Sanchez	8db6424b6d	Merge branch 'dev' into 3585-invoiceIn_dueDate	2022-02-08 08:41:02 +00:00
Joan Sanchez	a726667c63	Merge pull request '3258-Entry.buys' (#873) from 3258-import_buys into dev ... Reviewed-on: #873 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-08 08:37:20 +00:00
Carlos Jimenez Ruiz	4f1d34069b	corrected some typos	2022-02-08 09:27:39 +01:00
Carlos Jimenez Ruiz	00f8946675	feat(entry.buys): each buy groupingMode can now changed	2022-02-07 18:01:45 +01:00
Carlos Jimenez Ruiz	485da4d0a7	added groupingMode to getBuys	2022-02-07 18:00:23 +01:00
Carlos Jimenez Ruiz	cb21d4db01	removed a typo	2022-02-07 17:59:40 +01:00
Vicent Llopis	f7297801f8	add due day section	2022-02-07 12:24:08 +01:00
Alex Moreno	e08a3d31bc	remove f of focus	2022-02-07 08:23:19 +01:00
Alex Moreno	dc78cd2dc5	feat(collection): setQuantitySale	2022-02-07 08:05:05 +01:00
Alex Moreno	e958453831	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale	2022-02-07 08:01:38 +01:00
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