5113 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	c311b0ae65	dump y procedimientos volcados	2019-05-23 13:18:15 +02:00
Javi Gallego	94cc7af8b2	merge paso 2	2019-05-23 13:07:59 +02:00
Javi Gallego	3776e0588c	merge paso 1	2019-05-23 13:05:02 +02:00
Carlos Jimenez Ruiz	809f122f6f	#1427 Método rest para comprobar estado de backend	2019-05-15 13:51:59 +02:00
Joan Sanchez	5cc78ce5ac	ticket & order index fixes #1422 & #1423	2019-05-14 08:14:37 +02:00
Joan Sanchez	f083dd1208	Merge commit 'cc781697073254f247402b2cf8849bc21cbef70e' into test	2019-05-08 07:16:31 +02:00
Bernat	cc78169707	#1394 report Sepa Core translation	2019-05-06 15:04:38 +02:00
Joan Sanchez	8161ef2d7c	create zone with zero bonus, price, travelingDays	2019-05-06 07:41:28 +02:00
Joan Sanchez	4aff31a165	fixed update discount	2019-05-06 07:40:59 +02:00
Carlos Jimenez Ruiz	8771098045	#1350 route.index	2019-05-03 18:23:44 +02:00
Carlos Jimenez Ruiz	a578c84dba	#1350 route.index	2019-05-03 17:49:38 +02:00
Carlos Jimenez Ruiz	b60ee825ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-03 17:38:47 +02:00
Bernat	91e8b1f81b	update fixtures, #1388 ticket descript change shiiped hour	2019-05-03 12:23:57 +02:00
Carlos Jimenez Ruiz	28a69c8d2b	#1350 route.index	2019-05-02 13:25:41 +02:00
Carlos Jimenez Ruiz	46756dfdcb	#1351 e2e order.catalog	2019-05-02 11:41:24 +02:00
Carlos Jimenez Ruiz	8bfcdf435f	#1351 e2e order.catalog + extensions refactor	2019-05-02 11:23:54 +02:00
Joan Sanchez	273c9c1491	fixed translation	2019-05-02 10:41:18 +02:00
Joan Sanchez	0dbed4e102	fixed translation	2019-05-02 10:40:46 +02:00
Joan Sanchez	17cc9cc390	buy requests translation & default order	2019-05-02 10:04:57 +02:00
Joan Sanchez	a2fd8ddc8a	buy requests translation & default order	2019-05-02 10:04:02 +02:00
Joan Sanchez	9661040920	Merge branch 'dev' into test	2019-05-01 19:34:33 +02:00
Joan Sanchez	bad3200b21	renamed dmsTicket to ticketDms	2019-05-01 19:34:08 +02:00
Joan Sanchez	076ee2b558	fixed ticketConfig sql script	2019-05-01 19:23:33 +02:00
Joan Sanchez	599f6b467e	fixed ticketConfig sql script	2019-05-01 19:23:05 +02:00
Joan Sanchez	462abce981	Merge branch 'dev' into test	2019-05-01 18:57:25 +02:00
Joan Sanchez	2b7287dabb	added ticket.dms #1373	2019-05-01 18:49:39 +02:00
Joan Sanchez	3615fe36a8	removed template strings	2019-04-30 14:25:07 +02:00
Joan Sanchez	7f394ed671	merge	2019-04-30 11:49:16 +02:00
Bernat	c68015fb88	1341 invoiceOut.descriptor asentar factura	2019-04-30 11:47:39 +02:00
Joan Sanchez	94566b7ef4	fixed worker calendar error for local holidays	2019-04-30 11:44:24 +02:00
Joan Sanchez	c8bf9d0d7b	fixed worker calendar error for local holidays	2019-04-30 11:43:26 +02:00
Joan Sanchez	1a524e33b1	regenerate invoiceOut ACL	2019-04-30 11:29:57 +02:00
Joan Sanchez	1218551a8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-30 11:20:40 +02:00
Joan Sanchez	6db35d744d	multicheck checking all elements on pagination if checked	2019-04-30 11:20:37 +02:00
Bernat	a81e705251	#1341 invoiceOut.descriptor book invoiceOut	2019-04-30 11:03:48 +02:00
Joan Sanchez	6c3cea56aa	fixed multi-check karma unit tests	2019-04-30 09:19:40 +02:00
Joan Sanchez	a572130b6c	propagate check value to multicheck component for intermediate value #1305	2019-04-30 08:00:27 +02:00
Carlos Jimenez Ruiz	6b6faff383	#1386 e2e Item regularize path	2019-04-29 13:22:32 +02:00
Joan Sanchez	69403223d8	fixed treeview #1374	2019-04-29 11:49:43 +02:00
Bernat	a8a5193a86	1389 update fixtures for invoiceOut and fix test	2019-04-29 11:40:54 +02:00
Carlos Jimenez Ruiz	85dc6e51af	#1258 ticket.index sumatorio removed unused code	2019-04-29 10:35:46 +02:00
Carlos Jimenez Ruiz	774d8524cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-29 10:21:54 +02:00
Carlos Jimenez Ruiz	10669f01f3	#1258 ticket.index sumatorio unit test fixed	2019-04-29 10:21:36 +02:00
Bernat	5bc6f5107e	#1370 ticket.descriptor change shipped hour	2019-04-29 07:48:59 +02:00
Carlos Jimenez Ruiz	2ca85394f3	#1385 excluded tests	2019-04-26 16:10:51 +02:00
Carlos Jimenez Ruiz	b6a1e884df	#1383 Drop down selectors	2019-04-26 14:15:37 +02:00
Joan Sanchez	145a5e85eb	dropdown element name without translation	2019-04-26 12:41:30 +02:00
Juan Ferrer	0a37922b94	Nginx now logs original proxy src/dst hosts	2019-04-26 12:21:08 +02:00
Bernat	ed8705a50c	#1340 invoiceOut.descriptor delete invoiceOut	2019-04-26 12:05:49 +02:00
Joan Sanchez	16bf0b3448	regenerate invoice #1342	2019-04-26 08:52:43 +02:00