7872 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito Domenech	8be929c1da	log tiquet request	2020-05-27 08:07:14 +02:00
Joan Sanchez	8b9b65138c	Merge pull request 'Change visible & available methods' (#278) from 2234-getVisibleAvailable into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-27 05:44:08 +00:00
Joan Sanchez	6d94894b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2234-getVisibleAvailable	2020-05-27 07:24:33 +02:00
Joan Sanchez	3cd4ab086d	Fix	2020-05-26 15:49:20 +02:00
Joan Sanchez	8384918d9e	Removed line	2020-05-26 14:42:45 +02:00
Joan Sanchez	d24f04912e	2205 - Prevent relations to being logged in	2020-05-26 14:37:34 +02:00
Bernat Exposito Domenech	60d50afb2e	fix traduction	2020-05-26 12:20:06 +02:00
Joan Sanchez	731e411cf8	Merge pull request '2204-dbtest_zone_getEvents' (#280) from 2204-dbtest_zone_getEvents into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-26 10:16:05 +00:00
Bernat Exposito Domenech	e515e5df7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2204-dbtest_zone_getEvents	2020-05-26 12:08:01 +02:00
Bernat Exposito Domenech	41bf237289	dbtest zone_getEvent	2020-05-26 12:07:52 +02:00
Joan Sanchez	14251e5a0c	Merge pull request '2262-catalog_remove_tag' (#276) from 2262-catalog_remove_tag into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 09:39:47 +00:00
Joan Sanchez	193a104552	Merge pull request '2274 - Added english translation' (#275) from 2274-delivery_note_translation into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 09:38:59 +00:00
Javi Gallego	5188f80da5	Merge branch 'dev' into 2234-getVisibleAvailable	2020-05-26 10:47:48 +02:00
Bernat Exposito	26930c5091	Merge pull request 'test ticket_makecomponentupdate' (#277) from 2229-dbtest_ticket_componentMakeUpdate into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-26 08:46:54 +00:00
Bernat Exposito Domenech	e7fc70a4b4	add column in ticket split	2020-05-26 10:43:53 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Bernat Exposito	17ef761ba4	Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 07:59:17 +00:00
Bernat Exposito Domenech	9e85e8187c	skipped	2020-05-26 09:58:08 +02:00
Bernat Exposito Domenech	a77467fb0e	skip test	2020-05-26 09:53:30 +02:00
Bernat Exposito Domenech	1de6b2bd77	test ticket_makecomponentupdate	2020-05-26 09:28:41 +02:00
Joan Sanchez	23ec99d0f8	2274 - Added english translation	2020-05-26 08:24:38 +02:00
Joan Sanchez	44160d2f3c	Changed order	2020-05-26 08:11:36 +02:00
Joan Sanchez	4d2d57d646	2265 Changes to filter	2020-05-26 08:08:09 +02:00
Carlos Jimenez Ruiz	d02655d4d3	Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-25 12:58:08 +00:00
Carlos Jimenez Ruiz	65432ef1ed	Merge pull request '1490 - Don't update with empty value' (#274) from 1490-ticket_update_price into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-25 12:56:42 +00:00
Joan Sanchez	73a6148a77	2273 - Fixed transfer sales	2020-05-25 14:45:26 +02:00
Joan Sanchez	d60f8721f1	1490 - Don't update with empty value	2020-05-25 13:49:24 +02:00
Joan Sanchez	2af39d4b67	Updated unit tests	2020-05-25 07:43:24 +02:00
Joan Sanchez	4878c0dc46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to	2020-05-25 07:25:21 +02:00
Joan Sanchez	e9e7ae08f2	Locale refactor	2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz	f4984c142f	Merge pull request '2242-test' (#263) from 2242-test into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-22 07:05:48 +00:00
Javi Gallego	0f718ad065	Merge branch 'dev' into 2242-test	2020-05-22 07:56:00 +02:00
Bernat Exposito	b335eb4b1f	Merge pull request 'fixed the intermitence of subtotal in the e2e path' (#270) from order_lines_e2e_fixed into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-05-21 13:26:04 +00:00
Bernat Exposito Domenech	8c2f57e380	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries	2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech	52241e6f2c	update itemLastENtries	2020-05-21 15:26:00 +02:00
Carlos Jimenez Ruiz	d829ae02ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2263_e2e_zone_descriptor	2020-05-21 15:22:02 +02:00
Carlos Jimenez Ruiz	f1a37ba6db	fixed the intermitence of subtotal in the e2e path	2020-05-21 15:12:11 +02:00
Joan Sanchez	ce43c1f2d9	Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-21 12:27:14 +00:00
Joan Sanchez	9a43dff1fd	Removed console.log()	2020-05-21 14:22:22 +02:00
Joan Sanchez	9a0c9d3da2	2262 Remove filter by id from searchbar	2020-05-21 14:18:24 +02:00
Joan Sanchez	aa95a9f984	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-05-21 12:33:01 +02:00
Joan Sanchez	a7cd7b582d	Merge pull request 'Removed fetchSelection()' (#269) from 2225-no_autocomplete_filled into test	2020-05-21 10:27:00 +00:00
Joan Sanchez	03c9b7ffa6	Removed fetchSelection()	2020-05-21 12:15:41 +02:00
Joan Sanchez	9156fccd86	Merge pull request '2225 Prevent location override' (#268) from 2225-no_autocomplete_filled into test	2020-05-21 09:35:19 +00:00
Joan Sanchez	d082f5d6c2	2225 Prevent location override	2020-05-21 11:14:34 +02:00
Joan Sanchez	10049fa8a2	Merge pull request '1791_dreprecate_boot-salixjs' (#266) from 1791_dreprecate_boot-salixjs into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-21 08:50:47 +00:00
Carlos Jimenez Ruiz	245827e8d5	corrected a typo	2020-05-21 09:28:50 +02:00
Carlos Jimenez Ruiz	4df8d78a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1791_dreprecate_boot-salixjs	2020-05-21 09:25:19 +02:00
Carlos Jimenez Ruiz	44cd2f743f	updated the modelInfo route for the tests	2020-05-21 09:23:44 +02:00
Carlos Jimenez Ruiz	d299f455d6	boot/salix.js deprecated	2020-05-21 09:06:02 +02:00