1126 Commits

Author	SHA1	Message	Date
Joan Sanchez	59c6952025	Implement watcher on ticket sales #1678	2019-09-05 09:00:55 +02:00
Joan Sanchez	0d21519523	updated transfer css	2019-09-04 14:37:29 +02:00
Joan Sanchez	db1113ab0b	added scrollbar to transfer popover	2019-09-04 14:08:08 +02:00
Joan Sanchez	81072ce7e8	fixed claim refund	2019-09-04 13:49:16 +02:00
Joan Sanchez	6f508838c9	claim.action falla el boton import #1679	2019-09-04 13:39:01 +02:00
Javi Gallego	2b14a9050e	Bug/Test #1679 claim.action falla el boton import	2019-09-04 12:17:33 +02:00
Joan Sanchez	93286663ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-04 09:41:27 +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	693c204e21	Calendar last day selection fixed #1465	2019-09-04 08:42:01 +02:00
Joan Sanchez	d3441fa1b3	Ticket step one refactor #1669	2019-09-04 08:04:31 +02:00
Bernat	f0447c18ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-03 14:54:29 +02:00
Carlos Jimenez Ruiz	c1cca30a26	bug fix icon add ticket.sales enables/disables	2019-09-03 14:42:52 +02:00
Bernat	fc872a2b21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-03 14:38:40 +02:00
Carlos Jimenez Ruiz	219614b44f	#1656 ticket.regularizar eliminar ticket + tests	2019-09-03 13:27:02 +02:00
Bernat	36d9d320c0	Tarea #1672 route.ticket	2019-09-03 10:54:52 +02:00
Carlos Jimenez Ruiz	e1b5b449ce	#1656 ticket.regularizar eliminar ticket	2019-09-03 09:57:53 +02:00
Joan Sanchez	7b40fe2942	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:37:30 +02:00
Joan Sanchez	d93974f481	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:36:54 +02:00
Joan Sanchez	50c989a267	Add attendedBy and salesPerson filters #1661	2019-09-02 12:23:49 +02:00
Joan Sanchez	37b9c5c4ce	Added zone inflation field #1641	2019-09-02 11:25:31 +02:00
Bernat	b6edcde589	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-02 09:43:30 +02:00
Bernat	2a21e9d60e	#1654	2019-09-02 09:43:22 +02:00
Joan Sanchez	8726aa70c5	removed autocompletion on change postal code #1638	2019-09-02 09:35:03 +02:00
Bernat	82c569cfc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-02 09:25:25 +02:00
Bernat	fb62128a80	Refactor #1652 client.addres.index	2019-09-02 09:25:18 +02:00
Joan Sanchez	e2b972431a	removed autocompletion on change postal code #1638	2019-09-02 09:11:40 +02:00
Carlos Jimenez Ruiz	8dbcf917a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-08-29 13:16:53 +02:00
Carlos Jimenez Ruiz	b9234fc1a8	#1642 order.summary en el descriptor	2019-08-29 13:16:38 +02:00
Bernat	b656db3a84	#1645 refactor search panel	2019-08-29 08:32:46 +02:00
Bernat	6daabed202	#1645 first part, delete hasVisible	2019-08-28 12:17:06 +02:00
Carlos Jimenez Ruiz	5e69fc0aa5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-08-28 08:10:49 +02:00
Carlos Jimenez Ruiz	5e3b8fe1f0	#1648 claim.detail add cambiar campos	2019-08-28 08:08:30 +02:00
Bernat	15097313a2	#1651 worker.json	2019-08-27 11:12:17 +02:00
Carlos Jimenez Ruiz	11b99d9a5f	#1618 e2e ticket.basicData.stepOne	2019-08-20 14:18:32 +02:00
Bernat	7eea9d1d2c	Refactor #1630 state.js	2019-08-19 07:56:20 +02:00
Bernat	4032bde243	fix bug ticket.sale	2019-08-13 14:03:02 +02:00
Bernat	d9c63e3bc0	Tarea #1501 ticket / delete	2019-08-13 12:44:34 +02:00
Bernat	b749cb80df	Bug/Test #1634 cesta.catalogo	2019-08-13 07:45:29 +02:00
Bernat	f05f3a3df7	Bug/Test #1634 cesta.catalogo	2019-08-12 14:58:46 +02:00
Bernat	d08a43bc23	#1630 state.isEditable	2019-08-12 13:28:27 +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
Bernat	8f519fd15b	Bug #900 Ticket.picture lineas vacias cuando no tiene tags	2019-08-07 09:58:05 +02:00
Bernat	fa4fd15450	Tarea #1573 order.catalog No deben de mostrar familias vacias	2019-08-07 07:27:00 +02:00
Bernat	7e1eba53f1	Refactor #1627 worker.timeControl	2019-08-06 12:25:53 +02:00
Joan Sanchez	72a02112b5	fixed fiscal data postcode selection	2019-08-06 12:12:51 +02:00
Joan Sanchez	3d88d41bd0	fixed fiscal data postcode selection	2019-08-06 12:07:48 +02:00
Joan Sanchez	e011c120db	ticket.sale split show active tickets	2019-08-06 07:37:30 +02:00
Joan Sanchez	e52a0ac5da	ticket.sale split show active tickets	2019-08-06 07:36:26 +02:00
Bernat	4e329a4201	Bug/Test #1607 ticket.updateDiscount and fix test	2019-08-02 12:24:08 +02:00
Joan Sanchez	2ff374e7ba	postcode autocompletion fixes	2019-08-02 08:28:44 +02:00
Joan Sanchez	2c71a983e3	postcode autocompletion fixes	2019-08-02 08:27:55 +02:00
Joan Sanchez	e7511aefdc	back errors fixed	2019-08-01 11:53:33 +02:00
Joan Sanchez	efeba38fb4	back errors fixed	2019-08-01 11:52:53 +02:00
Joan Sanchez	e3c4536183	timeControl calendar fixed #1623	2019-08-01 10:29:26 +02:00
Joan Sanchez	31b5f689df	timeControl calendar fixed #1623	2019-08-01 09:58:59 +02:00
Bernat	098dd7b235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-31 10:45:03 +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
Bernat	116a34d04a	fix test	2019-07-31 09:17:26 +02:00
Bernat	7571cd6e1b	Bug/Test #1607 ticket.updateDiscount and fix test	2019-07-31 07:46:24 +02:00
Joan Sanchez	5974f6e0c2	ticket basicData change zone on date update	2019-07-30 12:44:25 +02:00
Joan Sanchez	82d3ac27cf	ticket basicData change zone on date update	2019-07-30 12:43:21 +02:00
Joan Sanchez	fb4ce77c01	claim upload pictures #1593	2019-07-30 08:51:38 +02:00
Joan Sanchez	07af2271c2	ticket.weekly Add ticket #1612	2019-07-29 13:12:36 +02:00
Joan Sanchez	2c6ba0089b	merge	2019-07-29 08:35:58 +02:00
Joan Sanchez	f4a3b8e9b2	client.create not showing all postcodes, changed autocomplete #1619	2019-07-26 13:05:22 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz	c2573d6853	css amends for item-request	2019-07-25 11:25:01 +02:00
Carlos Jimenez Ruiz	e1cbf781e1	#1608 item.request	2019-07-25 09:55:09 +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
Bernat	16257e9918	fix test front	2019-07-23 07:36:10 +02:00
Bernat	6a23a5429c	Tarea #1562 ticket.line isEditable	2019-07-22 13:14:00 +02:00
Joan Sanchez	85049c126b	catalogFilter show items without color	2019-07-19 09:25:59 +02:00
Joan Sanchez	970c8ab5ec	show dms order number #1601	2019-07-19 08:13:52 +02:00
Joan Sanchez	51734db404	ticket dms local warehouse and company	2019-07-17 15:01:38 +02:00
Joan Sanchez	f56423bac9	disabled hasFile checkbox for dms edit forms	2019-07-17 10:55:58 +02:00
Joan Sanchez	c51c4383ce	fixed unit tests	2019-07-17 07:39:08 +02:00
Joan Sanchez	e99bae89b4	fixed e2e tests	2019-07-17 07:33:46 +02:00
Joan Sanchez	145e596d16	fixed dms unit tests	2019-07-16 14:12:58 +02:00
Joan Sanchez	89a3c399c1	merge with dev	2019-07-16 13:41:34 +02:00
Joan Sanchez	4f73d1eb5a	dms fixes	2019-07-16 13:37:25 +02:00
Joan Sanchez	3c3f4bfeae	address.edit fixed location autocompletion	2019-07-16 08:26:57 +02:00
Joan Sanchez	72fcf807b0	7z mimetype	2019-07-16 07:22:29 +02:00
Joan Sanchez	b85aa6d3da	fixed icons column size	2019-07-15 13:20:50 +02:00
Joan Sanchez	aa19e54a16	removed download file conditional	2019-07-15 11:56:46 +02:00
Joan Sanchez	dae49f52b6	removed download file conditional	2019-07-15 11:56:17 +02:00
Joan Sanchez	fefb389872	dms update files	2019-07-15 11:48:03 +02:00
Joan Sanchez	588250b1c1	dms update files	2019-07-15 11:40:11 +02:00
Joan Sanchez	88b698f3eb	merge with dev	2019-07-15 09:04:11 +02:00
Joan Sanchez	23f5ff0c5c	merge	2019-07-12 14:02:38 +02:00
Joan Sanchez	c21532e5f7	ticket.index filters	2019-07-12 14:00:32 +02:00
Joan Sanchez	eefa4b9f5b	apply default filters	2019-07-12 12:56:00 +02:00
Joan Sanchez	6b9286d1b0	fixed ticket.index	2019-07-12 12:32:02 +02:00
Joan Sanchez	c4fcaeb908	ticket.index filter by date if no filters were entered	2019-07-12 12:20:55 +02:00
Joan Sanchez	29744c52f3	fixed ticket.index	2019-07-12 11:43:10 +02:00
Joan Sanchez	e135ae039a	changed closure field	2019-07-12 09:42:06 +02:00
Joan Sanchez	25014654b1	changed closure field	2019-07-12 09:39:59 +02:00
Joan Sanchez	659a441f47	ticket index show zone closure hour	2019-07-12 09:29:22 +02:00
Joan Sanchez	6634cdf059	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 09:29:16 +02:00
Joan Sanchez	14a69e47c9	ticket index show zone closure hour	2019-07-12 09:06:19 +02:00
Joan Sanchez	18ca64a7d9	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:50:51 +02:00
Joan Sanchez	2a6de77e17	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:49:44 +02:00
Joan Sanchez	1b8a407916	show expeditions fix	2019-07-11 11:21:12 +02:00
Joan Sanchez	62ef2dccd8	show expeditions fix	2019-07-11 11:20:41 +02:00
Joan Sanchez	8ecc88b516	hide download button for dms without a file attached #1590	2019-07-11 09:54:42 +02:00
Joan Sanchez	3ce59c0b73	hide download button for dms without a file attached #1590	2019-07-11 09:53:16 +02:00
Joan Sanchez	cb23fd28fa	updated unit tests	2019-07-11 07:18:07 +02:00
Joan Sanchez	8a5e0c5402	Notify password changes #1588	2019-07-11 07:06:53 +02:00
Javi Gallego	f79b638e49	#1564 client.summary defaulting cantidad	2019-07-09 09:31:08 +02:00
Joan Sanchez	6f3b023644	Create postcode form #1585	2019-07-08 14:07:09 +02:00
Bernat	b98b534eec	Tarea #1583 exportar produccio a la local	2019-07-05 14:16:33 +02:00
Joan Sanchez	8ec61bf31f	fixed unit test for weekends	2019-07-05 11:18:08 +02:00
Bernat	061f0cb39c	Refactor #1581 client.balance.create	2019-07-04 10:34:19 +02:00
Carlos Jimenez Ruiz	fc80848506	merge	2019-07-03 14:40:53 +02:00
Carlos Jimenez Ruiz	ea5cbf634b	#1392 order.catalog	2019-07-03 14:39:08 +02:00
Bernat	82a1d00b0c	Tarea #1516 order.index buscador avanzado añadir mi equipo	2019-07-03 14:06:27 +02:00
Carlos Jimenez Ruiz	a35533687f	removed unused spec files	2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz	6b5acf5fe3	removed unused spec files	2019-07-03 11:51:42 +02:00
Carlos Jimenez Ruiz	553b8e681b	#1567 refactor logs - worker descriptor	2019-07-03 11:18:01 +02:00
Carlos Jimenez Ruiz	a2a9dfd7e5	#1567 refactor logs - worker descriptor	2019-07-03 11:08:44 +02:00
Bernat	65ec629221	Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse	2019-07-03 08:29:40 +02:00
Carlos Jimenez Ruiz	4b0a71644f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-02 14:44:39 +02:00
Carlos Jimenez Ruiz	4ac419b419	#1528 e2e claim/detail	2019-07-02 14:44:36 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Bernat	dd38a21e8d	Refactor #1569 claim.delete, update fixtures and fix test	2019-07-01 11:56:16 +02:00
Carlos Jimenez Ruiz	bd76840cb3	#1446 e2e ticket.summary	2019-06-27 15:33:15 +02:00
Bernat	fb2545994c	Refactor #1563 fixtures item	2019-06-27 12:38:30 +02:00
Joan Sanchez	507bc8c2ce	updated fonts & calendar acls	2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz	8c26a89516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-27 09:44:29 +02:00
Carlos Jimenez Ruiz	a7c5a9e598	#1566 ticket.sales state autocomplete	2019-06-27 09:44:19 +02:00
Bernat	e945967762	Refactor #1563 fixtures item,sale,saleComponent	2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz	5270693bdd	#1387 e2e Ticket Edit sale path	2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz	c352a12d49	merge	2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz	d27402d4e6	#1558 ticket.sales mark/unmark as reserved	2019-06-26 13:56:40 +02:00
Joan Sanchez	8ff61a5d3a	added zone prices, radio-group and calendar refactor #1320	2019-06-26 13:35:38 +02:00
Javi Gallego	b0c34f8e29	#1564 client.summary defaulting cantidad	2019-06-26 12:18:47 +02:00
Bernat	682a75ac76	#1533 update fixtures and fix test	2019-06-25 14:00:55 +02:00
Carlos Jimenez Ruiz	2ce442a022	#1555 ticket.lines transer to a new ticket	2019-06-25 11:17:58 +02:00
Bernat	1227f7ac83	Test #1549 Arreglar test de back	2019-06-21 13:19:51 +02:00
Bernat	5c152f8813	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-21 11:50:36 +02:00
Joan Sanchez	5d63a14b15	transactions refactor #1546	2019-06-21 10:00:00 +02:00
Joan Sanchez	340e7b8495	round worker calendar holidays #1547	2019-06-21 09:56:39 +02:00
Joan Sanchez	7c23f92957	round worker calendar holidays #1547	2019-06-21 09:54:42 +02:00
Joan Sanchez	dae43bb9b0	transactions refactor #1546	2019-06-21 08:26:59 +02:00
Bernat	7f2b61b39c	Test #1549 fix back test	2019-06-21 07:50:56 +02:00
Javi Gallego	289f588923	#1550 ticket.descriptor polizon cambia estado	2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz	7d0c42c077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-20 14:41:58 +02:00
Carlos Jimenez Ruiz	594268183b	#1517 ticket.index	2019-06-20 14:35:47 +02:00
Joan Sanchez	7fd6c850d7	lock controls #1533	2019-06-20 13:50:58 +02:00
Carlos Jimenez Ruiz	9162ef9c1e	#1517 ticket.index hot fix	2019-06-20 11:31:03 +02:00
Joan Sanchez	e45d95ac10	upload dms files into new folder structure #1548	2019-06-20 07:47:03 +02:00
Joan Sanchez	19dc0c80b8	upload dms files into new folder structure #1548	2019-06-20 07:46:30 +02:00
Carlos Jimenez Ruiz	6e029a3623	merged test fix	2019-06-19 15:30:04 +02:00
Carlos Jimenez Ruiz	73ccf9a107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz	560cce7c8c	#1537 refactor fixtures	2019-06-19 14:40:47 +02:00
Carlos Jimenez Ruiz	63febf8bd0	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
Bernat	1336bf092d	Test #1540 Reparar test back db	2019-06-19 07:20:02 +02:00
Bernat	c3f5b2c4dd	Bug/Test #1543 ticket.request.create precio con decimales	2019-06-18 12:09:43 +02:00
Bernat	82ab9e5ac5	Tarea #1534 Paginar consignatarios	2019-06-18 09:34:32 +02:00
Bernat	c02d576bb9	erese a fdescribe	2019-06-18 07:57:41 +02:00
Bernat	53f6db7a4a	Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice	2019-06-17 12:13:05 +02:00
Juan Ferrer	edfa112874	Merge with master	2019-06-17 11:33:34 +02:00
Juan Ferrer	da01d52756	Secret removed from worker/pbx	2019-06-17 11:14:45 +02:00
Joan Sanchez	3bd12492b0	updated karma unit test	2019-06-17 08:16:25 +02:00
Joan Sanchez	471da18a6c	optional bank entity code #1416	2019-06-17 08:14:48 +02:00
Carlos Jimenez Ruiz	fcc0ad6098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz	b8a4861f01	#1526 refactor fixtures	2019-06-14 12:27:41 +02:00
Bernat	5203c33483	Bug #1463 Las reclamaciones no se eliminan por completo	2019-06-14 09:29:23 +02:00
Juan Ferrer	ced4578f75	Merge branch 'test' into dev	2019-06-14 08:33:44 +02:00
Joan Sanchez	a9aaa3329a	fixed worker calendar	2019-06-14 08:17:12 +02:00
Joan Sanchez	9a18d0bd8c	fixed worker calendar	2019-06-14 08:15:14 +02:00
Carlos Jimenez Ruiz	a0f0230e76	#1437 unitarios back guessPriority	2019-06-13 14:31:55 +02:00
Joan Sanchez	32df2373f7	Order zone by hour	2019-06-13 13:49:07 +02:00
Joan Sanchez	9c00e7e67c	Autocomplete geolocation from postcode #1519 and #1531	2019-06-13 13:08:11 +02:00
Juan Ferrer	91174d1c8e	fdescribe removed, SQL refactor	2019-06-13 11:47:32 +02:00
Juan Ferrer	03205e01ae	NPM fix, fdescribe removed	2019-06-13 09:49:36 +02:00
Juan Ferrer	89a563eaf9	Merge	2019-06-13 09:21:36 +02:00
Juan Ferrer	58cc90929f	TX fixes, debug disabled, glob transaction timeout	2019-06-12 17:31:45 +02:00
Carlos Jimenez Ruiz	921af523f8	#1526 refactor fixtures	2019-06-12 11:38:31 +02:00
Bernat	a6951bc0a1	Tarea #1419 claim.detail permitir modificar descuento	2019-06-12 08:19:02 +02:00
Bernat	4729a7e9a9	Bug #1514 route.volume No actualiza el volumen	2019-06-11 12:25:17 +02:00
Bernat	5ce33fbefd	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:25:02 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz	a8b9e2c374	#1435 unitarios back hasActiveRecovery	2019-06-11 08:54:03 +02:00
Carlos Jimenez Ruiz	0c9b4bbe87	#1436 unitarios back invoiceOut/download	2019-06-11 07:06: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
Joan Sanchez	372ad15f26	zone add buttons show only for deliveryBoss #1480	2019-06-07 09:09:29 +02:00
Bernat	ea38ff221d	#1467 ticket filter with hours	2019-06-07 07:45:12 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Bernat	217b08cd0a	Tarea #1509 route/ticket/delete ticket	2019-06-06 13:50:12 +02:00
Carlos Jimenez Ruiz	7a44a5aab8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-06 09:48:46 +02:00
Carlos Jimenez Ruiz	cd6b60015f	#1486 back test updateDiscount	2019-06-06 09:48:08 +02:00
Bernat	f3558a2d26	#1462 updateVolume backTest	2019-06-06 09:34:45 +02:00