940 Commits

Author	SHA1	Message	Date
Alex Moreno	c87e3e1210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-13 07:20:23 +01:00
Alex Moreno	c9564e817a	test(ticket_volume): frontTest	2022-01-12 14:04:16 +01:00
Alex Moreno	fba09e8c40	feat(ticket_volume): volume for packingType	2022-01-12 14:02:58 +01:00
Carlos Jimenez Ruiz	d86aa5535c	refactor(createFromSales): now claimManager can claim any time	2022-01-04 16:16:39 +01:00
Carlos Jimenez Ruiz	7dbf03ed72	front unit test and e2e for change state	2021-12-30 10:45:19 +01:00
Carlos Jimenez Ruiz	48e4628c48	refactor(ticket.summary): change state button is now dropdown	2021-12-30 09:49:11 +01:00
Alex Moreno	e609994efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-21 21:01:18 +01:00
Alex Moreno	18b6efe8f1	test(ticket_basic-data): test and fixtures	2021-12-21 20:58:58 +01:00
Vicent Llopis	19e50d2156	fix(ticket_sale): front test	2021-12-21 15:00:06 +01:00
Vicent Llopis	bdb42437ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono	2021-12-21 14:45:40 +01:00
Vicent Llopis	5c899d28c3	feat(ticket_sale): add tests and refactor backRoute name	2021-12-21 14:43:53 +01:00
Alex Moreno	831bfb0352	change route for hasRoute	2021-12-21 08:52:39 +01:00
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