11063 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	92142c4f93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 17:00:33 +01:00
Joan Sanchez	c101bbb6be	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 16:10:11 +01:00
Joan Sanchez	9c5939b661	Updated styles	2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz	cdc0d4dbe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 15:26:34 +01:00
Carlos Jimenez Ruiz	2d20fae14a	Merge pull request '3351-feat(ticket): default ticket action for salesAssistant' (#790) from 3351-ticket_step-two-two into dev ... Reviewed-on: #790 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-18 14:17:21 +00:00
Carlos Jimenez Ruiz	52cc927f85	Merge branch 'dev' into 3351-ticket_step-two-two	2021-11-18 14:10:23 +00:00
Carlos Jimenez Ruiz	67baaed68f	Merge pull request '3370-client create add bussinesType' (#789) from 3370-client_create into dev ... Reviewed-on: #789 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-18 14:10:00 +00:00
Carlos Jimenez Ruiz	c1adba3249	Merge branch 'dev' into 3338-worker_calendar	2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz	334da3da9d	Merge branch 'dev' into 3370-client_create	2021-11-18 14:00:22 +00:00
Carlos Jimenez Ruiz	cf67592c5c	Merge pull request '3341-item_search-panel add isFloramondo' (#783) from 3341-item_search-panel into dev ... Reviewed-on: #783 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-18 13:58:49 +00:00
Carlos Jimenez Ruiz	3eb7b4cf55	refactor(item.filter): buildFilter switch refactor	2021-11-18 14:49:05 +01:00
Alex Moreno	caf6320d53	feat(ticket): default ticketAction for salesAssistant	2021-11-18 14:27:05 +01:00
Joan Sanchez	09c7240266	Updated dark image	2021-11-18 14:07:05 +01:00
Joan Sanchez	c98730e6b9	Updated styles	2021-11-18 14:00:45 +01:00
Carlos Jimenez Ruiz	e31f98bfa9	Merge branch 'dev' into 3370-client_create	2021-11-18 12:57:33 +00:00
Carlos Jimenez Ruiz	924e6d063d	moved getBalance modifications to correct version	2021-11-18 12:42:31 +01:00
Carlos Jimenez Ruiz	2bfcaa810c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-18 12:40:50 +01:00
Joan Sanchez	ba60523012	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 12:31:43 +01:00
Joan Sanchez	5d2693f949	Updated latest buys icon	2021-11-18 12:23:21 +01:00
Alex Moreno	eea1e39a6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3370-client_create	2021-11-18 12:21:31 +01:00
Carlos Jimenez Ruiz	aad2f27684	Merge pull request '3360-supplier.descriptor - No debería aparecer el icono verificado' (#782) from 3360-supplier_descriptor into dev ... Reviewed-on: #782 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-18 11:17:04 +00:00
Alex Moreno	16c28cfa56	fix(client): validate businessType	2021-11-18 12:15:37 +01:00
Carlos Jimenez Ruiz	129e811271	Merge branch 'dev' into 3360-supplier_descriptor	2021-11-18 11:01:25 +00:00
Joan Sanchez	3ffbdc3fde	Updated fonts	2021-11-18 11:48:13 +01:00
Carlos Jimenez Ruiz	2d523bec7a	Merge pull request '3328-item_search-panel' (#779) from 3328-item_search-panel into dev ... Reviewed-on: #779 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-18 10:47:36 +00:00
Carlos Jimenez Ruiz	3a25d9dd48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-18 11:31:49 +01:00
Carlos Jimenez Ruiz	8676a1df90	updated method description	2021-11-18 11:28:11 +01:00
Joan Sanchez	f5c73a1523	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 11:18:46 +01:00
Carlos Jimenez Ruiz	4fc01e6a0d	typos corrected	2021-11-18 11:18:45 +01:00
Carlos Jimenez Ruiz	1d253fc53d	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +01:00
Joan Sanchez	03c7b3f743	fix(smtp): exclude png files on attachments	2021-11-18 11:13:10 +01:00
Carlos Jimenez Ruiz	e53af13b3c	unit tests for smart table and ticket index	2021-11-18 11:04:51 +01:00
Carlos Jimenez Ruiz	296c1335b8	Merge branch 'dev' into 3328-item_search-panel	2021-11-18 10:01:54 +00:00
Joan Sanchez	f49d66d9af	fix(theme): chip color issues	2021-11-18 10:36:12 +01:00
Carlos Jimenez Ruiz	a40e8ad2d8	Merge branch 'dev' into 3328-item_search-panel	2021-11-18 09:35:39 +00:00
Carlos Jimenez Ruiz	f7fc331552	Merge pull request 'Dark theme' (#788) from 3382-dark_theme into dev ... Reviewed-on: #788 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-18 09:32:20 +00:00
Joan Sanchez	e9342af3f5	refactor(theme): enabled dark theme	2021-11-18 10:12:21 +01:00
Vicent Llopis	f87f60f00a	feat(item-itemPackingType): add model and dumpedFixtures	2021-11-18 09:16:36 +01:00
Vicent Llopis	00a33fabb3	update backTest	2021-11-17 14:38:12 +01:00
Vicent Llopis	651a925708	feat(worker_calendar): only can choose one halfHoliday by year	2021-11-17 14:20:26 +01:00
Joan Sanchez	6585011c40	Merge pull request '3364-zone_events bug' (#785) from 3364-zone_events into dev ... Reviewed-on: #785 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-11-17 12:51:17 +00:00
Alex Moreno	40656da725	fix(zone): calendar event	2021-11-17 13:27:56 +01:00
Alex Moreno	146337b30f	change for error	2021-11-17 13:19:22 +01:00
Alex Moreno	a35d36b84f	fix(zone): calendar event	2021-11-17 13:15:59 +01:00
Alex Moreno	6dfd237e1b	comment test client create businessType	2021-11-17 13:01:50 +01:00
Alex Moreno	1a95b03359	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3364-zone_events	2021-11-17 12:38:52 +01:00
Joan Sanchez	acb4c2731c	Removed focus	2021-11-17 10:12:23 +01:00
Alex Moreno	72c724c1e7	refactor(ticket): loadDefaultTicketAction()	2021-11-17 09:59:34 +01:00
Alex Moreno	b59cabe41a	feat(item): add filterParams in main	2021-11-17 09:11:26 +01:00
Alex Moreno	26815ad5a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-17 08:36:35 +01:00