3924 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	8cf2b241cd	route delivery days now gets params from url	2021-07-01 12:08:48 +02:00
Carlos Jimenez Ruiz	3ea2772e1e	Merge branch 'dev' into 3006-item_filter_category	2021-07-01 09:54:57 +00:00
Joan Sanchez	c8bfc911c2	2974 - Get amount unpaid from customer_risk	2021-07-01 08:33:56 +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	4148500c61	workers without active contract no longer set calendar and timeControl at fault	2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz	d946750113	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3006-item_filter_category	2021-06-30 10:48:27 +02:00
Carlos Jimenez Ruiz	2469540f66	item category filter is now working again	2021-06-30 10:48:19 +02:00
Javi Gallego	9054aa0885	Merge branch 'dev' into 2940-invoiceInTax-section	2021-06-30 08:30:40 +02:00
Javi Gallego	9371c49922	cambios solicitados	2021-06-30 08:26:03 +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	15c7c0cb4b	read acl set on the model	2021-06-29 15:31:58 +02:00
Carlos Jimenez Ruiz	a51494e784	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2949-client_basicdata_businesstype	2021-06-29 15:03:56 +02:00
Carlos Jimenez Ruiz	01a9154015	Merge branch 'dev' into 3002-backend_transactions	2021-06-29 10:23:47 +00:00
Carlos Jimenez Ruiz	d67e36212f	added validation for the dms id field	2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz	f30cd1aeda	added business type to client basic data	2021-06-29 10:51:27 +02:00
Carlos Jimenez Ruiz	f3193f0dc1	added businesType model and relation to client	2021-06-29 10:51:01 +02:00
Javi Gallego	59fac7edfa	fixtures	2021-06-29 10:33:01 +02:00
Javi Gallego	e217f02321	test front	2021-06-29 08:59:55 +02:00
Carlos Jimenez Ruiz	8ca3e0d120	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing	2021-06-28 16:45:19 +02:00
Carlos Jimenez Ruiz	e2ff3ff17f	validation message for dup entry	2021-06-28 13:30:49 +02:00
Joan Sanchez	c6504140af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-28 12:23:11 +02:00
Joan Sanchez	52e6c9d793	CSS fixes	2021-06-28 12:06: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
Carlos Jimenez Ruiz	e054145b49	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2996-route_tickets_recalc	2021-06-28 10:44:19 +02:00
Carlos Jimenez Ruiz	32d0aa4e10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-backend_transactions	2021-06-28 10:17:30 +02:00
Carlos Jimenez Ruiz	e9bcddc29f	invoice modules transactions and tests	2021-06-28 10:15:54 +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	66a2563552	Added line break	2021-06-28 08:48:35 +02:00
Joan Sanchez	e7dcb54efb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-28 08:33:41 +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
Javi Gallego	02cd2283a7	summary total	2021-06-25 09:30:24 +02:00
Javi Gallego	82e65ec1c3	rellena campo rate	2021-06-25 07:47:53 +02:00
Joan Sanchez	0941b2423e	2983 - Invoice tickets	2021-06-24 13:33:51 +02:00
Joan Sanchez	db30ac3175	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-24 11:40:23 +02:00
Carlos Jimenez Ruiz	3bfc08b117	route.summary order by priority	2021-06-24 10:06:31 +02:00
Carlos Jimenez Ruiz	320c04b2d3	update volume is not called when add/remove tickets from route	2021-06-24 09:54:07 +02:00
Joan Sanchez	362c404aba	Css fixes	2021-06-24 09:16:59 +02:00
Carlos Jimenez Ruiz	6aae09f070	front unit tests final amend	2021-06-23 14:21:48 +02:00
Carlos Jimenez Ruiz	2da72fc993	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild	2021-06-23 14:20:12 +02:00
Carlos Jimenez Ruiz	12c9f3fd7d	Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild	2021-06-23 14:18:23 +02:00
Joan Sanchez	b2feb5227c	Merge branch 'dev' into 2974-client_balance	2021-06-23 12:15:36 +00:00
Carlos Jimenez Ruiz	029b2f2fdd	Merge branch 'dev' into 2955-entry_summary_show_receved_sent	2021-06-23 12:12:37 +00: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
Carlos Jimenez Ruiz	c88033a69d	deprecated listWorkers endpoint as it was not in use	2021-06-23 13:22:35 +02:00
Joan Sanchez	deaade92b0	Shortened packing type	2021-06-22 14:27:45 +02:00
Joan Sanchez	256203944e	HOTFIX: Prevent error on tickets without state	2021-06-22 14:11:33 +02:00
Joan Sanchez	a1b4164b5d	2974 - Client balance default company and fixes	2021-06-22 13:57:32 +02:00
Joan Sanchez	79296ac857	2974 - Client balance default company and fixes	2021-06-22 11:57:43 +02:00
Carlos Jimenez Ruiz	565f343e19	added isDelivered, isReceived and removed travel descriptor	2021-06-22 09:39:33 +02:00
Carlos Jimenez Ruiz	0421fd8828	back end unit tests for zone endpoints	2021-06-21 15:04:23 +02:00
Carlos Jimenez Ruiz	b651fdebe6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions	2021-06-21 14:35:01 +02:00
Joan Sanchez	8c0171096f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create	2021-06-21 09:19:00 +00:00
Carlos Jimenez Ruiz	48a2bb7b10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions	2021-06-21 09:08:03 +02:00
Carlos Jimenez Ruiz	05c630533a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction	2021-06-18 16:38:33 +02:00
Joan Sanchez	8f24c3f39b	Merge branch 'dev' into 2980-invoiceIn_fixes	2021-06-18 14:34:48 +00:00
Joan Sanchez	9506a8fd90	Disabled sortable column	2021-06-18 16:34:34 +02:00
Joan Sanchez	6acf922d3b	Merge branch 'dev' into 2980-invoiceIn_fixes	2021-06-18 14:15:42 +00:00
Joan Sanchez	dd7f37e36c	Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev ... Reviewed-on: #663 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-06-18 14:15:15 +00:00
Joan Sanchez	a4f20daf17	Updated unit test	2021-06-18 16:14:30 +02:00
Joan Sanchez	a50eebfed4	Replaced salesPerson by packages column	2021-06-18 16:07:13 +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
Carlos Jimenez Ruiz	ba0fdcd743	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions	2021-06-18 15:05:10 +02:00
Carlos Jimenez Ruiz	82cb9ed749	zone module endpoints now have transactions	2021-06-18 15:05:03 +02:00
Joan Sanchez	20e933ed07	2980 - Invoice in fixes	2021-06-18 13:29:59 +02:00
Joan Sanchez	0ff114ff36	Ammends	2021-06-18 12:32:37 +02:00
Joan Sanchez	c622f24b0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction	2021-06-18 11:12:58 +02:00
Carlos Jimenez Ruiz	e74f1f109e	Merge branch 'dev' into 2906-deliveryNote_packages	2021-06-18 08:27:46 +00:00
Joan Sanchez	325afe2245	2906 - Number of packages	2021-06-18 08:42:55 +02:00
Joan Sanchez	b36b48f4b3	Merge branch 'dev' into 2874-timeEntry_direction	2021-06-18 06:04:33 +00:00
Joan Sanchez	bc7c288742	Updated unit tests	2021-06-18 08:03:55 +02:00
Joan Sanchez	8695fadc18	Merge branch 'dev' into 2948-ticket_sale_itemPackingType	2021-06-18 05:21:01 +00:00
Javi Gallego	a6c093cf16	Merge branch 'dev' into 2940-invoiceInTax-section	2021-06-18 07:07:52 +02:00
Joan Sanchez	bbbf008076	Added done() to async beforeAll()	2021-06-17 16:09:17 +02:00
Joan Sanchez	bb80621890	2874 - Edit time entry direction	2021-06-17 15:09:04 +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
Javi Gallego	dc0212d2fc	chip	2021-06-16 18:36:42 +02:00
Carlos Jimenez Ruiz	7370269e4d	ticket.sale now shows Packing type	2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz	47ad63c154	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight	2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz	588a499c44	editLatestsBuys now is called only with id and itemFk	2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz	f5ad0c9c1c	Merge branch 'dev' into 2961-summary_tickets	2021-06-16 10:18:47 +00:00
Joan Sanchez	447d8341e7	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 09:49:12 +00:00
Joan Sanchez	76623d8c95	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 09:47:45 +00:00
Joan Sanchez	0ce782a4de	Updated unit tests	2021-06-16 11:40:00 +02:00
Joan Sanchez	3e938fa9fb	Updated unit tests	2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz	b9cdc5ed6a	Merge branch 'dev' into 2965-delete_travel_from_descriptor	2021-06-16 08:19:01 +00:00
Joan Sanchez	efc9edb384	Fixes	2021-06-16 10:13:06 +02:00
Joan Sanchez	df94190a8c	Removed console log	2021-06-16 09:59:54 +02:00
Carlos Jimenez Ruiz	34e0d0b7cf	translations update	2021-06-16 09:50:32 +02:00
Joan Sanchez	225bfd09b9	Missing translation	2021-06-16 09:47:54 +02:00
Joan Sanchez	c10f792619	Merge branch 'dev' into 2929-entry_latestsbuys_refactor	2021-06-16 07:44:30 +00:00
Joan Sanchez	353d0e352d	2961 - Show tickets on summary	2021-06-16 09:43:07 +02:00
Joan Sanchez	55908c0fca	Merge branch 'dev' into 2941-salesMonitor_changes	2021-06-16 07:41:16 +00:00
Carlos Jimenez Ruiz	1a053942a1	Merge branch 'dev' into 2963-creditInsurance_acl	2021-06-15 14:41:52 +00:00
Carlos Jimenez Ruiz	8c1df0743d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor	2021-06-15 16:41:12 +02:00
Carlos Jimenez Ruiz	8aa3d269ea	Travel descriptor now shows delete option if there are no entries	2021-06-15 16:41:01 +02:00
Joan Sanchez	9591f04853	Merge branch 'dev' into 2938-entry_buy_style	2021-06-15 12:18:59 +00:00
Joan Sanchez	92e8f528e8	2963 - Show section to all employee	2021-06-15 14:16:12 +02:00
Joan Sanchez	2469409068	2941 - Monitor changes	2021-06-15 13:48:42 +02:00
Carlos Jimenez Ruiz	db3d5ca4d8	added missing html closing tag	2021-06-15 13:14:21 +02:00
Carlos Jimenez Ruiz	7004ad5ade	removed several columns from bulk edit and added packingOut	2021-06-15 12:47:40 +02:00
Javi Gallego	500b68162b	summary con chip	2021-06-15 09:58:21 +02:00
Javi Gallego	5369e8d97e	Merge branch 'dev' into 2940-invoiceInTax-section	2021-06-15 09:09:08 +02:00
Javi Gallego	a8e01909d0	ancho ok	2021-06-15 09:02:00 +02:00
Carlos Jimenez Ruiz	9c0cff2f3a	removed unused code	2021-06-14 16:09:28 +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	cdbab4d7bf	Merge branch 'dev' into 2567-calendar_rework	2021-06-14 10:00:47 +00:00
Carlos Jimenez Ruiz	c09d25ba48	Merge branch 'dev' into 2567-calendar_rework	2021-06-14 09:59:13 +00:00
Joan Sanchez	59e90c2c10	Removed commented block	2021-06-14 11:58:39 +02:00
Joan Sanchez	722c9ad4d4	Merge branch 'dev' into 2957-ticket_summary_postcode	2021-06-14 09:42:40 +00:00
Carlos Jimenez Ruiz	7f69909bbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination	2021-06-14 11:39:04 +02:00
Carlos Jimenez Ruiz	f36b54f97b	invoiceOut summary tickets pagination + refactor	2021-06-14 11:38:57 +02:00
Joan Sanchez	a303b98093	Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route	2021-06-14 09:37:23 +00:00
Javi Gallego	44ce54ede4	seccion en summary	2021-06-14 09:47:04 +02:00
Joan Sanchez	de30a2d978	Total holidays fix	2021-06-14 08:09:53 +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	7bf832079d	route.tickets suggested tickets now shows both descriptors	2021-06-11 13:02:18 +02:00
Joan Sanchez	17a6dfc81b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-11 10:58:40 +02:00
Joan Sanchez	a72010554c	Fixes and E2E updated	2021-06-11 10:58:00 +02:00
Carlos Jimenez Ruiz	c776d34cdf	invoiceIn basic data and summary added some fields	2021-06-10 17:08:21 +02:00
Joan Sanchez	e8fd1c9c9c	Merge branch 'dev' into 2951-fix_unit_test	2021-06-10 14:24:17 +00:00
Joan Sanchez	be791d1f00	2951 - Added transaction to updateVolume() method	2021-06-10 16:08:44 +02:00
Joan Sanchez	3f3e5c2735	Unit tests	2021-06-10 16:05:10 +02:00
Joan Sanchez	1b62233ea7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-10 14:22:13 +02:00
Joan Sanchez	8284702603	2567 - Working calendar refactor	2021-06-10 11:24:32 +02:00
Carlos Jimenez Ruiz	fc3af7b6a6	ticket expedition now shows scan worker and scanned date	2021-06-09 14:25:50 +02:00
Javi Gallego	acf03959f5	creada seccion invoiceInTax	2021-06-09 10:20:18 +02:00
Carlos Jimenez Ruiz	f969323a86	ticket create now takes clientFk from params	2021-06-08 17:30:00 +02:00
Joan Sanchez	3c8629b3f3	Added entilementRate effects	2021-06-08 16:36:16 +02:00
Carlos Jimenez Ruiz	76e723cc34	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-08 07:47:42 +00:00
Javi Gallego	8878a2280a	models	2021-06-08 08:04:38 +02:00
Carlos Jimenez Ruiz	238975644f	Merge branch 'dev' into 2943-timecontrol_now_showing_hours	2021-06-07 13:02:27 +00:00
Carlos Jimenez Ruiz	3894fe94ec	Merge branch 'dev' into 2937-module_transactions	2021-06-07 13:02:20 +00:00
Joan Sanchez	8fa64122f8	Ammends	2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz	a46fef5295	endpoint minor refactor	2021-06-07 14:26:34 +02:00
Carlos Jimenez Ruiz	8fd7faa47b	fixed bug module importation + rewritten tests	2021-06-07 11:12:56 +02:00
Javi Gallego	c90fa41fae	accountingType.isAutoConciliated == true	2021-06-07 07:57:46 +02:00
Carlos Jimenez Ruiz	647b7a93cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions	2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz	b38605442e	transactions for entry module endpoints	2021-06-04 17:16:02 +02:00
Joan Sanchez	c853cfc86f	Refactor	2021-06-04 15:49:48 +02:00
Joan Sanchez	2c0fc7e45e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-04 11:46:37 +02:00
Joan Sanchez	6b65aa87d8	HOTFIX: Max width for client name field	2021-06-04 11:46:09 +02:00
Joan Sanchez	b77ecc2c06	changes2	2021-06-04 11:45:35 +02:00
Joan Sanchez	f8df3f1f3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework	2021-06-04 11:10:43 +02:00
Joan Sanchez	651a9356f3	Merge branch 'dev' into 2932-invoiceIn_log	2021-06-04 07:54:18 +00:00
Javi Gallego	2604c81533	falta solucionar test	2021-06-04 08:24:33 +02:00
Joan Sanchez	e1c1bb8425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-04 08:00:08 +02:00
Joan Sanchez	8bb254e93f	HOTFIX: Ticket monitor clientGetDebt	2021-06-03 16:29:45 +02:00
Joan Sanchez	edf18938a6	HOTFIX: clientGetDebt	2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz	b0bed3c1c4	invoiceInLog section, model and table	2021-06-03 16:14:52 +02:00
Joan Sanchez	d1daed3540	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-06-03 13:39:51 +02:00
Joan Sanchez	5962a68d15	HOTFIX: Sort by zone hour	2021-06-03 12:40:27 +02:00
Joan Sanchez	3fcd78e1f3	Changes	2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz	86631c84d0	moved transferor from fiscal data to basic data + e2e	2021-06-02 17:35:30 +02:00
Joan Sanchez	655380a52c	Removed focus	2021-06-02 10:33:10 +02:00
Joan Sanchez	07026a68bb	#2934 - HOTFIX: Route suggested tickets	2021-06-02 10:29:56 +02:00
Joan Sanchez	a594e63566	Chip color	2021-06-01 11:39:40 +02:00
Javi Gallego	70fc260eae	vnConfig solucionado	2021-06-01 10:10:09 +02:00
Javi Gallego	3a5d84b34c	rutas reparadas	2021-05-31 08:21:16 +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	e418d6239b	fixed getSummary unit test	2021-05-24 11:28:23 +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
Carlos Jimenez Ruiz	1bfe537186	claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig	2021-05-21 15:31:05 +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	b7049122fe	Url fix	2021-05-20 10:28:37 +02: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
Joan Sanchez	714142f868	Merge branch 'dev' into 2908-label_value_full_text	2021-05-18 12:53:33 +00:00
Joan Sanchez	98d7f246a4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-18 14:44:38 +02:00
Joan Sanchez	a9e33abacc	FIX: Show employee list	2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz	e10dc53a9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 14:22:36 +02:00
Joan Sanchez	3402bd119d	Css fixes	2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz	06d396a76a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text	2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz	c0e2ff12da	moved vn-log to salix components + css changes and renamed worker-log to log	2021-05-18 13:22:40 +02:00
Joan Sanchez	5c760b3faa	Max height	2021-05-18 12:21:01 +02:00
Joan Sanchez	b87e79b9d3	Changes	2021-05-18 11:58:32 +02:00
Joan Sanchez	6ec28cbc86	Removed transaction block	2021-05-18 11:58:32 +02:00
Joan Sanchez	bc7f2d8193	Responsive	2021-05-18 11:58:32 +02:00
Joan Sanchez	bb67277c68	#2913, #2914 - Changes to sales monitors	2021-05-18 11:58:32 +02:00
Joan Sanchez	400bf7b4f2	Changes	2021-05-18 10:05:13 +02:00
Joan Sanchez	5d278f416f	Removed transaction block	2021-05-18 10:04:01 +02:00
Joan Sanchez	bf250b77ef	Responsive	2021-05-18 09:12:47 +02:00
Joan Sanchez	10387ee40b	#2913, #2914 - Changes to sales monitors	2021-05-18 08:41:36 +02:00
Carlos Jimenez Ruiz	5843140cf5	minor refactor for code usage instead of description	2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz	e848b94859	removed LEFT from join	2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz	3a25dbc3b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-17 09:05:15 +02:00
Joan Sanchez	085a5a104b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-17 08:39:55 +02:00
Joan Sanchez	b67c95e5f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-17 07:38:04 +02:00
Joan Sanchez	378175224c	HOTFIX: Buyer ACL	2021-05-17 07:24:24 +02:00
Carlos Jimenez Ruiz	b902a4dd4a	front unit test fix	2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz	97e9dc57bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Joan Sanchez	e45af1c60a	Updated unit test	2021-05-14 13:56:04 +02:00
Joan Sanchez	c0f2590b61	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-14 12:56:10 +02:00
Joan Sanchez	e39758ee16	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-14 12:46:54 +02:00
Joan Sanchez	a70b29f9bf	#2916 - HOTFIX: Grouping selection limit	2021-05-14 12:44:23 +02:00
Carlos Jimenez Ruiz	2b83abeefd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 10:13:02 +02:00
Joan Sanchez	c4357ea577	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-13 12:27:01 +02:00
Joan Sanchez	e6f7ef41b0	Hotfix: Catalog items without ink	2021-05-13 12:21:12 +02:00
Joan Sanchez	ac02f8b309	Ticket request hotfix	2021-05-13 12:18:21 +02:00
Joan Sanchez	24981912e4	2907 - Proper claim rate percentage	2021-05-13 12:13:15 +02:00
Joan Sanchez	6fdb91fdc8	Removed line	2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz	95666ccc1d	Merge branch 'dev' into 2905-restore_ticket_date	2021-05-13 07:44:01 +00:00
Joan Sanchez	4a1d286a95	2907 - Proper claim rate percentage	2021-05-13 09:17:49 +02:00
Joan Sanchez	af49a66911	Unit test fix	2021-05-13 08:57:49 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Joan Sanchez	8af66a7ca5	HOTFIX: Sort by column	2021-05-12 15:11:07 +02:00
Joan Sanchez	b3cbf9374c	Hotfix: Catalog items without ink	2021-05-12 14:22:29 +02:00
Joan Sanchez	9363726d67	Updated unit test	2021-05-12 13:37:01 +02:00
Joan Sanchez	873fc54dff	More ammends	2021-05-12 13:18:58 +02:00
Joan Sanchez	65f0cb4612	More ammends	2021-05-12 13:14:41 +02:00
Joan Sanchez	6f5df10413	Removed controller	2021-05-12 13:06:36 +02:00
Joan Sanchez	eecba426ee	Removed unused class	2021-05-12 13:00:54 +02:00
Joan Sanchez	b828609d33	Ammends	2021-05-12 12:39:45 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz	83d6581349	indentation correction	2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz	457d23dc16	reoute tickets order columns + endpoint refactor	2021-05-12 09:51:32 +02:00
Joan Sanchez	e22da9b0d5	Merge branch 'dev' into 2863-monitor_module	2021-05-12 07:14:08 +00:00
Joan Sanchez	88616862cb	Updated unit tests	2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz	d4eedc69e1	indentation on route filter	2021-05-11 12:53:08 +02:00
Joan Sanchez	6ae8b72268	Merge branch 'dev' into 2902-error-getSuggestedTickets	2021-05-11 09:52:42 +00:00
Joan Sanchez	d2169000f4	Merge branch 'dev' into 2863-monitor_module	2021-05-11 07:46:18 +00:00
Joan Sanchez	dc44af148d	2863 - Added sales monitor	2021-05-11 09:43:15 +02:00
Carlos Jimenez Ruiz	ac917b6115	mino changes on translations	2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz	58447c8168	transaltion changes	2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz	657896bce0	increased section width	2021-05-10 10:32:00 +02:00
Javi Gallego	84cd89d7f7	modifica la descripcion de la compensacion	2021-05-07 08:45:20 +02:00
Javi Gallego	19b35f5f6c	landed en lugar de shipped	2021-05-07 07:52:03 +02:00
Javi Gallego	f1c30ca6d1	cambio landed por created	2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz	245243aa14	routes without vehicle or vehicles without drop off now throw	2021-05-05 13:36:54 +02:00
Joan Sanchez	db148c8177	2863 - Added monitor module	2021-05-04 12:44:21 +02:00
Joan Sanchez	1efe8cb683	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption	2021-05-03 14:03:41 +02:00
Carlos Jimenez Ruiz	47e36913a1	Merge branch 'dev' into 2770-supplier_address	2021-05-03 11:55:55 +00: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
Joan Sanchez	4d90006aa6	Updated unit test	2021-04-30 14:27:50 +02:00
Joan Sanchez	07dbeaf515	2727 - Send consumption report to an email address	2021-04-30 13:50:41 +02:00
Joan Sanchez	fcc8ab4236	Added model ACL	2021-04-30 10:08:40 +02:00
Joan Sanchez	dbe22844a6	Removed unused method	2021-04-30 09:53:20 +02:00
Joan Sanchez	5445764043	Added supplier address fixtures	2021-04-30 08:26:05 +02:00
Joan Sanchez	61a63ad76f	Merge branch 'dev' into 2770-supplier_address	2021-04-29 12:42:42 +00:00
Joan Sanchez	330b6bdf8a	2770 - Added supplier addresses section	2021-04-29 14:41:10 +02:00
Joan Sanchez	5a53cb09da	Create receipt button changed role to salesAssistant	2021-04-29 08:48:11 +02:00
Carlos Jimenez Ruiz	eea8ed9a3c	front unit test entry import buys fix	2021-04-28 22:56:02 +02:00
Carlos Jimenez Ruiz	3c280eed2e	e2e path for entry buy after entry import path	2021-04-28 18:29:29 +02:00
Carlos Jimenez Ruiz	9ef4497ea6	translations and tittles	2021-04-28 12:11:49 +02:00
Carlos Jimenez Ruiz	d3b22d7078	controller refactor to remove repeated code	2021-04-28 11:55:04 +02:00
Carlos Jimenez Ruiz	e53298f35c	test new uses transaction	2021-04-28 11:24:02 +02:00
Carlos Jimenez Ruiz	ddc19ddbcd	enpoint now receives all data for a buy + css refactor	2021-04-28 11:15:02 +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	2395a0af63	done	2021-04-26 12:24:16 +02:00
Javi Gallego	4a7a4f6dcf	test ok	2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz	0abb8f2d5f	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-21 13:21:16 +00:00
Carlos Jimenez Ruiz	94cd6cfb3e	watcher aint looking after data changed to disable test conn button	2021-04-19 13:23:08 +02:00
Carlos Jimenez Ruiz	857c508391	Merge branch 'dev' into 2729-prices_popover	2021-04-19 07:59:09 +00:00
Javi Gallego	cd4f93f326	minor fixes	2021-04-16 18:35:03 +02:00
Javi	f7fa363fa5	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz	420f05bb03	mocked api client due to service instability	2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz	56ec7b4729	input number made wider	2021-04-16 10:17:59 +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
Carlos Jimenez Ruiz	17904c4edb	only undo and save buttons are disabled until data changed now	2021-04-16 09:20:02 +02:00
Joan Sanchez	2cdafeecf4	Added unit tests	2021-04-15 14:30:47 +02:00
Joan Sanchez	bf976a3e8f	2729 - Prices popover refactor	2021-04-15 14:30:30 +02:00
Carlos Jimenez Ruiz	2ebd812a1f	updated model + translations	2021-04-15 11:54:40 +02:00
Carlos Jimenez Ruiz	41ab1bbe35	fixed a test where invoiceIn was nested into the summary	2021-04-15 10:50:10 +02:00
Carlos Jimenez Ruiz	38f43eca3b	invoiceIn basicData + index preview of summary	2021-04-15 10:47:39 +02:00
Carlos Jimenez Ruiz	69069d5e28	invoiceIn summary frontend	2021-04-15 10:46:23 +02:00
Carlos Jimenez Ruiz	ec378a17ae	invoiceIn model updated a summary registered	2021-04-15 10:45:27 +02:00
Carlos Jimenez Ruiz	8faa1531c6	summary route + test	2021-04-15 10:44:25 +02:00
Carlos Jimenez Ruiz	d8628379dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary	2021-04-14 11:11:40 +02:00
Carlos Jimenez Ruiz	b2ecd7d3c2	Merge branch 'dev' into 2878-activeWorkers_refactor	2021-04-14 08:15:06 +00:00
Joan Sanchez	dac95805e8	2882 - Replaced worker userFk property by user id	2021-04-14 09:02:08 +02:00
Joan Sanchez	78313bd9a7	Updated unit tests	2021-04-14 08:15:03 +02:00
Joan Sanchez	6b8074e32f	2878 - Splitted method into activeWithRole and activeWithInheritedRole	2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz	01f0fed0c3	Merge branch 'dev' into 2483-email_replyTo	2021-04-13 08:41:56 +00:00
Joan Sanchez	7033ec2c11	Added missing translations	2021-04-13 10:39:42 +02:00
Carlos Jimenez Ruiz	90a7c803fd	descriptor invoiceIn amount	2021-04-12 16:32:13 +02:00
Carlos Jimenez Ruiz	b6f31d7d44	invoiceIn descriptor implementation	2021-04-12 12:43:17 +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	418d7a2d12	Updated unit test	2021-04-07 14:14:31 +02:00
Joan Sanchez	e40911e833	2815 - Fix ticket without state	2021-04-07 13:39:36 +02:00
Joan Sanchez	465955d0c5	2483 - Added replyTo param when sending an email to client	2021-04-07 13:09:53 +02:00
Carlos Jimenez Ruiz	2d041142c3	Merge branch 'dev' into 2631-notify_incomplete	2021-04-07 09:30:05 +00:00
Joan Sanchez	93399d6de6	Updated description	2021-04-07 11:18:44 +02:00
Joan Sanchez	6c36ab3905	Removed back button	2021-04-07 10:47:31 +02:00
Joan Sanchez	d4c6695629	2631 - Notify status change to incomplete	2021-04-07 07:45:00 +02:00
Joan Sanchez	65dc0e3780	2615 - Waste breakdown	2021-04-06 13:46:38 +02:00
Joan Sanchez	5ef3ff40ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-06 09:14:11 +02:00
Joan Sanchez	a2144405ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-02 17:04:37 +02:00
Joan Sanchez	9bbf43c590	Replace http with https	2021-04-02 14:34:16 +02:00
Javi Gallego	47a3779c45	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-01 18:39:18 +02:00
Javi Gallego	336472291d	test	2021-04-01 18:38:40 +02:00
Javi Gallego	eec901684a	reviso test	2021-04-01 17:36:27 +02:00
Carlos Jimenez Ruiz	893de63f74	Merge branch 'dev' into 2866-descriptor_photo	2021-04-01 14:51:05 +00:00
Joan Sanchez	b4cceff4cb	2866 - Limit descriptor photo size to width 100%	2021-04-01 14:20:00 +02:00
Joan Sanchez	fa0b01a0d5	Fixed buttons alignment	2021-04-01 14:00:34 +02:00
Joan Sanchez	91c26ee5a5	Removed filter import	2021-04-01 13:55:01 +02:00
Joan Sanchez	389f10bda0	Removed entry import	2021-04-01 13:51:55 +02:00
Joan Sanchez	f89419962d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index	2021-04-01 13:42:38 +02:00
Javi Gallego	67f822ebdc	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-01 13:14:26 +02:00
Joan Sanchez	41ee6e70a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-01 08:42:02 +02:00
Javi Gallego	c036c7c7fe	model ok	2021-03-31 07:33:00 +02:00
Carlos Jimenez Ruiz	694055f85c	width changed from medium to large	2021-03-30 16:19:54 +02:00
Carlos Jimenez Ruiz	75155c796d	removed unused code	2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz	4207bfcc70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created	2021-03-30 15:19:38 +02:00
Carlos Jimenez Ruiz	061626e521	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions	2021-03-30 14:51:05 +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	4aa616601e	2615 - Waste changes	2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz	e025368af1	updaloadFile transaction commit conditional	2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz	dbf5296041	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created	2021-03-30 09:56:12 +02:00
Carlos Jimenez Ruiz	70f6728c8f	started to created date changes	2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz	8797444553	importTicketSales refactor + tests	2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz	c1f457c263	allowContentTypes and removeFile refactors	2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz	740cc79bc0	uploadFile refactor	2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz	de2a17e840	removeFile and filter refactors	2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz	8d8bdacd86	updateClaimAction refactor + tests	2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz	3054cbcadb	updateClaim refactor + tests	2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz	c4cbc064c9	regularice claim refactor + test	2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz	ee79f23185	createFromSales refactor + tests	2021-03-29 15:14:23 +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	13d71b590a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-29 07:33:49 +02:00
Joan Sanchez	407c0e6280	Supplier "Contacts" changes	2021-03-29 07:33:20 +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	767665e3c9	endpoint indentation + type updated yo array of objects	2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz	f46c18b6b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum	2021-03-26 10:33:58 +01:00
Carlos Jimenez Ruiz	3c8ed85e69	sum is now made on backend and html amends	2021-03-26 10:33:53 +01:00
Carlos Jimenez Ruiz	1cc4e60bad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations	2021-03-24 16:45:57 +01:00
Carlos Jimenez Ruiz	41bb4cbaab	deprecated vat and subTotal related methods + tests fixed	2021-03-24 16:43:54 +01:00
jorgebl	393b9ba38c	Correct name	2021-03-24 14:17:27 +01:00
jorgebl	81fbc81314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum	2021-03-24 13:54:41 +01:00
jorgebl	e01b7420d9	Added total cost of item	2021-03-24 13:54:29 +01:00
Joan Sanchez	e767e95729	Loggable fixes	2021-03-24 13:09:35 +01:00
Joan Sanchez	c65fbef3df	Merge branch 'dev' into 2819-notify_assignment	2021-03-24 11:47:38 +00:00
Joan Sanchez	32805dbafb	Added model unit test	2021-03-24 12:45:26 +01:00
Joan Sanchez	0e9b3bd39a	Missing translation	2021-03-24 11:12:36 +01:00
Carlos Jimenez Ruiz	409f56ec7f	e2e path resurrected for route tickets	2021-03-23 17:19:05 +01:00
Joan Sanchez	b3d333368b	#2819 - Notify worker assignment	2021-03-23 16:19:45 +01:00
Carlos Jimenez Ruiz	89d123c7f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-23 13:19:30 +01:00
Carlos Jimenez Ruiz	a78a73486a	updated routes fixtures and fixed tests	2021-03-23 13:19:11 +01:00
jorgebl	868a0dbff7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-23 09:43:34 +01:00
Carlos Jimenez Ruiz	84378fd607	tickets already in route are no longer shown + tests	2021-03-22 16:13:12 +01:00
jorgebl	e96fd3d1f7	Changed message	2021-03-22 16:11:52 +01:00
Carlos Jimenez Ruiz	0023a88bfc	restored the auto state to its previous version	2021-03-22 11:32:57 +01:00
jorgebl	7e903f91a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 10:32:33 +01:00
Carlos Jimenez Ruiz	1e247e63a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-22 10:32:07 +01:00
Joan Sanchez	eb12126603	Rollback test changes	2021-03-22 10:27:07 +01:00
jorgebl	322a12e65c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 10:24:01 +01:00
jorgebl	5f95bf4e15	Removed vn-horizontal and styles in the spans	2021-03-22 10:23:52 +01:00
Joan Sanchez	6da84e46c1	Added throw error	2021-03-22 10:20:04 +01:00
jorgebl	b7b86cd719	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-22 09:39:06 +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
Carlos Jimenez Ruiz	674d5df96c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-18 15:03:00 +01:00
jorgebl	18a9d0c786	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-18 13:48:37 +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
Carlos Jimenez Ruiz	af7f885d2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-16 14:36:14 +01:00
Carlos Jimenez Ruiz	117ea137c1	ticket index auto-state false for single results	2021-03-16 12:08:48 +01:00
Carlos Jimenez Ruiz	1d521fa9a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor	2021-03-16 10:57:24 +01:00
jorgebl	684705e3ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-16 08:44:09 +01:00
jorgebl	1fc53f5565	QA removed styles in the html and put the translate	2021-03-16 08:44:05 +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	afb8df1429	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance	2021-03-15 11:32:57 +01:00
Carlos Jimenez Ruiz	fb418edc7b	backend modifications for route tickets	2021-03-15 11:32:17 +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
Joan Sanchez	6cb620a41d	Ticket filter fix	2021-03-14 17:20:42 +01:00
Joan Sanchez	7b94cc2942	Ticket filter test	2021-03-14 17:12:31 +01:00
Carlos Jimenez Ruiz	2b8286eb28	deprecated dependencies, replaced babel/polyfill	2021-03-12 17:15:26 +01:00
jorgebl	d2879087ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-12 12:41:06 +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
jorgebl	c74b635a1a	Translate and show url of item	2021-03-12 12:24:08 +01:00
jorgebl	fdecf6510f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-12 10:02:56 +01:00
Joan Sanchez	f92db8c5a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys	2021-03-12 08:52:07 +01:00
Joan Sanchez	4c7d95f001	Requested changes + e2e updated	2021-03-12 08:45:41 +01:00
Joan Sanchez	be37334f49	Requested changes	2021-03-12 08:17:56 +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
Joan Sanchez	1ed4dd27d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-11 08:59:02 +01:00
Joan Sanchez	1719f53111	2734 - Recreate invoice	2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz	4c0d583556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT	2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz	0cb7ddd9ce	ticket.total with and witout VAT refactor	2021-03-10 19:25:26 +01:00
Joan Sanchez	e29dd4db42	Updated it description	2021-03-10 11:14:50 +01:00
Joan Sanchez	a0358044a1	Acl fix	2021-03-10 11:11:04 +01:00
Joan Sanchez	a7c2e08f8f	ACl fixes	2021-03-10 11:04:56 +01:00
Joan Sanchez	b39ec70a2c	Merge branch 'dev' into 2752-entry_import_buys	2021-03-10 09:54:14 +00:00
Joan Sanchez	c144d9ed47	Unit test changed query path	2021-03-10 10:53:22 +01:00
Joan Sanchez	a4d2c531a3	Changes	2021-03-10 10:29:58 +01:00
jorgebl	2f68509e65	WIP: added styles	2021-03-10 09:49:24 +01:00
jorgebl	45f9c1188d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-10 09:48:17 +01:00
Joan Sanchez	2a2e276c6b	Added back unit test plus fixes	2021-03-10 09:01:32 +01:00
Joan Sanchez	ab755e29c7	Merge branch 'dev' into 2787-change_css_date_time	2021-03-09 14:01:04 +00:00
Joan Sanchez	31205f4556	Added front unit test	2021-03-09 13:39:22 +01:00
Joan Sanchez	5cbd8d632d	Changes	2021-03-09 10:01:40 +01:00
Joan Sanchez	9da59949fd	Merge branch 'dev' into 2733-supplier_descriptor_icon	2021-03-09 08:31:03 +00:00
jorgebl	59882cca77	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon	2021-03-09 09:26:02 +01:00
jorgebl	2d36d4e610	Added line break in vn-icon	2021-03-09 09:25:10 +01:00
Joan Sanchez	ff6c80aa7e	Merge branch 'dev' into 2832-summary_validate_h4	2021-03-09 08:24:10 +00:00
jorgebl	1922280c61	QA rename some descriptions in test and reworked the test	2021-03-08 17:49:04 +01:00
jorgebl	1379691576	Added icon for supplier descriptor	2021-03-08 13:52:11 +01:00
jorgebl	43dc158d7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 13:17:38 +01:00
jorgebl	5cb959f5b8	removed controller.data from submit	2021-03-08 13:12:13 +01:00
jorgebl	27816b29e7	Removed ids on controller.data	2021-03-08 13:06:35 +01:00
jorgebl	134365dd9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor	2021-03-08 12:55:44 +01:00
jorgebl	d09e47835e	Rename the statements for correctly description the action	2021-03-08 12:40:13 +01:00
jorgebl	6e08a66343	Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical	2021-03-08 12:38:54 +01:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
Carlos Jimenez Ruiz	5c776c0f11	Merge branch 'dev' into 2703-ticket_step_one	2021-03-08 09:48:38 +00:00
Joan Sanchez	2aff48c42d	2837 - Updated fonts	2021-03-08 09:34:58 +01:00
jorgebl	192d7627b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 09:12:34 +01:00
jorgebl	28b9da82ed	change conditional	2021-03-08 09:12:10 +01:00
Joan Sanchez	d7651ba4ac	2837 - Updated fonts	2021-03-08 07:53:00 +01:00
jorgebl	1fd18cae5a	QA	2021-03-05 11:40:01 +01:00
jorgebl	4ae418698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component	2021-03-05 11:39:25 +01:00
Joan Sanchez	7ec9ddb6d9	Translation fix	2021-03-05 09:23:31 +01:00