10138 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	92c3a24b1b	dash	2021-08-12 09:24:42 +02:00
Javi Gallego	54634ed22d	test okl	2021-08-12 07:39:26 +02:00
Javi Gallego	d49242751e	Merge branch 'dev' into 2940-invoiceInTax-section	2021-08-10 08:23:13 +02:00
Javi Gallego	3424fabd5b	test fixed	2021-08-10 08:18:52 +02:00
Joan Sanchez	cbaba8a075	Ammends	2021-08-09 14:06:23 +02:00
Joan Sanchez	d5ba0ced0b	Merge pull request 'added catalog calculate join to show only available item types' (#708) from 2954-order_catalog_types into dev ... Reviewed-on: #708 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-06 11:26:54 +00:00
Carlos Jimenez Ruiz	ec6d4b29c1	Merge branch 'dev' into 2954-order_catalog_types	2021-08-06 10:48:51 +00:00
Carlos Jimenez Ruiz	2b866cd38f	Merge pull request '2879 - Autocomplete item field from imported buys' (#690) from 2879-import_buys into dev ... Reviewed-on: #690 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-08-06 10:35:35 +00:00
Joan Sanchez	9dc1168ad2	Transaction refactor	2021-08-06 12:24:36 +02:00
Joan Sanchez	ce37f982c4	Removed focus	2021-08-06 12:03:39 +02:00
Carlos Jimenez Ruiz	3432fab6af	now shows only the itemType of available items	2021-08-06 11:53:38 +02:00
Joan Sanchez	0c45aa6499	Updated e2e	2021-08-05 15:08:53 +02:00
Joan Sanchez	886d38ad8a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys	2021-08-05 14:33:28 +02:00
Joan Sanchez	eba39cc706	Ammends	2021-08-05 13:44:31 +02:00
Joan Sanchez	1b9ca13391	Ammends	2021-08-05 13:42:19 +02:00
Carlos Jimenez Ruiz	82259eee16	added catalog calculate join to show only available item types	2021-08-04 11:48:21 +02:00
Joan Sanchez	4628c8ab6f	Merge pull request '3033-price_and_discount_ticket_sale_popover' (#707) from 3033-price_and_discount_ticket_sale_popover into dev ... Reviewed-on: #707 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-08-03 09:56:08 +00:00
Carlos Jimenez Ruiz	51a8077f4d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover	2021-08-03 11:17:07 +02:00
Carlos Jimenez Ruiz	3d2de99129	vn-popover containing non-descriptor components now relocates correctly for ticket.sale	2021-08-03 11:16:43 +02:00
Carlos Jimenez Ruiz	056a02fd3e	Merge pull request '3030-rocket_notifications_for_ticket_sale' (#705) from 3030-rocket_notifications into dev ... Reviewed-on: #705 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-30 10:10:03 +00:00
Carlos Jimenez Ruiz	a771fd584f	minor refactors + missing transaction on discount	2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz	34b487a451	translations	2021-07-29 17:58:36 +02:00
Carlos Jimenez Ruiz	9578895f95	backend unit tests adapted	2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz	8d682f4e03	chat notifications for many sales modifications	2021-07-29 17:20:57 +02:00
Joan Sanchez	712dd13b74	Merge pull request 'prevented an error if resultant length is 0' (#704) from 3032-ticket_card_components_volume_error into dev ... Reviewed-on: #704 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-28 09:07:27 +00:00
Joan Sanchez	c9f235df97	Merge branch 'dev' into 3032-ticket_card_components_volume_error	2021-07-28 07:35:28 +00:00
Joan Sanchez	bbc6484588	Merge pull request 'autoload refreshes the model when url is set' (#703) from 3020-crudModel_add_flag_for_requests into dev ... Reviewed-on: #703 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-28 07:35:09 +00:00
Carlos Jimenez Ruiz	6e3a18a923	removed test for deprecated function	2021-07-27 18:18:32 +02:00
Carlos Jimenez Ruiz	88ecaff1d2	prevented an error if resultant length is 0	2021-07-27 16:17:47 +02:00
Carlos Jimenez Ruiz	6d4b97443e	autoload refreshes the model when url is set	2021-07-27 15:59:59 +02:00
Joan Sanchez	faab039022	Merge pull request '3014-invoiceIn_clone_from_descriptor' (#701) from 3014-invoiceIn_clone_from_descriptor into dev ... Reviewed-on: #701 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-23 13:30:49 +00:00
Carlos Jimenez Ruiz	caedfff34e	Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor	2021-07-23 15:18:08 +02:00
Carlos Jimenez Ruiz	b837a8c328	fixed a selector for ticket sale	2021-07-23 15:17:30 +02:00
Carlos Jimenez Ruiz	72535f87e1	Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor	2021-07-23 12:47:36 +00:00
Joan Sanchez	98933ff53c	Merge pull request '3023-client_webAccess_block_simultaneous_changes' (#700) from 3023-client_webAccess_block_simultaneous_changes into dev ... Reviewed-on: #700 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-07-23 12:43:48 +00:00
Carlos Jimenez Ruiz	1e97447386	selectors updated according to previous changes on ticket sales	2021-07-23 14:36:37 +02:00
Carlos Jimenez Ruiz	ed97af01f2	e2e for descriptor clone option	2021-07-23 14:07:05 +02:00
Carlos Jimenez Ruiz	abbce74100	clone invoiceIn from descriptor	2021-07-23 14:06:48 +02:00
Joan Sanchez	f97e2427a4	Merge branch 'dev' into 3023-client_webAccess_block_simultaneous_changes	2021-07-22 07:30:37 +00:00
Joan Sanchez	6143992238	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-22 08:39:47 +02:00
Joan Sanchez	50629804cb	HOTFIX: Changed param order on insert email into queue	2021-07-22 08:39:15 +02:00
Carlos Jimenez Ruiz	d24457b6cf	Merge branch 'dev' into 3023-client_webAccess_block_simultaneous_changes	2021-07-21 09:22:59 +00:00
Carlos Jimenez Ruiz	8ed7fe9dca	Merge pull request '3004 - Deprecated ticket_closeAll()' (#699) from 3004-closure_procedures into dev ... Reviewed-on: #699 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-07-21 09:22:36 +00:00
Carlos Jimenez Ruiz	c1162b1b8a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes	2021-07-21 10:07:21 +02:00
Carlos Jimenez Ruiz	25411c90e3	web access e2e path adapted to lastest modificications	2021-07-21 10:07:12 +02:00
Carlos Jimenez Ruiz	0676eb5f30	web access inputs can't be modified together anymore	2021-07-21 10:06:50 +02:00
Joan Sanchez	64b3f10fc5	Removed drop temporary table	2021-07-20 13:11:48 +02:00
Joan Sanchez	dbe680a58c	3004 - Deprecated ticket_closeAll()	2021-07-20 13:06:31 +02:00
Carlos Jimenez Ruiz	4c76ec0d01	Merge pull request '3028 - Added visible column on ticket sales' (#698) from 3028-sale_visible into dev ... Reviewed-on: #698 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-07-20 10:48:21 +00:00
Joan Sanchez	9d855a80d5	3028 - Added visible column on ticket sales	2021-07-20 12:33:27 +02:00