10855 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	e6886871da	Merge pull request '3389-item and entry/latest-buys search-panels add filter supplier' (#796) from 3332-item_search-panel into dev ... Reviewed-on: #796 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-22 15:34:38 +00:00
Carlos Jimenez Ruiz	cae3322c6b	Merge branch 'dev' into 3332-item_search-panel	2021-11-22 15:28:21 +00:00
Carlos Jimenez Ruiz	2bba91c6a2	Merge pull request '3375-client_descriptor change phone for payMethod' (#795) from 3375-client_descriptor into dev ... Reviewed-on: #795 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-22 15:27:59 +00:00
Carlos Jimenez Ruiz	ec7cb47ad5	Merge branch 'dev' into 3375-client_descriptor	2021-11-22 14:55:56 +00:00
Carlos Jimenez Ruiz	c618b7c2ed	Merge pull request 'fix(payMethod): alter colums name' (#793) from 3379-payMethod_ibanRequired into dev ... Reviewed-on: #793 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-22 14:55:32 +00:00
Joan Sanchez	4ebad6b372	filter order was not properly being applied	2021-11-22 15:54:01 +01:00
Joan Sanchez	3a2e4c54b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli	2021-11-22 15:49:43 +01:00
Joan Sanchez	90ab78d26d	Updated unit tests	2021-11-22 15:49:32 +01:00
Carlos Jimenez Ruiz	cbcfdd33ec	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz	717d5ec3c8	Merge pull request '3381-item_diary-claim only the claim contains the item' (#792) from 3381-item_diary-claim into dev ... Reviewed-on: #792 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-22 14:21:17 +00:00
Carlos Jimenez Ruiz	9fdfe64909	Merge branch 'dev' into 3381-item_diary-claim	2021-11-22 13:51:51 +00:00
Joan Sanchez	a940d14256	fix(filterValue): fixed sql injection vulnerability ... Refs: 3369	2021-11-22 14:40:03 +01:00
Carlos Jimenez Ruiz	ff0a3acd6e	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 13:32:18 +00:00
Carlos Jimenez Ruiz	79181c633a	Merge pull request '3338-worker_calendar' (#787) from 3338-worker_calendar into dev ... Reviewed-on: #787 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-22 13:30:24 +00:00
Carlos Jimenez Ruiz	dd19ac975d	Merge branch 'dev' into 3338-worker_calendar	2021-11-22 13:18:53 +00:00
Vicent Llopis	cb81ad3722	delete unnecessay space	2021-11-22 14:02:21 +01:00
Vicent Llopis	188abbad62	Merge branch '3379-payMethod_ibanRequired' of https://gitea.verdnatura.es/verdnatura/salix into 3379-payMethod_ibanRequired	2021-11-22 13:44:25 +01:00
Vicent Llopis	709a300388	fix: extracting logic gates to constants	2021-11-22 13:44:22 +01:00
Vicent Llopis	abf3c1c84b	Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar	2021-11-22 13:34:44 +01:00
Vicent Llopis	cdf7c20b16	feat(worker_createAbsense): update backTest	2021-11-22 13:34:42 +01:00
Vicent Llopis	a5ba02e2ec	feat(route_tickets): update frontTest	2021-11-22 13:28:12 +01:00
Vicent Llopis	fb6e443f03	feat(routes_tickets): button up when add tickets	2021-11-22 12:52:02 +01:00
Alex Moreno	80f651f37d	add entries less than a year ago	2021-11-22 12:34:20 +01:00
Alex Moreno	fe46dbd343	feat(entry_last-buys): add filter isFloramondo	2021-11-22 11:49:30 +01:00
Alex Moreno	97a66754a7	feat(item and entry): add back test	2021-11-22 08:58:54 +01:00
Alex Moreno	1e6805a161	remove unnecessary tabulation	2021-11-22 08:30:28 +01:00
Alex Moreno	d2729e67e9	feat(item and latest-buys: add supplier filter	2021-11-22 08:27:14 +01:00
Carlos Jimenez Ruiz	ca0c3be843	Merge branch 'dev' into 3381-item_diary-claim	2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz	02bc848b7e	Merge pull request 'feat(item-itemPackingType): add model and dumpedFixtures' (#794) from 3374-itemPackingType into dev ... Reviewed-on: #794 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-19 12:05:18 +00:00
Carlos Jimenez Ruiz	fad44c0b74	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:59:50 +00:00
Carlos Jimenez Ruiz	caad30d730	Merge pull request '3278 - Disallow claim creation for a ticket delivered more than seven days ago' (#791) from 3278-create_claim into dev ... Reviewed-on: #791 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-19 11:58:54 +00:00
Joan Sanchez	28888fc667	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3278-create_claim	2021-11-19 12:52:04 +01:00
Carlos Jimenez Ruiz	e5977be502	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:47:37 +00:00
Carlos Jimenez Ruiz	7eba2fe509	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-19 11:40:01 +00:00
Alex Moreno	e64e06b9ab	feat(client): change phone for payMethod in descriptor	2021-11-19 12:10:53 +01:00
Joan Sanchez	39a33a6a7c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-19 10:19:08 +01:00
Joan Sanchez	6fdd752d63	Searchbar focus css fix	2021-11-19 10:18:54 +01:00
Vicent Llopis	8f2e29787b	fix(payMethod): alter colums name	2021-11-19 10:07:33 +01:00
Alex Moreno	ac9ed90f4a	feat(item): modify item_getBalance and do test	2021-11-19 10:02:40 +01:00
Joan Sanchez	60c0943044	Dark theme autofill color	2021-11-19 09:36:27 +01:00
Joan Sanchez	46d7a6e765	Added unit tests	2021-11-19 09:24:49 +01:00
Joan Sanchez	8c5f0d3019	feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago ... Refs: 3278	2021-11-19 09:24:31 +01:00
Vicent Llopis	98195bf7b0	fix(route_tickets): dialog show the name of clients	2021-11-19 08:44:56 +01:00
Vicent Llopis	9de3db1961	fix(client_summary): show 10 tickets at least	2021-11-19 08:43:30 +01:00
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