5377 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	a19f9e003d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-09 14:17:54 +02:00
Carlos Jimenez Ruiz	6f83f03400	#1411 Componente leyenda de colores	2019-05-09 14:17:44 +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
Carlos Jimenez Ruiz	883f0c6b42	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-09 08:43:36 +02:00
Carlos Jimenez Ruiz	d1a195a8bb	#1407 francia LCR	2019-05-09 08:43:28 +02:00
Javi Gallego	4281181602	alter table ticket	2019-05-08 15:34:10 +02:00
Carlos Jimenez Ruiz	cd7c9506b2	#1404 client was undefined fixed	2019-05-08 12:19:08 +02:00
Carlos Jimenez Ruiz	189cefe327	#1407 email core francia LCR	2019-05-08 11:09:27 +02:00
Carlos Jimenez Ruiz	c9521d1024	#1407 email core francia LCR	2019-05-08 10:42:26 +02:00
Carlos Jimenez Ruiz	62550b76f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-08 08:48:57 +02:00
Carlos Jimenez Ruiz	92b171cfce	#1407 email core francia LCR	2019-05-08 08:48:47 +02:00
Joan Sanchez	f083dd1208	Merge commit 'cc781697073254f247402b2cf8849bc21cbef70e' into test	2019-05-08 07:16:31 +02:00
Carlos Jimenez Ruiz	4dfd927947	#1283 Informe core francia LCR	2019-05-07 13:40:31 +02:00
Bernat	e43b7be526	1397 client.descriptor change icon to icon-basketadd	2019-05-07 11:55:47 +02:00
Bernat	83898c9ba7	1354 refactor item-descriptor-popover	2019-05-07 11:32:35 +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
Joan Sanchez	8336db59d4	fixed sepa core preview for clients without mandate	2019-05-07 07:33:21 +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