1305 Commits

Author	SHA1	Message	Date
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
Carlos Jimenez Ruiz	392c4dcba3	refactor(sale): ticket.sale endpoints now use transactions	2021-09-29 08:27:18 +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	14b92e530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 09:37:37 +02: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
Carlos Jimenez Ruiz	cc90a08f03	refactor(ticket): ticket endpoins now can receive transactions	2021-09-21 18:48:59 +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
Carlos Jimenez Ruiz	6b465f9150	Merge branch 'dev' into 3068-ticket_colletion	2021-09-02 13:07:57 +00:00
Joan Sanchez	0b704db353	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-02 08:56:19 +02:00
Joan Sanchez	b68e99b412	fix(invoice): invoicing was throwing a transaction error ... Refs: 3077	2021-09-02 08:55:41 +02:00
Joan Sanchez	7a98613ef8	Updated unit tests	2021-09-01 11:48:21 +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	a0efe5f896	Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate	2021-08-31 06:27:23 +00: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
Joan Sanchez	23b73aaa41	Merge branch 'dev' into 3038-module_transactions	2021-08-13 15:28:58 +00:00
Carlos Jimenez Ruiz	7a7bbe2ba8	more module transactions	2021-08-13 16:46:44 +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	2b4afdd04d	ticket module transactions + tests	2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz	708c0035c0	deprecated changeWorker as it is no longer in use	2021-08-12 11:06:49 +02:00
Javi Gallego	3b9bdc18bf	funciona	2021-08-12 09:23:19 +02:00
Carlos Jimenez Ruiz	da7bda2d0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions	2021-08-11 16:06:52 +02:00
Joan Sanchez	8e84f98629	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global	2021-08-09 12:59:00 +02:00
Carlos Jimenez Ruiz	870314277f	add sale and canbeInvoice refactor + tests	2021-08-05 13:32:35 +02: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
Joan Sanchez	41a1b3d909	2984 - Global invoicing endpoint	2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz	a771fd584f	minor refactors + missing transaction on discount	2021-07-30 10:29:57 +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
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	319a168b89	Removed focus	2021-07-01 13:43:13 +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
Joan Sanchez	33d03c8f21	Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id	2021-06-30 06:15:05 +00:00
Carlos Jimenez Ruiz	08360bfdc4	deprecated alertLevel.alertLevel now using alertLevel.id	2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz	d67e36212f	added validation for the dms id field	2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz	e2ff3ff17f	validation message for dup entry	2021-06-28 13:30:49 +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
Carlos Jimenez Ruiz	2548fdc891	#3000 add buyer to ticket isEditable	2021-06-25 09:46:18 +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
Joan Sanchez	bbbf008076	Added done() to async beforeAll()	2021-06-17 16:09:17 +02: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	e85b7b9817	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination	2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz	f36b54f97b	invoiceOut summary tickets pagination + refactor	2021-06-14 11:38:57 +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	edf18938a6	HOTFIX: clientGetDebt	2021-06-03 16:21:43 +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	a24cfe0087	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-27 09:42:27 +00: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
Carlos Jimenez Ruiz	3f167de10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions	2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz	d6ef5352a2	sale module now has canEdit endpoint to check arrays of sales	2021-05-26 09:14:18 +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	f6a0bcb12c	Updated unit tests	2021-05-25 13:33:17 +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
Joan Sanchez	6f245698f2	Merge branch 'dev' into 2620-mostrar-disponible	2021-05-21 06:29:43 +00:00
Joan Sanchez	fbc11b7a39	Merge branch 'dev' into 2921-notification_url	2021-05-20 08:23:45 +00:00
Javi Gallego	df073cce2f	refactor tod usa get sales	2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz	2494af0113	removed unused relation from item @addSale	2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz	5eb0ab8296	add and edit sales no longer intervene the prices	2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz	72a0b774de	add and get sales now sets item.price from packaging for EMB items	2021-05-19 14:15:28 +02:00
Joan Sanchez	a5c3ba3926	2921 - Changed the ticket url of rocket notifications	2021-05-19 10:26:58 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Joan Sanchez	6fdb91fdc8	Removed line	2021-05-13 10:20:22 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Joan Sanchez	88616862cb	Updated unit tests	2021-05-12 09:12:46 +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
Javi Gallego	4a7a4f6dcf	test ok	2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz	857c508391	Merge branch 'dev' into 2729-prices_popover	2021-04-19 07:59:09 +00:00
Carlos Jimenez Ruiz	420f05bb03	mocked api client due to service instability	2021-04-16 12:40:41 +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	847e0bd2c8	tests fixed for production sneaky changes	2021-03-30 14:43:21 +02:00
Joan Sanchez	e2a9a64f88	#2871 and #2868. Included ticket filter unit test	2021-03-30 11:20:26 +02:00
Joan Sanchez	eddd769af0	Excluded unit test	2021-03-29 08:39:33 +02:00
Joan Sanchez	3f0fe15763	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-29 07:50:34 +02:00
Joan Sanchez	dbb6ccd89d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-03-29 07:50:16 +02:00
Joan Sanchez	320e3143cd	Ticket filter hotfix	2021-03-26 12:51:14 +01:00
Joan Sanchez	4dbcc0dd5c	HOTFIX: Ticket filter changed ticketGetTotal() args	2021-03-26 12:32:32 +01: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	985bcc61b1	Rollback	2021-03-22 09:11:02 +01:00
Joan Sanchez	59bf458ca5	Removed xdescribe	2021-03-22 09:10:45 +01:00
Joan Sanchez	29979d5367	Rollback	2021-03-22 09:10:12 +01:00
Joan Sanchez	7ac4d67f97	Empty value not being logged in	2021-03-22 09:08:27 +01:00
Joan Sanchez	6210e60896	2669 - Changes to the translate values function	2021-03-19 19:20:19 +01:00
jorgebl	e12be7bf0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-18 13:40:56 +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
Joan Sanchez	92aa9eb933	Removed ticket total temporary table	2021-03-15 06:52:15 +01:00
Joan Sanchez	c3bb099b85	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-15 06:50:42 +01:00