Carlos Jimenez
|
f9bb1128a2
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-10-01 09:23:56 +02:00 |
 Joan Sanchez
|
1e604d92b4
|
Sale tracking get state from saleTracking instead of ticket. #695
|
2018-10-01 08:17:36 +02:00 |
|
Joan Sanchez
|
12824b1564
|
Added client web payment #673
|
2018-09-28 15:00:12 +02:00 |
|
Carlos Jimenez
|
146f3c8139
|
#685 PROCEDURE unit test vn.logAddWithUser
|
2018-09-28 13:55:21 +02:00 |
|
Carlos Jimenez
|
8ce2912344
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-09-28 13:52:18 +02:00 |
Bernat
|
1002b39694
|
refactor test #649
|
2018-09-28 08:43:00 +02:00 |
|
Carlos Jimenez
|
eaf902f28f
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-09-27 13:13:13 +02:00 |
|
Carlos Jimenez
|
0f2b19a4eb
|
typo correction
|
2018-09-27 13:13:02 +02:00 |
|
Bernat
|
7a0dad9db3
|
update fixtures add 2 clients
|
2018-09-27 13:04:45 +02:00 |
gerard
|
9405e49c8a
|
acl fixed
|
2018-09-27 12:58:19 +02:00 |
|
Bernat
|
46a62854d6
|
refactor test updateBillingData
|
2018-09-27 10:03:11 +02:00 |
|
Carlos Jimenez
|
504096d702
|
amends for #655 claim action
|
2018-09-27 09:50:31 +02:00 |
|
Joan Sanchez
|
07d5226169
|
Disabled route module
|
2018-09-27 08:55:59 +02:00 |
|
Joan Sanchez
|
a0c1388cf0
|
fixed billing data
|
2018-09-27 08:46:58 +02:00 |
|
gerard
|
a5e74335a9
|
Tarea #658 dialogo de añadir cantidad
|
2018-09-27 08:42:36 +02:00 |
|
Carlos Jimenez
|
7cfcede5ff
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-09-26 15:49:46 +02:00 |
|
Carlos Jimenez
|
b3a53fbe82
|
#686 PROCEDURE unit test vn.ticketCreateWithUser
|
2018-09-26 15:49:35 +02:00 |
|
Carlos Jimenez
|
79fc3bd7dc
|
#678 planificacion de tests db + small refactor on new.js
|
2018-09-26 15:48:33 +02:00 |
|
Joan Sanchez
|
0277130077
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-26 14:15:09 +02:00 |
|
Joan Sanchez
|
80cf804714
|
tooltip front test #492
|
2018-09-26 14:15:00 +02:00 |
|
Carlos Jimenez
|
0c9678ada8
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-09-26 11:19:40 +02:00 |
|
Carlos Jimenez
|
f84e11c5b5
|
#655 [FALTA PLANIFICACION] claim.action añadir acciones
|
2018-09-26 11:16:52 +02:00 |
|
Joan Sanchez
|
65edae7f83
|
fix route
|
2018-09-25 15:02:33 +02:00 |
|
Carlos Jimenez
|
9bc8687a85
|
Back end dependencies adjusted for #655
|
2018-09-25 14:39:08 +02:00 |
|
Carlos Jimenez
|
e1131c2c93
|
#655 [FALTA PLANIFICACION] claim.action añadir acciones Front Part
|
2018-09-25 14:37:35 +02:00 |
|
Carlos Jimenez
|
d40597deef
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-09-25 13:14:50 +02:00 |
|
Carlos Jimenez
|
fadaaae51a
|
task added to spec file
|
2018-09-25 13:12:03 +02:00 |
|
Joan Sanchez
|
cef2d91c9c
|
added build version for route caching & package fix #448
|
2018-09-25 11:44:21 +02:00 |
|
Joan Sanchez
|
0777eddf54
|
added zone summary #675
|
2018-09-25 09:28:55 +02:00 |
|
Bernat
|
20a4e1619f
|
update fixtures
|
2018-09-25 09:07:43 +02:00 |
|
Joan Sanchez
|
4388a6dbff
|
added Agency module
|
2018-09-25 08:53:57 +02:00 |
|
Bernat
|
7afa99f25d
|
add new models and update structure db
|
2018-09-25 08:47:11 +02:00 |
|
Joan Sanchez
|
cba9c2ca47
|
Removed default order #591
|
2018-09-24 15:04:13 +02:00 |
|
Joan Sanchez
|
bde7f64cea
|
drop drown like 'value%'
|
2018-09-24 15:03:17 +02:00 |
|
Joan Sanchez
|
5a5640143d
|
zone delivery days #668
|
2018-09-24 14:51:27 +02:00 |
|
Bernat
|
837af23497
|
update models agency and agencyMode and update fixtures
|
2018-09-24 12:57:21 +02:00 |
|
gerard
|
abaab3e34a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-24 12:13:11 +02:00 |
|
gerard
|
04a452bd82
|
action test updated
|
2018-09-24 12:12:36 +02:00 |
|
Bernat
|
79737fc508
|
update fixtures
|
2018-09-24 12:03:01 +02:00 |
|
Joan Sanchez
|
0b5a0754fd
|
searchbar with icons #371
|
2018-09-24 11:10:03 +02:00 |
|
Joan Sanchez
|
564370180c
|
zone basic data
|
2018-09-24 10:43:54 +02:00 |
|
Bernat
|
6fc85b0e5a
|
refactor fixtures, and fix / refactor test
|
2018-09-21 15:01:51 +02:00 |
|
Joan Sanchez
|
9c1197b68f
|
updated qlabel download link
|
2018-09-21 12:36:11 +02:00 |
|
Joan Sanchez
|
fec2134b8f
|
added zone descriptor #669
|
2018-09-21 12:35:54 +02:00 |
|
Bernat
|
2cd2c6bdae
|
update model agency
|
2018-09-21 07:28:26 +02:00 |
|
Bernat
|
6b64b2b419
|
update structure db
|
2018-09-20 12:57:17 +02:00 |
 Javi Gallego
|
03c6aef542
|
arreglo bug en createFromSales backTest
|
2018-09-20 07:49:38 +02:00 |
|
Joan Sanchez
|
bd6bebaf49
|
translation fix
|
2018-09-20 07:24:05 +02:00 |
|
Joan Sanchez
|
d5ca385ccd
|
added zone index & zone create
|
2018-09-19 15:05:07 +02:00 |
|
gerard
|
fd08bb96dd
|
fdescribe deleted
|
2018-09-19 13:18:23 +02:00 |