12689 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	faa8269228	refactor(e2e): added waitForTimeout on descriptor more menus	2021-10-18 11:49:26 +02:00
Joan Sanchez	7689ce3596	Merge branch '3111-uploadPhoto_vertical' of https://gitea.verdnatura.es/verdnatura/salix into 3111-uploadPhoto_vertical	2021-10-18 11:15:21 +02:00
Carlos Jimenez Ruiz	b737bb69d6	Merge branch 'dev' into 3111-uploadPhoto_vertical	2021-10-18 09:14:44 +00:00
Joan Sanchez	0313c8d590	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3111-uploadPhoto_vertical	2021-10-18 11:10:05 +02:00
Carlos Jimenez Ruiz	dd81590ee5	Merge pull request 'Send invoice and delivery-note with CSV file' (#745) from 3094-invoice_csv into dev ... Reviewed-on: #745 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-18 09:09:44 +00:00
Joan Sanchez	ec011cbc4e	Updated JSDOC param	2021-10-18 10:51:20 +02:00
Vicent Llopis	e61e74ed36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 10:27:59 +02:00
Alex Moreno	bf100f339e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary	2021-10-18 10:22:53 +02:00
Joan Sanchez	ff2a1e7617	Removed comments	2021-10-18 10:14:04 +02:00
Joan Sanchez	ee1a7952ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-18 09:44:27 +02:00
Joan Sanchez	93187ea049	Merge pull request '3092-module_transactions' (#740) from 3092-module_transactions into dev ... Reviewed-on: #740 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-10-18 07:42:19 +00:00
Joan Sanchez	b970214a85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-18 09:31:50 +02:00
Joan Sanchez	558c79315f	changes	2021-10-18 09:31:25 +02:00
Joan Sanchez	19b1190480	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2423-hide_leftMenu	2021-10-18 08:38:03 +02:00
Joan Sanchez	776f16641e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-18 08:28:13 +02:00
Joan Sanchez	da5be333d9	fix(osticket): don't show resolved tickets by other deparments	2021-10-18 08:22:14 +02:00
Carlos Jimenez Ruiz	1ba2a924e6	refactor(print): chrimoum is now a single process on each instance with no child processes	2021-10-15 16:15:00 +02:00
Joan Sanchez	e26eed5d30	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 16:07:56 +02:00
Carlos Jimenez Ruiz	ace1c9c84b	fix(transaction): priceDifference now commits its created transaction	2021-10-15 16:02:50 +02:00
Carlos Jimenez Ruiz	c4c1aa929a	refactor(endpoints): corrected indentation and removed unused code	2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz	de7af0fee2	fix(transaction): priceDifference now commits its created transaction	2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz	270b2802c8	refactor(transactions): added transaction to sendChechingPresence and corrected a typo	2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz	05df98939b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-15 14:47:34 +02:00
Carlos Jimenez Ruiz	580ba36357	refactor(jasmine): usage of done on async functions is deprecated	2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz	f1611f8fe0	fix(e2e): many e2e using descriptor more menu need a wait before using the options	2021-10-15 14:42:27 +02:00
Carlos Jimenez Ruiz	2a20a9194a	fix(puppeteer): chrimium now limited to single process with no child processes to avoid ram overload	2021-10-15 14:40:48 +02:00
Carlos Jimenez Ruiz	5e8c216cd2	fix(dependencies): jasmine and it's reporters upgraded	2021-10-15 14:39:45 +02:00
Joan Sanchez	e9539c7675	Restored SQL version	2021-10-15 14:09:07 +02:00
Joan Sanchez	d5cf57fbb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 14:07:48 +02:00
Joan Sanchez	8fabd378e7	Removed version folder	2021-10-15 14:00:15 +02:00
Joan Sanchez	629a8d25b7	Updated pagination styles	2021-10-15 13:49:41 +02:00
Joan Sanchez	b6a9896cba	Fixed monitor problems filter	2021-10-15 12:10:28 +02:00
Joan Sanchez	85b4730c6c	feat(monitor): show client risk to future on tickets ... Refs: 2624	2021-10-15 10:49:23 +02:00
Vicent Llopis	6d05b046e8	feat(last-entries): add dateTo & delete style.scss	2021-10-15 10:34:32 +02:00
Carlos Jimenez Ruiz	99043bd94e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-14 16:21:55 +02:00
Carlos Jimenez Ruiz	946151c966	refactor(e2e): waitForTimeouts needed for descriptors more menu	2021-10-14 16:20:49 +02:00
Carlos Jimenez Ruiz	b81d6b022c	refactor(buy): removed width limit for a column that was breaking e2e behavior	2021-10-14 16:18:04 +02:00
Carlos Jimenez Ruiz	9644c6b9c1	refactor(puppeteer): left comments with paths to firefox and chrome binaries for future references	2021-10-14 16:16:49 +02:00
Carlos Jimenez Ruiz	35a2a71602	refactor(sales): transaction correctly passed to findById	2021-10-14 16:16:00 +02:00
Joan Sanchez	e278491ad2	refactor(order): index filter optimization	2021-10-14 08:48:57 +02:00
Joan Sanchez	d06385fc73	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-13 15:09:34 +02:00
Joan Sanchez	c0e1f2f0dc	Changed column order	2021-10-13 14:55:53 +02:00
Carlos Jimenez Ruiz	b09e3ad72b	Merge pull request 'now sorts correctly by practical and theorical hour' (#748) from 3219-salesMonitor_sort into dev ... Reviewed-on: #748 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-10-13 12:50:02 +00:00
Joan Sanchez	1b9b918812	Fixed format	2021-10-13 14:29:11 +02:00
Joan Sanchez	b2cdfd9785	Removed empty spaces	2021-10-13 14:29:01 +02:00
Joan Sanchez	31e160559b	fix(salesMonitor): now sorts correctly by practical and theorical hour ... Refs: 3219	2021-10-13 14:28:50 +02:00
Joan Sanchez	d951ca02f0	Fixed format	2021-10-13 14:21:42 +02:00
Joan Sanchez	491cca2bd6	Removed empty spaces	2021-10-13 14:19:29 +02:00
Joan Sanchez	a0a01de937	fix(salesMonitor): now sorts correctly by practical and theorical hour ... Refs: 3219	2021-10-13 14:17:45 +02:00
Alex Moreno	1684c1bf87	feat(diary): modify sql item_getBalance	2021-10-13 14:03:06 +02:00