1802 Commits

Author	SHA1	Message	Date
Bernat	18b5342609	update fixtures and structure db	2019-11-26 14:15:43 +01:00
Bernat	5040d1d4a8	#1711 Eliminar referencias al esquema vn2008	2019-11-22 14:34:28 +01:00
Bernat Exposito	6a153bd69d	Merge branch 'timeControl_calculate' of verdnatura/salix into dev	2019-11-22 09:55:31 +00:00
Bernat	1ce0c63bf2	1711Eliminar_referencias_vn2008	2019-11-22 08:23:31 +01:00
Carlos Jimenez Ruiz	dca7dd5fc7	rejected last modifications	2019-11-21 14:51:11 +01:00
Carlos Jimenez Ruiz	33e9cf9816	Javi validation	2019-11-21 14:39:09 +01:00
Carlos Jimenez Ruiz	a45ca84e7f	workerTimeControlCalculate procedure refactor	2019-11-21 14:23:22 +01:00
Bernat	038ba3edb2	1711 update structure db	2019-11-21 13:18:30 +01:00
Carlos Jimenez Ruiz	f4a62dfa86	Merge branch '1770-calculate_components' of verdnatura/salix into dev	2019-11-21 11:30:00 +00:00
Juan Ferrer	30ac174b1e	SQL grouping quoted	2019-11-21 12:01:21 +01:00
Joan Sanchez	fd72f206bc	Recalculate ticket components #1770	2019-11-21 12:00:56 +01:00
Carlos Jimenez Ruiz	c04640bd62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests	2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz	52a8d5e0c2	#1891 tests for worker time control function	2019-11-21 09:19:03 +01:00
Bernat	0473f1de82	#1711 Eliminar referencias al esquema vn2008	2019-11-21 09:09:17 +01:00
Bernat	525e115781	#1711 Eliminar referencias al esquema vn2008	2019-11-21 07:24:31 +01:00
Bernat	a1784470cc	update scheme db	2019-11-20 12:42:10 +01:00
Joan Sanchez	37618efb58	changed userPhone fkeys	2019-11-20 11:37:13 +01:00
Joan Sanchez	5bb7f7f14a	deprecated getItemVisibleAvailable() #1887	2019-11-20 11:14:11 +01:00
Juan Ferrer	c47f3137c1	Delivery days fixes	2019-11-19 13:49:10 +01:00
Joan Sanchez	e499d44018	dont use payMethodId on view #1854	2019-11-19 12:53:25 +01:00
Carlos Jimenez Ruiz	e74cb52867	Merge branch '1391-ticket_closure' of verdnatura/salix into dev ... LGTM	2019-11-19 07:02:12 +00:00
Joan Sanchez	06e4cbb783	renamed view atenderFk to	2019-11-19 07:41:02 +01:00
Juan Ferrer	bdb03729b7	zone_getOptionsForShipment fixes	2019-11-18 16:36:08 +01:00
Juan Ferrer	4d4e4f31f4	vnZoneEvents refactor	2019-11-18 16:31:37 +01:00
Joan Sanchez	8643030bf0	restructure router methods, added closure method	2019-11-18 15:04:51 +01:00
Javi Gallego	4b51d607f7	error getLanded con drop temporary table	2019-11-15 15:42:00 +01:00
Joan Sanchez	ddb19cb198	added event	2019-11-15 10:03:46 +01:00
Juan Ferrer	64124376f0	Final fixes	2019-11-14 14:37:18 +01:00
Javi Gallego	5da4722bdd	No borra warehouse de zone	2019-11-14 10:36:21 +01:00
Joan Sanchez	e0ed9072c9	unified LCR and CORE #1868	2019-11-14 08:16:52 +01:00
Joan Sanchez	236dcbf207	changed isRaid to isVirtual, atenderFk to attenderFk	2019-11-13 13:22:39 +01:00
Joan Sanchez	c3962c3d78	updated test	2019-11-12 15:07:37 +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	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Bernat	e8862b5b56	fix sql userPhone	2019-11-12 08:52:09 +01:00
Joan Sanchez	6cedfceddd	Show ticket state #1836	2019-11-11 13:51:30 +01:00
Javi Gallego	bd630aa562	ticketCalculateClon	2019-11-07 11:12:05 +01:00
Javi Gallego	eaa2ef4570	zone warehouse error	2019-11-07 07:49:37 +01:00
Javi Gallego	729f6cb767	changes to zone	2019-11-06 13:44:58 +01:00
Javi Gallego	03a4da307d	Tarea #1848 test back arreglados/comentados	2019-10-31 12:54:16 +01:00
Javi Gallego	700c092b90	merge	2019-10-29 12:58:26 +01:00
Javi Gallego	1a56f0af96	zoneRefactor	2019-10-29 12:29:38 +01:00
Bernat	cb90e86f64	#1846 exportar produccion a la local	2019-10-29 11:28:35 +01:00
Bernat	9fd0ab0bd3	#1775 travel.log crear sección historial	2019-10-25 13:28:12 +02:00
Bernat	7bdb497976	#1773 travel.summary & #1774	2019-10-24 12:49:18 +02:00
Bernat	7a89ab5335	#1778 Refactor worker.phone	2019-10-18 08:36:33 +02:00
Joan Sanchez	6ed5695063	Added zoneFk to routes. solved #1713	2019-10-16 07:18:05 +02:00
Bernat	25bd28990a	Refactor #1812 refactor phone	2019-10-15 14:44:00 +02:00
Joan Sanchez	eb655215f4	merge pull changes	2019-10-08 09:23:29 +02:00
Joan Sanchez	9473636b5b	treeview refactor	2019-10-02 09:54:52 +02:00
Joan Sanchez	183d770483	first changes	2019-10-01 15:09:55 +02:00
Juan Ferrer	60f611b76b	Merge branch 'test' into dev	2019-09-26 12:47:45 +02:00
Juan Ferrer	445668d57f	Refactor agency SQL scripts	2019-09-26 12:47:16 +02:00
Juan Ferrer	5262cd7e43	Merge branch 'test' into dev	2019-09-26 10:09:17 +02:00
Juan Ferrer	c0f39ba87f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 10:09:07 +02:00
Juan Ferrer	3d4b7601be	SQL scripts	2019-09-26 10:08:37 +02:00
Bernat	f28305de9b	Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk	2019-09-26 09:13:18 +02:00
Juan Ferrer	91e4e62a1c	Merge branch 'test' into dev	2019-09-26 08:44:00 +02:00
Bernat	bf5a9967cf	Refactor #1682 modificar modelos componentRate y componentTypeRate	2019-09-24 13:45:54 +02:00
Joan Sanchez	bd8a1ee00e	merge with dev	2019-09-23 15:02:27 +02:00
Joan Sanchez	6910e6048b	fixed sql	2019-09-23 14:50:30 +02:00
Joan Sanchez	f2d9323c4f	Deprecated ticketCalculate	2019-09-23 14:47:27 +02:00
Joan Sanchez	e55b8b7b6b	precio por kilo #1690	2019-09-23 14:41:54 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Bernat	40cfa19d01	bug claimDms	2019-09-16 12:51:51 +02:00
Bernat	a1e0da8905	Tarea #1689 exportat procedimientos a local desde produccion	2019-09-12 07:22:12 +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
Bernat	a2228fa15f	Tarea #1673 exportar estructura y datos de produccion a la local	2019-09-04 09:06:08 +02:00
Joan Sanchez	d3441fa1b3	Ticket step one refactor #1669	2019-09-04 08:04:31 +02:00
Carlos Jimenez Ruiz	e1b5b449ce	#1656 ticket.regularizar eliminar ticket	2019-09-03 09:57:53 +02:00
Joan Sanchez	67733e6e08	merge	2019-09-02 09:57:46 +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
Joan Sanchez	07519a4369	mege from test branch	2019-07-31 11:34:54 +02:00
Joan Sanchez	77d8ac82a5	contabilize worker.calenday holidays, updated styles	2019-07-31 09:51:08 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	2019-07-31 09:50:47 +02:00
Joan Sanchez	fb4ce77c01	claim upload pictures #1593	2019-07-30 08:51:38 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Joan Sanchez	6d5412227a	Changed invoiceOut pdf to hasPdf	2019-07-24 12:42:33 +02:00
Bernat	8089c32ec2	Tarea #1611 export db roduction to local	2019-07-23 14:56:57 +02:00
Bernat	97f2229090	Tarea #1603 ticket.index ticket.sales problems icon	2019-07-23 11:15:06 +02:00
Joan Sanchez	2c39103e93	fixed dms back unit tests	2019-07-17 07:45:43 +02:00
Joan Sanchez	a7b15c2dfc	fixed dms back unit tests	2019-07-16 14:48:48 +02:00
Joan Sanchez	6f3b023644	Create postcode form #1585	2019-07-08 14:07:09 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Joan Sanchez	507bc8c2ce	updated fonts & calendar acls	2019-06-27 11:48:33 +02:00
Joan Sanchez	8ff61a5d3a	added zone prices, radio-group and calendar refactor #1320	2019-06-26 13:35:38 +02:00
Bernat	13abed3d00	#1517 update ticketGetProblems	2019-06-25 15:02:25 +02:00
Joan Sanchez	9e03c5ff84	sql update dmsType codes	2019-06-17 09:15:31 +02:00
Bernat	4729a7e9a9	Bug #1514 route.volume No actualiza el volumen	2019-06-11 12:25:17 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz	e0cc80277c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-07 14:13:49 +02:00
Joan Sanchez	43e87a1cb1	mege from test to dev - no structure	2019-06-07 13:07:23 +02:00
Joan Sanchez	4545d1f649	merge from test to dev - no structure	2019-06-07 13:06:54 +02:00
Carlos Jimenez Ruiz	3ce4eafcee	merge	2019-06-07 09:24:27 +02:00
Carlos Jimenez Ruiz	777b0b3a38	#1400 report.sepaCore IBAN portugal	2019-06-07 09:18:54 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Bernat	3a338739d1	Tarea #1462 Route.descriptior Añadir menú - actualizar m3	2019-06-05 13:51:34 +02:00
Joan Sanchez	59a958841e	fixed nodeAdd	2019-06-05 07:37:29 +02:00
Joan Sanchez	b9b1c2b2c7	added sql schema prefix	2019-06-05 07:31:23 +02:00
Joan Sanchez	16d91d0999	fixed zoneNest add new country	2019-06-04 21:05:43 +02:00
Juan Ferrer	47c47435fa	webZone SQL fixes	2019-06-04 13:23:36 +02:00
Javi Gallego	78704995a2	comentarios de return	2019-06-04 12:20:33 +02:00
Juan Ferrer	50c25b42ce	SQL script moved to previous version	2019-06-04 09:23:50 +02:00
Juan Ferrer	5517ac265d	SQL webZone fixes	2019-06-04 09:14:42 +02:00
quique	a6a6ea5b06	WorkerTimerControl App	2019-06-03 09:41:54 +02:00
quique	8005b0a892	WorkerTimeControl App	2019-06-03 09:20:20 +02:00
Bernat	97459bd7e6	1497	2019-05-31 11:33:28 +02:00
Bernat	d4a3a1a72e	export production structure and fixtures updated	2019-05-30 13:45:13 +02:00
Javi Gallego	e01765e34e	test back-front fixed	2019-05-30 08:41:08 +02:00
Bernat	69434caa52	#1470 update fixtures, client.dms gestdoc	2019-05-28 11:26:54 +02:00
Carlos Jimenez Ruiz	46a7661975	#1454 update table bi.tarifa_componentes	2019-05-27 14:10:14 +02:00
Carlos Jimenez Ruiz	d041354210	#1454 update table bi.tarifa_componentes	2019-05-27 14:08:34 +02:00
Carlos Jimenez Ruiz	33f81ee4b7	#1472 update table vn2008.gesttip	2019-05-27 11:04:57 +02:00
Joan Sanchez	34542ce12f	message send ACL fix #1464	2019-05-23 11:39:14 +02:00
Bernat	ae2fa8d0af	1459 export production to local	2019-05-23 09:31:37 +02:00
Bernat	33b1cca215	#1456 update fixtures and add dms view	2019-05-22 12:09:15 +02:00
Carlos Jimenez Ruiz	66ddd56dec	removed string format from id field	2019-05-22 12:02:25 +02:00
Carlos Jimenez Ruiz	4c8aa7ff6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-22 11:59:14 +02:00
Carlos Jimenez Ruiz	e474abbc3a	ACL error fixed	2019-05-22 11:59:07 +02:00
Bernat	2636e2d221	#1454 update table bi.tarifa_componentes	2019-05-21 12:46:22 +02:00
Carlos Jimenez Ruiz	28057ecf3f	#1445 e2e ticket.services	2019-05-20 11:16:56 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Javi Gallego	0d0f354902	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-09 11:25:51 +02:00
Javi Gallego	ac5b17be31	ticket View	2019-05-09 11:25:46 +02:00
Bernat	1f128797c3	export production to local, fix test and add fixtures	2019-05-09 09:32:04 +02:00
Javi Gallego	4281181602	alter table ticket	2019-05-08 15:34:10 +02:00
Carlos Jimenez Ruiz	c9521d1024	#1407 email core francia LCR	2019-05-08 10:42:26 +02:00
Javi Gallego	810f4462f6	fixtures acl	2019-05-07 10:41:20 +02:00
Bernat	86e0d66f55	#926 update fixtures and model claimState	2019-05-07 08:18:14 +02:00
Bernat	91e8b1f81b	update fixtures, #1388 ticket descript change shiiped hour	2019-05-03 12:23:57 +02:00
Joan Sanchez	599f6b467e	fixed ticketConfig sql script	2019-05-01 19:23:05 +02:00
Joan Sanchez	2b7287dabb	added ticket.dms #1373	2019-05-01 18:49:39 +02:00
Joan Sanchez	1a524e33b1	regenerate invoiceOut ACL	2019-04-30 11:29:57 +02:00
Bernat	a81e705251	#1341 invoiceOut.descriptor book invoiceOut	2019-04-30 11:03:48 +02:00
Joan Sanchez	69403223d8	fixed treeview #1374	2019-04-29 11:49:43 +02:00
Bernat	ed8705a50c	#1340 invoiceOut.descriptor delete invoiceOut	2019-04-26 12:05:49 +02:00
Javi Gallego	a920bc1d8f	tablas dms	2019-04-25 18:30:11 +02:00
Javi Gallego	28bbc024b2	#1195 claim.action regularize	2019-04-16 08:09:16 +02:00
Joan Sanchez	45055034dc	invoiceOutMake in prod	2019-04-15 11:35:00 +02:00
Joan Sanchez	ac8a27d2f4	Added ticket invoice #1310	2019-04-12 13:54:31 +02:00
Bernat	c6203a0654	fix test ticketservice, update selectors and acl	2019-04-11 12:25:01 +02:00
Bernat	6d9fee06f6	new models and cau 10507	2019-04-11 11:44:34 +02:00
Javi Gallego	50d70f0f6f	Tarea #1259 crear modelo ticketServiceType	2019-04-10 14:44:41 +02:00
Bernat	ad830e52fc	update structure db from production	2019-04-05 09:20:22 +02:00
Gerard	cfdeb387a1	#1241 routes.tickets	2019-04-04 13:06:41 +02:00
Bernat	eaa3a36fde	update fixtures and structure	2019-04-04 09:02:39 +02:00
Carlos Jimenez Ruiz	09288c2c12	merge	2019-04-03 15:19:05 +02:00
Juan Ferrer	b7092d97d3	DB versioning fixes	2019-04-03 13:39:35 +02:00
Juan Ferrer	13ca2f7e52	DB versioning	2019-04-03 10:29:05 +02:00