10044 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito Domenech	f340466daf	fix test 2296	2020-06-04 14:23:48 +02:00
Bernat Exposito Domenech	3a6efebfd9	skipp back test and create task 2304	2020-06-04 14:22:56 +02:00
Joan Sanchez	bfeef77040	Merge pull request '2281 - Added claim pickup checkbox' (#292) from 2281-claim_pickup_checkbox into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-04 08:37:20 +00:00
Joan Sanchez	e2391e5595	Changes made	2020-06-04 10:12:54 +02:00
Joan Sanchez	0637302a0b	Removed focus	2020-06-04 09:49:13 +02:00
Joan Sanchez	6e1c89bce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2281-claim_pickup_checkbox	2020-06-04 09:48:07 +02:00
Joan Sanchez	30c721b0e2	Added ACL	2020-06-04 08:21:08 +02:00
Joan Sanchez	0695ec01bc	Updated unit test	2020-06-04 07:53:06 +02:00
Joan Sanchez	e4d77017b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-03 18:15:03 +02:00
Joan Sanchez	ba3a52d7bb	Fixed request args	2020-06-03 18:06:30 +02:00
Joan Sanchez	9615fb063d	Fixed translation	2020-06-03 16:43:51 +02:00
Joan Sanchez	e606f95b65	Fixed translations	2020-06-03 16:14:18 +02:00
Joan Sanchez	562ebceebe	Fixed closure sql	2020-06-03 14:56:34 +02:00
Joan Sanchez	f39719cc46	2281 - Added claim pickup checkbox	2020-06-03 14:46:58 +02:00
Joan Sanchez	696de03ad1	Changed translation	2020-06-03 13:42:36 +02:00
Joan Sanchez	ca19581a5d	Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-03 11:09:19 +00:00
Joan Sanchez	94dcf7679b	Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:54:41 +00:00
Bernat Exposito Domenech	1cd9c75468	fix item diary descriptor	2020-06-03 12:37:01 +02:00
Bernat Exposito Domenech	34b6641e5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2288-item_diary	2020-06-03 12:32:27 +02:00
Joan Sanchez	63a2aa3e19	Merge pull request '2287 - Notify to sales person' (#291) from 2287_print_closure into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:25:17 +00:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	f71a2a3665	Removed isOk param	2020-06-03 11:58:53 +02:00
Joan Sanchez	18edd523d2	Excluded failing test	2020-06-03 11:40:18 +02:00
Joan Sanchez	539afcd19b	2287 - Notify to sales person	2020-06-03 11:32:30 +02:00
Joan Sanchez	b7ceeae65a	Excluded back unit tests. TLS error	2020-06-03 11:27:14 +02:00
Bernat Exposito Domenech	0b3608433c	item diary, fix ticket descriptor	2020-06-03 10:37:17 +02:00
Joan Sanchez	66239f65d1	Merge pull request 'fix dbtest and export production' (#288) from 2289-export_production into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-03 06:43:33 +00:00
Joan Sanchez	59e0336474	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-02 19:11:37 +02:00
Joan Sanchez	017ca49711	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-02 19:09:57 +02:00
Joan Sanchez	8352459686	Removed waiting request	2020-06-02 18:59:14 +02:00
Joan Sanchez	6e371da2ad	Removed waiting request	2020-06-02 18:28:13 +02:00
Joan Sanchez	16d7186829	Fixed initial filters	2020-06-02 14:42:58 +02:00
Bernat Exposito Domenech	b3eba1c75a	fix dbtest and export production	2020-06-02 13:53:54 +02:00
Joan Sanchez	751f79373a	Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:28:14 +00:00
Bernat Exposito	fac64c45c0	Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Bernat Exposito	0fe2212f64	Merge pull request '2282-setDeleted_stowaway' (#287) from 2282-setDeleted_stowaway into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-02 08:24:59 +00:00
Bernat Exposito Domenech	3bfee6d0fd	fix zone descriptor	2020-06-02 10:17:46 +02:00
Joan Sanchez	21bb4a778c	Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 08:11:44 +00:00
Joan Sanchez	1926f90f4b	Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 07:47:50 +00:00
Joan Sanchez	1e4f36b775	Updated back unit test	2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech	0251ff9bc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut	2020-06-02 09:04:09 +02:00
Bernat Exposito Domenech	546272cc3f	zone delete	2020-06-02 08:59:04 +02:00
Juan Ferrer	3e5bab41d3	Merge branch 'test' into dev	2020-06-01 13:47:33 +02:00
Juan Ferrer	c5d9f1bbe9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-01 13:39:24 +02:00
Juan Ferrer	3fcb76246d	Merge branch 'master' into test	2020-06-01 13:38:59 +02:00
Joan Sanchez	3d8bc3b7b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-01 13:32:35 +02:00
Joan Sanchez	c188da88e8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-01 13:31:08 +02:00
Joan Sanchez	afa8aad96b	Changed closure procedure	2020-06-01 13:19:08 +02:00