800 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	8b9bfb4ba0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing	2021-06-25 10:12:52 +02:00
Carlos Jimenez Ruiz	832452df95	ticketDms import	2021-06-25 10:12:41 +02:00
Joan Sanchez	0941b2423e	2983 - Invoice tickets	2021-06-24 13:33:51 +02:00
Joan Sanchez	362c404aba	Css fixes	2021-06-24 09:16:59 +02:00
Carlos Jimenez Ruiz	9389bbf779	front unit tests fix	2021-06-23 13:32:23 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Joan Sanchez	deaade92b0	Shortened packing type	2021-06-22 14:27:45 +02:00
Carlos Jimenez Ruiz	4656b2e25a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias	2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz	1afae3d56d	address nickname now gets updated when client or address updates	2021-06-18 15:54:33 +02:00
Joan Sanchez	8695fadc18	Merge branch 'dev' into 2948-ticket_sale_itemPackingType	2021-06-18 05:21:01 +00:00
Carlos Jimenez Ruiz	b906a8e91d	added ticket.nickname to basicdata	2021-06-17 11:52:12 +02:00
Javi Gallego	e2f32a60fd	cambio campos en front	2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz	7370269e4d	ticket.sale now shows Packing type	2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz	88a5443d64	table style changes	2021-06-14 15:52:46 +02:00
Carlos Jimenez Ruiz	5d8a9938d6	formattedAddress tests amended for postcode	2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz	48f80fad8f	added postcode to summary + basic data translation	2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz	fc3af7b6a6	ticket expedition now shows scan worker and scanned date	2021-06-09 14:25:50 +02:00
Carlos Jimenez Ruiz	f969323a86	ticket create now takes clientFk from params	2021-06-08 17:30:00 +02:00
Joan Sanchez	5962a68d15	HOTFIX: Sort by zone hour	2021-06-03 12:40:27 +02:00
Joan Sanchez	a594e63566	Chip color	2021-06-01 11:39:40 +02:00
Joan Sanchez	27cd54bef1	Updated icons title	2021-05-27 11:41:45 +02:00
Joan Sanchez	920e7b1daf	E2E fixes	2021-05-26 13:05:58 +02:00
Joan Sanchez	099ff657e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems	2021-05-25 14:08:02 +02:00
Joan Sanchez	26cc3a3dec	2891 - Show problems on tickets sales	2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz	2a4ff5a97b	fixed a problem where warehouseFk wasn't yet defined upon updateStock call	2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz	9a1b6e4653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse	2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz	5c18c5c94c	ticket module descriptor now takes warehouseFk from the ticket	2021-05-21 15:31:28 +02:00
Joan Sanchez	60185bdf34	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-21 07:24:34 +00:00
Joan Sanchez	a103c8d7fc	2891 - Get ticket problems for every sale	2021-05-21 08:49:32 +02:00
Javi Gallego	df073cce2f	refactor tod usa get sales	2021-05-19 17:04:13 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Joan Sanchez	8f3d2d892d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-03 12:13:20 +02:00
Joan Sanchez	03e77685a1	SMS hotfix	2021-05-03 12:09:12 +02:00
Carlos Jimenez Ruiz	65457d6dac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy	2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz	daa94e4eb5	entry buy index	2021-04-28 10:32:24 +02:00
Javi Gallego	9ee1385cd1	test ok	2021-04-26 12:33:33 +02:00
Carlos Jimenez Ruiz	9a4c056059	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover	2021-04-16 10:07:18 +02:00
Joan Sanchez	bf976a3e8f	2729 - Prices popover refactor	2021-04-15 14:30:30 +02:00
Joan Sanchez	6b8074e32f	2878 - Splitted method into activeWithRole and activeWithInheritedRole	2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz	6f0c48847a	Merge branch 'dev' into 2815-ticket_without_state	2021-04-08 11:53:25 +00:00
Joan Sanchez	af0307a419	2859 - Force translation for SMS	2021-04-08 13:39:11 +02:00
Joan Sanchez	e40911e833	2815 - Fix ticket without state	2021-04-07 13:39:36 +02:00
Carlos Jimenez Ruiz	41bb4cbaab	deprecated vat and subTotal related methods + tests fixed	2021-03-24 16:43:54 +01:00
jorgebl	e96fd3d1f7	Changed message	2021-03-22 16:11:52 +01:00
Joan Sanchez	565162740a	Updated unit tests	2021-03-15 16:35:55 +01:00
Joan Sanchez	0ec6d273e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-15 13:49:16 +01:00
Joan Sanchez	bd081f9fd6	2734 - Make invoice PDF refactor	2021-03-15 13:43:22 +01:00
Carlos Jimenez Ruiz	7c34555afd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time	2021-03-12 12:30:55 +01:00
Carlos Jimenez Ruiz	674b959bbc	minor refactor	2021-03-11 15:14:08 +01:00
Carlos Jimenez Ruiz	05ee2ee2d3	ticket.sale front unit test fix	2021-03-11 10:44:34 +01:00
Carlos Jimenez Ruiz	0cb7ddd9ce	ticket.total with and witout VAT refactor	2021-03-10 19:25:26 +01:00
Joan Sanchez	ab755e29c7	Merge branch 'dev' into 2787-change_css_date_time	2021-03-09 14:01:04 +00:00
Carlos Jimenez Ruiz	5c776c0f11	Merge branch 'dev' into 2703-ticket_step_one	2021-03-08 09:48:38 +00:00
Joan Sanchez	e50dcf467f	Requested changes	2021-03-03 12:21:04 +01:00
jorgebl	2ba7e922e6	Put time in 00:00 when field "shipped" change	2021-03-03 10:57:00 +01:00
Joan Sanchez	718021cff8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index	2021-03-01 11:49:31 +01:00
jorgebl	0d7a41f862	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson	2021-02-25 15:52:18 +01:00
jorgebl	b9594f5238	Add descriptor popover	2021-02-25 15:51:51 +01:00
jorgebl	56424925e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time	2021-02-22 13:02:32 +01:00
Jorge Padawan	aaf77677d1	Aligned title with column	2021-02-16 15:50:48 +01:00
Jorge Padawan	ac4a19841d	Added shrink for date	2021-02-16 15:40:20 +01:00
Jorge Padawan	4bcb948aff	Updated code for better read	2021-02-12 16:41:29 +01:00
Jorge Padawan	1512a34a73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-12 11:57:54 +01:00
Joan Sanchez	c270ec6207	Contextmenu fixes	2021-02-11 15:06:41 +01:00
Javi Gallego	3a3dae179c	done	2021-02-10 07:58:11 +01:00
Jorge Padawan	c3109c142a	Line breaks have been put for better understanding	2021-02-05 13:11:18 +01:00
Jorge Padawan	25de8904b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-05 13:04:52 +01:00
Jorge Padawan	8dc291798f	Added tooltip on address and removed workhouse	2021-02-05 13:04:32 +01:00
Joan Sanchez	f041e0d897	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-04 18:44:25 +01:00
Carlos Jimenez Ruiz	a9b0a5c2bd	order fixed	2021-02-04 10:04:16 +01:00
Carlos Jimenez Ruiz	532cb582cf	columns moved and no refresh on stateState changes	2021-02-03 17:01:43 +01:00
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Jorge Padawan	81f5192d08	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-29 08:55:17 +01:00
Jorge Padawan	69e8dfc334	Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-28 16:10:23 +01:00
Carlos Jimenez Ruiz	5c466e1163	vn-fetched-tags visual refactor	2021-01-28 15:10:47 +01:00
Carlos Jimenez Ruiz	fb798f4300	regenerate invoice added to descriptor path	2021-01-25 09:28:01 +01:00
Carlos Jimenez Ruiz	5ea222dc00	fixed translations	2021-01-22 12:02:03 +01:00
Joan Sanchez	ad7be8f9b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-22 07:27:51 +01:00
Joan Sanchez	1c7325c1c0	2739 - Invoice fix	2021-01-22 07:26:29 +01:00
Carlos Jimenez Ruiz	2f5eaf7318	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-20 14:51:37 +01:00
Joan Sanchez	f125f7c80d	Changed weekly translation	2021-01-20 13:57:48 +01:00
Carlos Jimenez Ruiz	464366fdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz	8d6dd3e03a	minor refactors	2021-01-18 14:17:01 +01:00
Joan Sanchez	239e64db48	Updated unit test	2021-01-18 09:08:50 +01:00
Joan Sanchez	783a8dee48	2724 - Fix: Create new service type	2021-01-18 08:55:57 +01:00
Jorge Padawan	9ca2e677bd	Fix for good practique code	2021-01-12 10:15:33 +01:00
Jorge Padawan	809811ea10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries	2021-01-12 07:40:10 +01:00
Joan Sanchez	7568a1c066	Updated unit tests	2021-01-11 14:54:24 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Joan Sanchez	035bdfb1ad	Rounded box	2021-01-11 10:08:33 +01:00
Joan Sanchez	ffdc753ad4	2691 - Added "or" between date ranges and scope days	2021-01-11 08:48:53 +01:00
Jorge Padawan	5a30bf5fa4	2650 add links to edit on summaries	2021-01-08 15:43:33 +01:00
Joan Sanchez	f8ba2534cc	2691 - Scope days changes	2021-01-08 14:32:48 +01:00
Joan Sanchez	87f9a39e50	Merge branch 'dev' into 2666-closure_invalid_email	2020-12-23 12:29:36 +00:00
Bernat Exposito	a21476e3df	fix searchbar index	2020-12-23 12:42:41 +01:00
Joan Sanchez	6416b0ad79	2666 - Closure invalid email notification	2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz	482cbd7195	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor	2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz	369a79b79f	route.tickets refactor	2020-12-21 12:37:36 +01:00
Joan Sanchez	6717853efb	Updated front tests	2020-12-18 18:02:41 +01:00
Joan Sanchez	d8a2184695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-18 17:24:30 +01:00