379 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Carlos Jimenez Ruiz	edea60dd94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Joan Sanchez	fd97845979	Revert "Removed sms excluded tests" ... This reverts commit 30912bd5e9.	2020-06-17 14:00:04 +02:00
Joan Sanchez	30912bd5e9	Removed sms excluded tests	2020-06-16 15:11:24 +02:00
Joan Sanchez	dddfe2773a	2293 - getVolume() call to saleVolume	2020-06-12 11:26:32 +02:00
Carlos Jimenez Ruiz	538ae75b89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway	2020-06-10 16:24:17 +02:00
Joan Sanchez	5edfc59d97	Updated unit test	2020-06-10 13:57:32 +02:00
Joan Sanchez	461fec7e64	Updated unit test	2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz	4b1e79a433	2314 server side unit test fixed	2020-06-10 13:50:03 +02:00
Joan Sanchez	3cfb8b4730	2323 - Filter by myTeam fix	2020-06-10 12:13:07 +02:00
Joan Sanchez	1fed4c7913	Contextmenu fixes	2020-06-09 12:16:40 +02: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	ba9a44dec1	Updated back unit test	2020-06-08 13:06:33 +02:00
Joan Sanchez	ab1e8fb622	2176 First working version	2020-06-08 12:14:27 +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	faa053a3d2	Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones	2020-06-05 10:01:52 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech	a81862baad	set deleteded skiped	2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech	f340466daf	fix test 2296	2020-06-04 14:23:48 +02:00
Joan Sanchez	94dcf7679b	Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:54:41 +00:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	18edd523d2	Excluded failing test	2020-06-03 11:40:18 +02:00
Joan Sanchez	b7ceeae65a	Excluded back unit tests. TLS error	2020-06-03 11:27:14 +02:00
Joan Sanchez	751f79373a	Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:28:14 +00:00
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Joan Sanchez	1e4f36b775	Updated back unit test	2020-06-02 09:34:42 +02:00
Joan Sanchez	052c51cee5	2282 - Change stowaway state to FIXING	2020-06-01 12:47:04 +02: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	8be929c1da	log tiquet request	2020-05-27 08:07:14 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Joan Sanchez	4d2d57d646	2265 Changes to filter	2020-05-26 08:08:09 +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
Javi Gallego	a7e6e3d4b7	cr juan	2020-05-19 08:46:42 +02:00
Bernat Exposito Domenech	2681060878	update mehod ticket summary	2020-05-18 14:59:58 +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
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	09e425c33c	2174 ticket.weekly con campo agencyModeFk con E2E	2020-04-08 12:33:36 +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
Joan Sanchez	d640b66ef5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway	2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech	74b27778ab	add phones in ticket summary	2020-03-27 11:10:20 +01:00
Joan Sanchez	598ebe96d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale	2020-03-27 11:06:35 +01:00
Joan Sanchez	d4ca58edad	Updated back unit test	2020-03-27 09:10:30 +01:00
Joan Sanchez	835c415ba7	1934 - Moved procedure logic to method	2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech	6928092594	fix ticket.sale state autocomplete	2020-03-26 12:00:07 +01:00
Joan Sanchez	9bae89a672	Updated unit test	2020-03-23 16:03:27 +01:00
Joan Sanchez	27b1376799	changes	2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech	f6ca9eee01	ticketlog in componentUpdate	2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech	fdd1c73485	refactor componentUpdate	2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech	3ab80e1479	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos	2020-03-12 12:04:35 +01:00
Joan Sanchez	6d437d0e2e	Allow empty agency on ticket creation	2020-03-10 11:46:58 +01:00
Joan Sanchez	24becf7872	Updated var names	2020-03-04 11:17:35 +01:00
Joan Sanchez	d6278e0df9	2164 - Show confirmation only when data is not empty	2020-03-04 09:26:12 +01:00
Joan Sanchez	7e694c3e80	2073 - Filter by pending tickets	2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech	42b151c849	fix isEditable spec	2020-03-02 09:43:22 +01:00
Bernat Exposito Domenech	63cd436d3c	fix request changes	2020-03-02 08:30:33 +01:00
Bernat Exposito Domenech	4561b6eeef	refactor ticket.isEditable	2020-02-27 12:31:38 +01:00
Bernat Exposito Domenech	85db094f1d	componentUpdate	2020-02-25 12:36:33 +01:00
Bernat Exposito Domenech	2fdd275085	log in ticketUpdate	2020-02-25 11:43:50 +01:00
Joan Sanchez	415316d7d0	2081 - Fix ticket search by order id	2020-02-24 13:28:59 +01:00
Joan Sanchez	d0c2f88a77	2126 - Search by client name	2020-02-24 12:08:53 +01:00
Joan Sanchez	2f089681df	Don't throw error if no salesPerson is assigned	2020-02-20 12:52:05 +01:00
Carlos Jimenez Ruiz	587653fb40	#2119 e2e item.request	2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech	e0f7b917d7	db test ticket_recalcComponent	2020-02-12 10:39:46 +01:00
Joan Sanchez	91210c3a0d	1684 - Log old quantity value	2020-02-11 08:19:03 +01:00
Joan Sanchez	e1942875af	1684 - Log transfer old values	2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech	bb09fc9746	update ticket.isEditable	2020-02-06 11:50:32 +01:00
Bernat Exposito Domenech	8193b0ffc0	update ticket.filter	2020-02-06 07:37:41 +01:00
Joan Sanchez	57acca2f5e	refactor & updated tests	2020-01-23 13:31:07 +01:00
Joan Sanchez	3ff1fb7d2d	Added back unit tests	2020-01-20 11:59:15 +01:00
Bernat Exposito	e1aefc795b	Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev	2020-01-16 13:42:12 +00: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	708789502d	Added waste section	2020-01-15 13:07:33 +01:00
Joan Sanchez	048fcb733d	added zone name to ticket summary	2020-01-13 07:42:41 +01:00
Bernat Exposito Domenech	e9d3b14da7	refactor models component and componentType	2019-12-27 08:01:53 +01:00
Joan Sanchez	5273e90a30	Added params to ticket method & updated unit tests	2019-12-26 07:12:34 +01:00
Joan Sanchez	42239815e0	removed fdescribe	2019-12-19 15:01:33 +01:00
Juan Ferrer	9947021736	#1953 Temporal fix	2019-12-19 12:17:53 +01:00
Joan Sanchez	ef95244d07	stowaway refactor	2019-12-17 08:38:36 +01:00
Bernat	f38210ddd2	udate structure db	2019-12-04 11:09:36 +01:00
Joan Sanchez	fd72f206bc	Recalculate ticket components #1770	2019-11-21 12:00:56 +01:00
Joan Sanchez	fee0d674a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components	2019-11-21 11:06:31 +01:00
Joan Sanchez	5bb7f7f14a	deprecated getItemVisibleAvailable() #1887	2019-11-20 11:14:11 +01:00
Joan Sanchez	c6d1536500	recalculate ticket components	2019-11-20 06:53:37 +01:00
Javi Gallego	c736e4de29	#1850 descomentar test back	2019-11-18 12:32:50 +01:00
Joan Sanchez	c028233012	ticket.sale recalculate sale price #1768	2019-11-14 14:19:39 +01:00
Joan Sanchez	236dcbf207	changed isRaid to isVirtual, atenderFk to attenderFk	2019-11-13 13:22:39 +01:00
Joan Sanchez	c166067888	updated tests & email compatibility with phone	2019-11-13 12:18:30 +01:00
Joan Sanchez	603bb034a1	Excluded specs with calls to setDeleted #1874	2019-11-13 07:56:09 +01:00
Joan Sanchez	7f2af116bc	updated translation	2019-11-13 07:04:47 +01:00
Joan Sanchez	c3962c3d78	updated test	2019-11-12 15:07:37 +01:00
Joan Sanchez	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Bernat	1be61b16d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-05 08:56:59 +01:00
Javi Gallego	03a4da307d	Tarea #1848 test back arreglados/comentados	2019-10-31 12:54:16 +01:00
Bernat	9353d54b16	add alias on weekly filter	2019-10-29 14:55:05 +01:00
Bernat	afd7c5684a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary	2019-10-24 12:49:23 +02:00
Joan Sanchez	2ed4cf3e4a	Item request refactor #1818	2019-10-22 13:44:36 +02:00
Bernat	939c507fba	#1810 El método listPackaging filtrar por isPackagingReturnable	2019-10-21 09:16:52 +02:00
Joan Sanchez	e2a7c09e4a	Uploadfile parameters are now required + fixed date filters	2019-10-21 08:31:14 +02:00
Joan Sanchez	55f3390f85	added validation for confirmed purcharse requests	2019-10-21 07:08:47 +02:00
Bernat	ed1ed7f50b	#1738 exportar estructura y datos de produccion a la local	2019-10-15 07:23:34 +02:00
Joan Sanchez	300ba61fd3	#1759 Forzar desenrutado al cambiar datos básicos de ticket	2019-10-14 14:43:10 +02:00
Joan Sanchez	c0403873e7	stowaway changed to correct field name	2019-10-08 14:36:02 +02:00
Carlos Jimenez Ruiz	fb846baaa4	#1740 Intermitencia test de back	2019-10-01 13:19:22 +02:00
Juan Ferrer	a177ad8e26	Fixes	2019-09-30 13:02:11 +02:00
Carlos Jimenez Ruiz	6e50c1fad9	#1685 ticket.transferSale	2019-09-27 16:55:40 +02:00
Carlos Jimenez Ruiz	a8c6c57b7e	#1719 claim.detail final amends and tests	2019-09-26 12:07:40 +02:00
Carlos Jimenez Ruiz	2a2c5ae3c4	#1719 claim.detail cambiar descuento falla	2019-09-26 10:56:49 +02:00
Carlos Jimenez Ruiz	65981099b6	#1719 claim.detail cambiar descuento falla	2019-09-26 09:05:18 +02:00
Carlos Jimenez Ruiz	1841e4edb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-25 11:53:42 +02:00
Carlos Jimenez Ruiz	be65c5acad	#1719 claim.detail cambiar descuento falla	2019-09-25 11:53:12 +02:00
Joan Sanchez	73eca9905e	fixed #1734 canHaveStowaway validation	2019-09-25 11:26:12 +02:00
Carlos Jimenez Ruiz	99ef8a6010	#1719 claim.detail cambiar descuento falla	2019-09-24 14:23:21 +02:00
Joan Sanchez	15183df65f	transfer sales error fixed	2019-09-24 08:51:21 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Bernat	2e1b329584	#1681 delete comment	2019-09-13 11:27:32 +02:00
Bernat	c6507fc2bb	#1681 crear test para el endpoint getPossibleStowaways	2019-09-13 07:40:27 +02:00
Bernat	c344d8088b	merge	2019-09-11 14:18:21 +02:00
Joan Sanchez	ff626764d8	fixed back unit tests	2019-09-11 08:24:28 +02:00
Joan Sanchez	342886942f	fixed sale loggable transaction error #1686	2019-09-11 08:12:27 +02:00
Bernat	ac6d1ed829	#1663 update ticketLog	2019-09-10 14:43:00 +02:00
Bernat	8932aa4e5a	Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log	2019-09-10 13:27:41 +02:00
Carlos Jimenez Ruiz	56c291a160	merge	2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz	ce9fb14b62	#1655 e2e ticket.sale Añadir lineas	2019-09-06 11:43:15 +02:00
Bernat	e8cb57e27a	#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen	2019-09-06 09:47:58 +02:00
Joan Sanchez	d3441fa1b3	Ticket step one refactor #1669	2019-09-04 08:04:31 +02:00
Carlos Jimenez Ruiz	c1cca30a26	bug fix icon add ticket.sales enables/disables	2019-09-03 14:42:52 +02:00
Carlos Jimenez Ruiz	219614b44f	#1656 ticket.regularizar eliminar ticket + tests	2019-09-03 13:27:02 +02:00
Carlos Jimenez Ruiz	e1b5b449ce	#1656 ticket.regularizar eliminar ticket	2019-09-03 09:57:53 +02:00
Joan Sanchez	d93974f481	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:36:54 +02:00
Bernat	7eea9d1d2c	Refactor #1630 state.js	2019-08-19 07:56:20 +02:00
Bernat	d9c63e3bc0	Tarea #1501 ticket / delete	2019-08-13 12:44:34 +02:00
Bernat	2e89af9795	#1630 state.isEditable	2019-08-12 13:26:44 +02:00
Bernat	b6cc769df3	Test #1636 refactor test de back isEditable y editableState	2019-08-12 12:31:31 +02:00
Joan Sanchez	0918f154e9	transfer partially sale #1251	2019-08-09 08:04:44 +02:00
Joan Sanchez	a5486ec694	Get allowed content-types from model #1598	2019-08-08 08:37:03 +02:00
Bernat	2f1472b9ee	Tarea #1574 ... ticket.sale editableState	2019-08-08 08:33:27 +02:00
Joan Sanchez	e52a0ac5da	ticket.sale split show active tickets	2019-08-06 07:36:26 +02:00
Joan Sanchez	efeba38fb4	back errors fixed	2019-08-01 11:52:53 +02:00
Bernat	7571cd6e1b	Bug/Test #1607 ticket.updateDiscount and fix test	2019-07-31 07:46:24 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz	e1cbf781e1	#1608 item.request	2019-07-25 09:55:09 +02:00
Bernat	8089c32ec2	Tarea #1611 export db roduction to local	2019-07-23 14:56:57 +02:00
Bernat	6a23a5429c	Tarea #1562 ticket.line isEditable	2019-07-22 13:14:00 +02:00
Joan Sanchez	2a6de77e17	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:49:44 +02:00