1278 Commits

Author	SHA1	Message	Date
Alex Moreno	405494c85b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index	2021-12-21 08:31:17 +01:00
Vicent Llopis	e30fb0fb37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono	2021-12-21 07:10:19 +01:00
Alex Moreno	50db693e51	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-20 13:50:50 +01:00
Alex Moreno	b0019d09ad	feat(ticket_basic-data_step-two): adapted for available and transfer sales in back	2021-12-20 13:50:31 +01:00
Alex Moreno	850ea2ef39	getVisible sql	2021-12-17 12:38:56 +01:00
Alex Moreno	87f994aa77	test(ticket_basci-data_step-two): back and front	2021-12-16 08:14:27 +01:00
Vicent Llopis	a6b755138f	feat(abono): add option "abono" in ticket_sale	2021-12-15 15:24:45 +01:00
Alex Moreno	e01d676bb1	feat(ticket_basic-data_step-two): show visible and option withoutNegatives	2021-12-15 14:45:45 +01:00
Alex Moreno	be3e8ddd98	feat(ticket_descriptor): add field client.id	2021-12-14 12:59:53 +01:00
Alex Moreno	5960d40891	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index	2021-12-14 12:43:40 +01:00
Alex Moreno	9cfe6b5b7a	feat(ticket): filter by route	2021-12-14 12:05:06 +01:00
Joan Sanchez	f2a8992410	fix(ticketIndex): excluded collectionFk property from date ranges ... Refs: 3431	2021-12-14 09:17:00 +01:00
Alex Moreno	75e32feb16	refactor ticket_sale	2021-12-01 11:39:48 +01:00
Alex Moreno	d5c0be5a9d	refactor(ticket_sale): logic and tests	2021-11-30 13:47:16 +01:00
Alex Moreno	85721dcf45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale	2021-11-30 09:51:30 +01:00
Joan Sanchez	5c342ae463	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-30 09:11:40 +01:00
Alex Moreno	8ea3307230	feat(ticket_sale): allow multi-check for recalculatePrice	2021-11-29 08:30:36 +01:00
Joan Sanchez	e4d7d957eb	Rectified icons	2021-11-26 14:48:55 +01:00
Joan Sanchez	452d4557d1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-26 14:11:33 +01:00
Joan Sanchez	bcca33bc33	Updated icons	2021-11-26 13:04:07 +01:00
Joan Sanchez	8ede14ab40	fix(sales): update price on any change affecting the ticket total ... Refs: 3363	2021-11-24 09:25:24 +01:00
Joan Sanchez	07dcdab1ef	fix(sale): disabled clear icons	2021-11-23 09:57:19 +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
Alex Moreno	caf6320d53	feat(ticket): default ticketAction for salesAssistant	2021-11-18 14:27:05 +01:00
Joan Sanchez	2bc20242e6	fix(salesMonitor): allow scope days to zero	2021-11-16 13:43:30 +01:00
Vicent Llopis	cd6f0057a1	test	2021-10-27 13:41:59 +02:00
Vicent Llopis	b1b6d93c8e	change column value : checkbox for text	2021-10-27 13:39:38 +02:00
Alex Moreno	1cb0cda3a8	fix(sale): delete :: in image	2021-10-19 10:26:00 +02:00
Joan Sanchez	ee1a7952ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-18 09:44:27 +02:00
Carlos Jimenez Ruiz	05df98939b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-15 14:47:34 +02:00
Joan Sanchez	d5cf57fbb1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-15 14:07:48 +02:00
Joan Sanchez	85b4730c6c	feat(monitor): show client risk to future on tickets ... Refs: 2624	2021-10-15 10:49:23 +02:00
Joan Sanchez	e641a947b3	Updated unit tests	2021-10-08 09:51:42 +02:00
Joan Sanchez	e6b60d73f1	Added unit tests	2021-10-07 13:36:23 +02:00
Joan Sanchez	4610ed83d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv	2021-10-07 10:28:06 +02:00
Joan Sanchez	82a14088d0	Added options to invoiceOut	2021-10-07 10:04:50 +02:00
Carlos Jimenez Ruiz	0b46e9ce35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-04 10:21:09 +02:00
Joan Sanchez	6b59bdd01c	fix(descriptorMenu): show PDF regeneration option	2021-10-04 10:19:53 +02:00
Carlos Jimenez Ruiz	16b27c2074	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-04 09:23:28 +02:00
Joan Sanchez	580231d30b	Updated unit tests	2021-10-01 14:59:12 +02:00
Joan Sanchez	313db4960e	refactor(invoice): Show generate PDF option if it was never generated before ... Refs: 3162	2021-10-01 14:59:08 +02:00
Joan Sanchez	68178bdb1f	Updated unit tests	2021-10-01 14:48:25 +02:00
Joan Sanchez	f60c754c59	refactor(invoice): Show generate PDF option if it was never generated before ... Refs: 3162	2021-10-01 14:31:42 +02:00
Joan Sanchez	1ec20e250c	feat(invoice): Send invoice and delivery-note on CSV format	2021-10-01 12:41:31 +02:00
Carlos Jimenez Ruiz	156ecb32ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-29 08:27:53 +02:00
Joan Sanchez	06b49f36b6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-28 10:03:00 +02:00
Joan Sanchez	19d3b19e5a	Updated translation	2021-09-28 09:59:00 +02:00
Joan Sanchez	ee0e1e122b	Removed crudModel default params	2021-09-24 13:02:20 +02:00
Joan Sanchez	4ea0f92c35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 12:54:22 +02:00
Joan Sanchez	4545a5c8fa	fix(filter): single search results don't use scopeDates	2021-09-24 12:51:20 +02:00
Carlos Jimenez Ruiz	8c446edc9e	Merge branch 'dev' into 3098-item_tag_productor	2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz	5f0e2825b8	Merge branch 'dev' into 3059-ticket_index_filter	2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz	8fc17f05c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor	2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz	368f54b872	refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present	2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz	23ba5657c5	refactor(sales): ticket sales now shows item.subName	2021-09-22 15:14:29 +02:00
Joan Sanchez	08cba0a9c8	fix(filter): search limit by date range was not being applied ... Refs: 3059	2021-09-21 15:49:59 +02:00
Javi Gallego	3365eadf5e	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-21 14:02:07 +02:00
Joan Sanchez	079f99ca0d	fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination ... Refs: 3093	2021-09-17 08:50:22 +02:00
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Joan Sanchez	13f78359d5	fix(bank): the search by bank was not differentiating between numerical values and string values ... Refs: 3084	2021-09-03 14:00:47 +02:00
Joan Sanchez	0370cbf207	feat(Searchbar): You can now filter by a ticket collection ... Refs: 3068	2021-09-01 11:27:24 +02:00
Joan Sanchez	74dfa9f757	3063 - Get item from card without a name	2021-08-30 11:23:46 +02:00
Javi Gallego	cffe25d41f	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-08-18 12:38:41 +02:00
Javi Gallego	78a98cd6b7	shrink-datetime	2021-08-15 08:35:14 +02:00
Carlos Jimenez Ruiz	e1fe2aa5b5	added the claim icon to the ticket summary lines	2021-08-13 12:30:22 +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	88ecaff1d2	prevented an error if resultant length is 0	2021-07-27 16:17:47 +02:00
Joan Sanchez	9d855a80d5	3028 - Added visible column on ticket sales	2021-07-20 12:33:27 +02:00
Joan Sanchez	249f5074df	Show client id	2021-07-02 10:57:17 +02:00
Joan Sanchez	3246101574	Updated unit tests	2021-07-01 14:03:28 +02:00
Joan Sanchez	92b6318c79	Ammends	2021-07-01 13:31:04 +02:00
Joan Sanchez	7e836e570f	2983 - Invoice tickets	2021-06-30 16:10:26 +02:00
Joan Sanchez	d30a3490fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice	2021-06-30 15:21:47 +02:00
Carlos Jimenez Ruiz	d67e36212f	added validation for the dms id field	2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz	0e47cf72e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing	2021-06-28 11:19:07 +02:00
Joan Sanchez	65ac3fc205	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild	2021-06-28 08:58:27 +02:00
Joan Sanchez	ef9f3b13e4	html fixes	2021-06-28 08:28:31 +02:00
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
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz	0258c4a276	ticket module refactors	2020-12-16 10:21:20 +01:00
Joan Sanchez	260b502cd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-10 07:30:31 +01:00
Bernat Exposito	a1d8b3175e	ticket descriptor translate	2020-12-09 15:26:57 +01:00
Bernat Exposito	96f603a44b	refactor descriptors	2020-12-04 13:40:58 +01:00
Bernat Exposito	aaee855da3	fix ticket component	2020-12-03 10:26:49 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Joan Sanchez	8eb14a8bdc	2588 - No ellipsize on summary notes or address	2020-11-24 14:56:10 +01:00
Joan Sanchez	d9e14a0c3a	2629 - Open ticket lines on new window	2020-11-24 12:10:02 +01:00
Joan Sanchez	80bae4de0a	2607 - Changed preview icon	2020-11-24 08:22:54 +01:00
Joan Sanchez	2469ce827e	Removed commented code	2020-11-23 14:02:07 +01:00
Joan Sanchez	c654e14cfe	2611 - Summary go to entity	2020-11-23 13:41:51 +01:00
Carlos Jimenez Ruiz	79ab228bca	ticket descriptor path updated	2020-11-18 15:00:41 +01:00
Carlos Jimenez Ruiz	8373c6f5d1	filter by selection + unit tests for travel index	2020-11-13 13:04:22 +01:00
Joan Sanchez	0edd6071c8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-13 07:43:02 +01:00
Joan Sanchez	d174d7b15b	Contextmenu filter hotfix	2020-11-13 07:38:18 +01:00
Joan Sanchez	cb8e9655af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-13 07:22:12 +01:00
Carlos Jimenez Ruiz	b9e3db61db	ticket advanced search grouped state translations	2020-11-12 13:33:33 +01:00
Joan Sanchez	23e8d64678	Contextmenu hotfix	2020-11-12 13:18:31 +01:00
Carlos Jimenez Ruiz	6cd1332a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 14:45:22 +01:00
Joan Sanchez	b6f29d205c	Merge branch 'dev' into 2425-ticket_descriptor_menu	2020-11-11 13:06:14 +00:00
Joan Sanchez	378982389a	Requested chagnes	2020-11-11 13:44:42 +01:00
Joan Sanchez	75ff7c297f	Removed max width	2020-11-11 12:37:59 +01:00
Joan Sanchez	024fda0f65	2591 - Data checked icon	2020-11-11 12:37:45 +01:00
Carlos Jimenez Ruiz	5d70794326	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 12:02:49 +01:00
Joan Sanchez	9d5765724b	Removed max width	2020-11-11 09:17:34 +01:00
Joan Sanchez	5a08798b22	2591 - Data checked icon	2020-11-11 09:11:11 +01:00
Joan Sanchez	d959dbc058	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-11 07:34:34 +01:00
Carlos Jimenez Ruiz	e22e74a725	expanded date columns + order index translations	2020-11-10 16:47:39 +01:00
Joan Sanchez	a93d9f91cc	Updated unit tests	2020-11-10 10:38:25 +01:00
Joan Sanchez	637116b17d	Added descriptor-menu component	2020-11-09 14:52:25 +01:00
Bernat Exposito Domenech	ea03d06a62	Merge branch '2522-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2522-ticket_component	2020-10-29 11:46:57 +01:00
Bernat Exposito Domenech	551feed16f	fix translate	2020-10-29 11:46:37 +01:00
Bernat Exposito	361af260a5	Merge branch 'dev' into 2522-ticket_component	2020-10-29 10:11:24 +00:00
Bernat Exposito Domenech	42d16d0258	ticket component refactor	2020-10-29 11:09:58 +01:00
Joan Sanchez	109fcb3ca4	2532 - Added icon taxDataChecked on ticket index	2020-10-28 09:57:39 +01:00
Bernat Exposito Domenech	15a906af24	link zone in ticket summary	2020-10-27 08:45:34 +01:00
Joan Sanchez	3c37f0e993	Merge branch 'dev' into 2428-anchor_directive	2020-10-21 08:32:31 +00:00
Joan Sanchez	ef42e95cef	Updated unit test	2020-10-20 10:29:16 +02:00
Joan Sanchez	c61c25fb91	2525 - Ticket basic data validate zone	2020-10-20 10:19:12 +02:00
Joan Sanchez	011bba1660	Added vn-anchor to client and ticket index	2020-10-19 09:05:38 +02:00
Carlos Jimenez Ruiz	2045e35170	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2473-restore_ticket	2020-10-13 15:41:04 +02:00
Joan Sanchez	3f8a675785	2499 - Allow zero quantity	2020-10-13 08:42:13 +02:00
Joan Sanchez	498841b274	Added unit test	2020-10-08 14:22:55 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	eceb33cce0	2473 - Added restore method	2020-10-07 11:00:26 +02:00
Joan Sanchez	085df7119f	Merge branch 'dev' into 2492-index_refactor	2020-10-06 06:51:11 +00:00
Joan Sanchez	0b8d8a4f65	Added focus directive to searchbar	2020-10-06 08:17:12 +02:00
Javi Gallego	8d1709ea51	Merge branch 'dev' into 2443	2020-10-01 16:46:33 +02:00
Javi Gallego	2714857227	Merge branch 'dev' into 2443	2020-09-30 14:07:38 +02:00
Bernat Exposito Domenech	1bff4e3c4e	fix test and refactor transferlines	2020-09-30 12:24:33 +02:00
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +02:00
Joan Sanchez	f1d36df558	#2458 - Removed states from pending tickets	2020-09-24 15:00:00 +02:00
Joan Sanchez	75ac6ad8d3	Updated unit test	2020-09-23 14:20:41 +02:00
Joan Sanchez	a8589d6945	Autocomplete warehouse on agency selection	2020-09-23 14:13:44 +02:00
Joan Sanchez	c49614b8cf	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 09:23:09 +00:00
Joan Sanchez	5ec5979a3e	Updated tests	2020-09-23 11:21:25 +02:00
Joan Sanchez	ae3d00bad1	Added new method	2020-09-22 07:38:20 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz	ed905341b3	removed autoload for where/searchF	2020-09-21 11:17:40 +02:00
Javi Gallego	8fb674819a	ticket service	2020-09-21 10:35:39 +02:00
Joan Sanchez	fa344f4ff6	2449 - Autocompletion	2020-09-19 13:02:00 +02:00
Carlos Jimenez Ruiz	5d461b119c	tests fix	2020-09-18 11:50:20 +02:00
Carlos Jimenez Ruiz	ea077e8d4a	added auto-load to some combos	2020-09-17 20:12:52 +02:00
Carlos Jimenez Ruiz	5b69ce983c	salesPersonUser replaces salesPerson relation	2020-09-15 19:43:07 +02:00
Carlos Jimenez Ruiz	031e40df51	removed unused dash if empty	2020-09-14 16:34:11 +02:00
Carlos Jimenez Ruiz	1eb088521c	ticket.index ref and state columns merged	2020-09-14 16:08:37 +02:00
Carlos Jimenez Ruiz	0b4c53a655	added invoiceOut descriptor	2020-09-14 13:11:53 +02:00
Juan Ferrer	4b5d2cd0dd	2177 account module ... LDAP test RC1 SQL version changed Tests fixes Back & front tests fixed All tests passed Front and back tests plus some fixes	2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz	12ceedd80c	corrected some typos	2020-09-10 10:46:56 +02:00
Bernat Exposito Domenech	348412c5db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech	d4b6d7cd96	cr changes	2020-09-09 15:49:59 +02:00
Joan Sanchez	d0ac1b621c	Merge branch 'dev' into 2385-worker_descriptor_refactor	2020-09-09 09:06:11 +00:00
Bernat Exposito Domenech	f99fb69d48	front and back test	2020-09-09 08:20:27 +02:00
Bernat Exposito Domenech	174cea7bc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech	92e14d5292	update getComponentSum	2020-09-08 07:17:16 +02:00
Carlos Jimenez Ruiz	a00f64e7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-03 16:29:38 +02:00
Joan Sanchez	b848fa52f2	2385 - Replaced worker nickname	2020-09-03 15:11:16 +02:00
Joan Sanchez	a3382300f9	2402 - Added create entry section	2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz	605fbe7999	refactor	2020-09-02 13:09:30 +02:00
Carlos Jimenez Ruiz	1c0d5dbd76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz	742a1c9ea8	removed focus on test	2020-09-02 09:42:10 +02:00
Joan Sanchez	33aec33cba	Updated unit test	2020-09-02 08:12:32 +02:00
Joan Sanchez	ecb98dfac5	Descriptor fix	2020-09-01 12:10:32 +02:00
Javi Gallego	b4952002a3	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 06:49:09 +00:00
Javi Gallego	a567738f2c	set addressFk	2020-09-01 08:33:11 +02:00
Joan Sanchez	baf9ec6e70	2416 - Item request - Added state filter	2020-08-31 08:32:30 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Joan Sanchez	30a4bbfe1a	Css changes	2020-08-26 12:41:38 +02:00
Joan Sanchez	80e1577d4f	Updated e2e	2020-08-20 09:50:22 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Bernat Exposito Domenech	0d689a8c01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-08-13 10:43:25 +02:00
Joan Sanchez	88c5b6f8a6	Changed ticket problems min date	2020-08-13 08:23:55 +02:00
Carlos Jimenez Ruiz	e974f638dd	2361 ticket sale multi check fix-ish +popover size	2020-07-30 16:05:48 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Carlos Jimenez Ruiz	e2481366a2	removed on response if just accept	2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz	c62801e741	modules component to vnComponent working	2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz	6913f2db72	$httpBackend.when and .expect no longer misused	2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz	4ca004f833	angular.mock.injet shorten to inject	2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz	7d5dc776c1	replaced most of the translate.instant for $t	2020-07-23 16:07:08 +02:00
Bernat Exposito Domenech	b972353bb4	create method getComponentSum	2020-07-21 11:11:09 +02:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Joan Sanchez	c04d9b0854	Merge branch 'dev' into 2338-ticket_weekly	2020-07-08 16:22:54 +00:00
Joan Sánchez	b00f6e6d04	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-07-07 15:13:01 +02:00
Joan Sánchez	7efba25603	Removed role salesPerson for a ticket request	2020-07-07 15:12:36 +02:00
Joan Sanchez	6aca80b075	Merge branch 'dev' into 2338-ticket_weekly	2020-07-07 12:34:04 +00:00
Carlos Jimenez Ruiz	663b5fb9aa	descriptor can now have 4 quicklinks	2020-07-03 13:28:49 +02:00
Joan Sanchez	23664dd3c5	Refresh total on sale changes	2020-07-01 15:00:48 +02:00
Carlos Jimenez Ruiz	c801d8a969	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz	354123dc86	e2e toolkit 2.0 + refactors	2020-07-01 14:45:48 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Joan Sanchez	78ee6f1aff	Updated unit tests	2020-07-01 12:53:56 +02:00
Joan Sanchez	defe7e7a17	Added front unit tests	2020-07-01 11:57:01 +02:00
Carlos Jimenez Ruiz	1dfd0c26ef	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz	b451b400bf	e2e toolkit	2020-06-30 11:15:20 +02:00
Joan Sanchez	a0f625d019	Changed methods order, minor fixes	2020-06-30 10:01:30 +02:00
Joan Sanchez	c9d94ca814	Reset watcher changes if there's no new data to save	2020-06-30 09:37:09 +02:00
Joan Sanchez	2c23f3417a	Sale selection fixes	2020-06-29 11:43:53 +02:00
Joan Sanchez	789769ad7d	Destroy edit prop fix	2020-06-29 09:38:42 +02:00
Bernat Exposito Domenech	faee28cb01	fix bugs in ticket weekly	2020-06-29 09:35:18 +02:00
Joan Sanchez	a8377950f5	Fixes	2020-06-23 16:39:20 +02:00
Carlos Jimenez Ruiz	9d88b9359a	removed unused column	2020-06-23 16:07:07 +02:00
Carlos Jimenez Ruiz	984e8fd794	added total price of services	2020-06-23 14:53:41 +02:00
Joan Sanchez	d4c78b46c1	1368 - First sale refactor	2020-06-23 13:40:49 +02:00
Bernat Exposito Domenech	ee2a4771ff	delete coment code	2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech	6a021b5767	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor	2020-06-23 10:00:50 +02:00
Joan Sanchez	356c1a7b45	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-22 11:54:50 +02:00
Joan Sanchez	4ad3334de6	Allow change to discount 0%	2020-06-22 11:49:44 +02:00
Carlos Jimenez Ruiz	e6a72d0f09	clean code refactor	2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz	3c2a392cb8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Joan Sanchez	765d3c7553	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 07:19:57 +02:00
Joan Sanchez	43a48994e0	Image path fix	2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Bernat Exposito Domenech	ebcbd5068f	add restrictions in ticket descriptor	2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz	b44942c7d7	open delivery notes on ticket index	2020-06-16 12:36:34 +02:00
Bernat Exposito	e335775cdb	Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-15 06:24:23 +00:00
Bernat Exposito	70d5c641ad	Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-15 06:16:55 +00:00
Joan Sanchez	25b1c6bd8f	2239 - Added services	2020-06-12 14:28:29 +02:00
Joan Sanchez	36ec930878	Updated test	2020-06-12 12:01:53 +02:00
Joan Sanchez	3d388ad226	Updated unit test	2020-06-12 11:39:33 +02:00
Joan Sanchez	dddfe2773a	2293 - getVolume() call to saleVolume	2020-06-12 11:26:32 +02:00
Joan Sanchez	48034b234f	2325 - Search address	2020-06-12 10:53:33 +02:00
Joan Sanchez	4b262dc3cc	Disabled contextmenu option	2020-06-09 13:18:29 +02:00
Joan Sanchez	1fed4c7913	Contextmenu fixes	2020-06-09 12:16:40 +02:00
Joan Sanchez	7d53f274de	Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-08 14:08:56 +00:00
Carlos Jimenez Ruiz	d8593ea3e0	Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-08 12:59:59 +00:00
Joan Sanchez	05b5c452a9	Removed attribute	2020-06-08 13:17:18 +02:00
Joan Sanchez	ab1e8fb622	2176 First working version	2020-06-08 12:14:27 +02:00
Bernat Exposito Domenech	e24c5b00e9	fix descriptors	2020-06-08 11:05:17 +02:00
Joan Sanchez	181f2f0148	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu	2020-06-08 08:19:18 +02:00
Javi Gallego	762c39eb23	:: para watcher	2020-06-08 07:52:30 +02:00
Bernat Exposito Domenech	56c9b08101	fix show.descriptor	2020-06-08 07:52:23 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +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	3f1109aee3	Test changes	2020-05-29 12:10:04 +02:00
Joan Sanchez	90ae1562dd	Added filters	2020-05-29 11:10:58 +02:00
Bernat Exposito Domenech	f28f88a100	ticket summary invoiceOut popover	2020-05-27 12:29:01 +02:00
Carlos Jimenez Ruiz	98157fc45a	Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-27 07:10:27 +00:00
Bernat Exposito Domenech	60d50afb2e	fix traduction	2020-05-26 12:20:06 +02:00
Javi Gallego	5188f80da5	Merge branch 'dev' into 2234-getVisibleAvailable	2020-05-26 10:47:48 +02: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
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
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	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	55c4ccdb29	Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech	4133021e5c	fix translate on plural	2020-05-20 08:52:20 +02:00
Juan Ferrer	c998097ba1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 12:30:00 +02:00
Javi Gallego	692af6078c	Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev ... Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2020-05-19 10:21:33 +00:00
Bernat Exposito Domenech	d289c17530	searchbar translates	2020-05-19 10:27:22 +02:00
Juan Ferrer	d7f2e686b1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 09:28:50 +02:00
Bernat Exposito Domenech	369d8d59d8	fix error	2020-05-18 14:58:06 +02:00
Bernat Exposito Domenech	c205c173f8	invoiceOut descriptor popover in ticket summary	2020-05-18 10:28:33 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Juan Ferrer	7a1bb7e68d	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-08 14:01:49 +02:00
Javi Gallego	8453d25852	#2224item.diary provar directiva $anchorScroll	2020-05-06 18:42:50 +02:00
Juan Ferrer	6c14743017	Last fixes & tests passed	2020-05-06 14:38:09 +02:00
Juan Ferrer	6a8e1bf6b5	#1882 Boileplate code removed, declarative quicklinks	2020-04-30 12:48:52 +02:00
Juan Ferrer	b536c8291a	#1882 Popover::show() boilerplate code removed	2020-04-28 14:26:02 +02:00
Juan Ferrer	5826099601	#1882 First step, front tests passed	2020-04-25 11:50:04 +02:00
Javi Gallego	6dacf20bd9	ticket.index modificar orden de las secciones	2020-04-23 17:59:46 +02:00
Javi Gallego	dbb2257430	test de zone_getLanded y zone_getFromGeo	2020-04-20 13:49:33 +02:00
Javi Gallego	397872ee19	mejoradas las descripciones de los test	2020-04-08 13:15:07 +02:00
Javi Gallego	09e425c33c	2174 ticket.weekly con campo agencyModeFk con E2E	2020-04-08 12:33:36 +02:00
Juan Ferrer	2249f68d6e	SCSS px to em: rem for font-size	2020-04-02 15:11:42 +02:00
Juan Ferrer	559cc5eb8c	SCSS em to px: Second step	2020-04-02 14:52:02 +02:00
Juan Ferrer	734c86c5f5	SCSS px to em - First step	2020-04-02 14:20:57 +02:00
Juan Ferrer	bf68d15264	E2E expeditions fixes, scss px/em fixes	2020-04-02 11:39:39 +02:00
Juan Ferrer	dfb9d32c2a	Client & ticket E2E fixes	2020-03-30 17:30:03 +02:00
Joan Sanchez	59fadf410e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary	2020-03-27 11:45:10 +01:00
Bernat Exposito Domenech	74b27778ab	add phones in ticket summary	2020-03-27 11:10:20 +01:00
Joan Sanchez	6a66f47cc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout	2020-03-27 10:19:47 +01:00
Carlos Jimenez Ruiz	f06c7d3d47	front test	2020-03-25 15:17:43 +01:00
Carlos Jimenez Ruiz	9b4546edad	minor refactor plus path fix after merge	2020-03-25 14:18:51 +01:00
Joan Sanchez	9b933e7d88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-20 12:00:53 +01:00
Joan Sanchez	3d23583e0b	Fixes	2020-03-18 14:08:04 +01:00
Joan Sanchez	a9c622377e	Refactor	2020-03-18 12:55:22 +01:00
Joan Sanchez	934e057a67	Fixed watcher changes	2020-03-18 09:41:23 +01:00
Joan Sanchez	f25c8bb644	Ticket refactor	2020-03-18 08:35:59 +01:00
Juan Ferrer	b4a5a88943	E2E fixed	2020-03-17 14:01:25 +01:00
Juan Ferrer	56a21edeca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult	2020-03-16 18:33:39 +01:00
Juan Ferrer	9d1bc8eb54	First functional version (No tests)	2020-03-13 20:33:12 +01:00
Bernat Exposito Domenech	fdd1c73485	refactor componentUpdate	2020-03-13 12:26:15 +01:00
Joan Sanchez	2d755c9094	Updated unit test	2020-03-13 08:47:41 +01:00
Joan Sanchez	f8c69306f4	Updated unit test	2020-03-13 08:44:01 +01:00
Joan Sanchez	d51356f11b	Add line on change item	2020-03-13 08:20:30 +01:00
Joan Sanchez	b9a482fc37	2181 - Ticket sale fix item search	2020-03-11 15:56:02 +01:00
Joan Sanchez	1c8541376b	Fixed removed letter	2020-03-11 12:54:28 +01:00
Joan Sanchez	8fe6c651e3	Updated translations	2020-03-11 12:02:12 +01:00
Joan Sanchez	668c337fb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2175-ticket_send_sms	2020-03-11 08:46:22 +01:00
Joan Sanchez	581e2fcd1f	Updated unit test	2020-03-11 08:45:54 +01:00
Joan Sanchez	3736dcf792	Added ticket sms options	2020-03-10 15:01:33 +01:00
Joan Sanchez	0cd4e2ad9e	Added autocomplete property	2020-03-10 14:28:50 +01:00
Carlos Jimenez Ruiz	8688ecc810	eliminado el campo id en advanced search	2020-03-10 07:38:21 +01:00
Carlos Jimenez Ruiz	ebc0889011	Merge branch '2171-show_payment_button' of verdnatura/salix into dev	2020-03-09 15:51:39 +00:00
Joan Sanchez	209251bf8b	2173 - descriptor_quicklink	2020-03-09 14:11:43 +01:00
Joan Sanchez	d173ab6a2b	2171 - Mostrar botón "Pago a cuenta" en índice de tickets	2020-03-09 11:50:23 +01:00
Joan Sanchez	97671fd4a1	Merge branch '1878-print_with_auth' of verdnatura/salix into dev	2020-03-06 10:34:38 +00:00
Bernat Exposito Domenech	1951e8bcf9	fix setter client	2020-03-06 08:50:55 +01:00
Bernat Exposito Domenech	666ccbf370	ticket.basicData address	2020-03-06 08:38:03 +01:00
Joan Sanchez	1f714718bb	1878 - Implementar autenticación en servicio print	2020-03-05 13:56:45 +01:00
Joan Sanchez	7e694c3e80	2073 - Filter by pending tickets	2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech	1d98c44c3e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor	2020-03-02 09:51:05 +01:00
Bernat Exposito Domenech	bd46f6a302	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor	2020-03-02 09:28:43 +01:00
Joan Sanchez	28b7f5d3a2	2151 - Added thermograph edit section	2020-02-28 14:18:55 +01:00
Bernat Exposito Domenech	4561b6eeef	refactor ticket.isEditable	2020-02-27 12:31:38 +01:00
Carlos Jimenez Ruiz	6c668131a4	replaced returnValur for returnThis	2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz	0fd012930e	#2131 jest.spyOn	2020-02-26 15:02:47 +01:00
Carlos Jimenez Ruiz	aedd551371	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn	2020-02-26 13:24:41 +01:00
Carlos Jimenez Ruiz	794b20fc83	#2131 jest.spyOn	2020-02-26 13:22:52 +01:00
Joan Sanchez	37ff99d838	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-26 13:19:32 +01:00
Joan Sanchez	e15ef3386e	Translation changes	2020-02-26 13:18:29 +01:00
Joan Sanchez	bf4e0d09c5	Get phone from address and client	2020-02-21 08:37:37 +01:00
Joan Sanchez	a9b8fab51d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-17 14:55:26 +01:00
Joan Sanchez	a148daa368	2125 - ticket create invalid type fix	2020-02-17 14:47:43 +01:00
Joan Sanchez	84bf95db13	2106 - Sms max length fix	2020-02-14 12:01:17 +01:00
Bernat Exposito Domenech	4b48a89eaa	ticket descriptor update acl	2020-02-13 08:31:29 +01:00
Carlos Jimenez Ruiz	420f059211	Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev	2020-02-11 08:30:08 +00:00
Joan Sanchez	91210c3a0d	1684 - Log old quantity value	2020-02-11 08:19:03 +01:00
Bernat Exposito Domenech	d26597c395	fix ticket.sale sms	2020-02-10 14:34:53 +01:00
Bernat Exposito Domenech	d1c8c8ad58	ticket/client.sms validations	2020-02-10 14:33:38 +01:00
Joan Sanchez	e1942875af	1684 - Log transfer old values	2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech	f6674448f8	ticket/client.sms validations	2020-02-10 13:22:43 +01:00
Bernat Exposito Domenech	bafec3ce90	fix ticket.sale sms	2020-02-10 09:36:40 +01:00
Bernat Exposito Domenech	7a643eff34	fix index step-two	2020-02-10 07:03:09 +01:00
Bernat Exposito Domenech	dd368a8c3f	refactor ticket.basicData steps	2020-02-07 13:38:32 +01:00
Carlos Jimenez Ruiz	f28a80b855	#2078 ticket. step-one	2020-02-07 11:25:56 +01:00
Bernat Exposito Domenech	5cd3bde306	ticketRequest front test	2020-02-06 14:59:00 +01:00
Carlos Jimenez Ruiz	1e8059c9f5	Merge branch '2023-ticket_index_advanced_search' of verdnatura/salix into dev	2020-02-06 07:26:39 +00:00
Bernat Exposito Domenech	8193b0ffc0	update ticket.filter	2020-02-06 07:37:41 +01:00
Carlos Jimenez Ruiz	76fc5a3311	#1944 ticket.summary	2020-02-05 12:44:14 +01:00
Joan Sanchez	218ed38b54	changed comment	2020-02-05 08:24:29 +01:00
Joan Sanchez	bee814f6a6	#2069 bug-fix ticket scope days	2020-02-05 08:23:23 +01:00
Bernat Exposito Domenech	eab2593306	update ticket.dms.create	2020-02-03 14:36:04 +01:00
Bernat Exposito Domenech	6265796260	add icon in ticket.basicData	2020-02-03 09:24:49 +01:00
Joan Sanchez	b27d514918	percentage hotfix	2020-01-29 11:09:42 +01:00
Bernat Exposito Domenech	35b9820e73	update ticket request	2020-01-28 09:05:01 +01:00
Bernat Exposito Domenech	ba2300288f	sendSms test	2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech	b42b2ec8c3	refactor sms send	2020-01-15 13:27:14 +01:00
Joan Sanchez	048fcb733d	added zone name to ticket summary	2020-01-13 07:42:41 +01:00
Joan Sanchez	5cf8328476	added more rows to sms textarea	2020-01-09 13:58:50 +01:00
Bernat Exposito Domenech	e9d3b14da7	refactor models component and componentType	2019-12-27 08:01:53 +01:00
Joan Sanchez	b74de37c82	updated selectors	2019-12-26 13:29:50 +01:00
Joan Sanchez	fd8eeb626d	removed console.log	2019-12-26 08:45:55 +01:00
Joan Sanchez	5273e90a30	Added params to ticket method & updated unit tests	2019-12-26 07:12:34 +01:00
Joan Sanchez	8a54da6fd3	fixed dms links	2019-12-19 14:13:24 +01:00
Joan Sanchez	f42f46dc42	Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master	2019-12-17 12:53:06 +00:00
Joan Sanchez	9d487f3cee	updated translation	2019-12-17 13:25:30 +01:00
Juan Ferrer	4da83ef963	Hotfixes: vnTicketSale menu, vnItemDiary width	2019-12-17 12:23:31 +01:00
Joan Sanchez	ef95244d07	stowaway refactor	2019-12-17 08:38:36 +01:00
Joan Sanchez	8808e49a10	updated unit test	2019-12-13 12:07:36 +01:00
Joan Sanchez	780f1e4773	renamed expence to expense and added field	2019-12-13 11:59:25 +01:00
Joan Sanchez	af47ab6cac	fixed styles & discounts	2019-12-12 08:22:04 +01:00
Joan Sanchez	974bf67e8d	removed focus	2019-11-25 07:46:00 +01:00
Joan Sanchez	27cab0e722	added sms option to client descriptor	2019-11-21 14:00:27 +01:00
Joan Sanchez	423240ac7d	open dialog	2019-11-21 13:02:46 +01:00
Joan Sanchez	fd72f206bc	Recalculate ticket components #1770	2019-11-21 12:00:56 +01:00
Joan Sanchez	c6d1536500	recalculate ticket components	2019-11-20 06:53:37 +01:00
Carlos Jimenez Ruiz	eeead2cc86	corrected a typo	2019-11-18 16:37:03 +01:00
Javi Gallego	f12b1b8595	test fron arreglados	2019-11-18 16:03:10 +01:00
Javi Gallego	c736e4de29	#1850 descomentar test back	2019-11-18 12:32:50 +01:00
Juan Ferrer	4f5c1404d7	E2E fixes	2019-11-14 15:24:08 +01:00
Juan Ferrer	09a187ecfe	Merge	2019-11-14 15:05:49 +01:00
Joan Sanchez	c028233012	ticket.sale recalculate sale price #1768	2019-11-14 14:19:39 +01:00
Juan Ferrer	4436acec10	Merge	2019-11-14 14:07:48 +01:00
Joan Sanchez	308c4dfb88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-13 08:09:54 +01:00
Joan Sanchez	b320d64462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-12 14:54:13 +01:00
Joan Sanchez	05c4c9e96a	ticket.weekly removed create section already on ticket descriptor #1841	2019-11-12 14:48:03 +01:00
Juan Ferrer	a4f6c64e59	Merge	2019-11-12 09:24:08 +01:00
Juan Ferrer	f6050a6c65	Merge	2019-11-12 09:24:01 +01:00
Bernat	74a2c58954	Bug #1862 fix e2e and front test	2019-11-12 08:51:50 +01:00
Juan Ferrer	95d943e515	E2E fixes	2019-11-11 16:32:03 +01:00
Juan Ferrer	efa6ddc0f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor	2019-11-11 16:25:00 +01:00
Joan Sanchez	42524c7f1d	increased width to expand class #1845	2019-11-11 13:22:25 +01:00
Joan Sanchez	6f7962935d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-11 11:24:26 +01:00
Juan Ferrer	cf6961f5c5	E2E fixes	2019-11-10 14:13:55 +01:00
Juan Ferrer	976782738e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor	2019-11-10 13:27:31 +01:00
Juan Ferrer	515234187a	First working version	2019-11-10 11:08:44 +01:00
Javi Gallego	eaa2ef4570	zone warehouse error	2019-11-07 07:49:37 +01:00
Joan Sanchez	3d701f534a	updated tests	2019-11-06 09:32:54 +01:00
Joan Sanchez	23f6c8843d	#1860 refactorizar llamadas al servicio print	2019-11-06 08:20:45 +01:00
Joan Sanchez	cac8cb6a6a	dev pull request	2019-11-05 09:16:16 +01:00
Juan Ferrer	c41fb1d0f4	#1847 vnDialog refactor	2019-10-30 16:57:14 +01:00
Joan Sanchez	443aa56fed	refactor	2019-10-29 07:46:44 +01:00
Juan Ferrer	0a4a22ec87	vnInputFile fixed	2019-10-28 21:40:24 +01:00
Juan Ferrer	1b2c383502	vnDialog opens in body, nightmare extensions with detailed errors	2019-10-28 17:31:33 +01:00
Juan Ferrer	47998aaa97	vnDialog opens in body	2019-10-27 01:30:01 +02:00
Juan Ferrer	5ae558e965	Watchers performance fixes	2019-10-26 12:04:48 +02:00
Juan Ferrer	c7384bb3ac	API path prefix, repeated code removed from tests	2019-10-25 00:53:53 +02:00
Joan Sanchez	2ed4cf3e4a	Item request refactor #1818	2019-10-22 13:44:36 +02:00
Joan Sanchez	58a763acf5	added quicklinks to worker descriptor	2019-10-21 14:21:52 +02:00
Juan Ferrer	72017a64ac	Date timezone offset properly handled from backend DB connector	2019-10-19 01:18:25 +02:00
Juan Ferrer	17a150370c	Style fixes	2019-10-18 21:54:13 +02:00
Juan Ferrer	43fd8fe75e	Merge	2019-10-18 21:37:28 +02:00
Juan Ferrer	457034daad	Tests fixed	2019-10-18 21:36:30 +02:00
Joan Sanchez	04785d3f72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department	2019-10-17 13:28:07 +02:00
Joan Sanchez	b2b76b05d8	css fixes + back unit tests	2019-10-17 13:27:50 +02:00
Carlos Jimenez Ruiz	8ce804a099	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-17 11:56:12 +02:00