 Juan Ferrer
|
59fddb5c55
|
vnAgencyEvents: console.log removed
gitea/salix/dev This commit looks good
Details
|
2019-11-19 15:44:33 +01:00 |
 Carlos Jimenez Ruiz
|
19371fbb41
|
1772-campaign_metrics refactor
gitea/salix/1772-campaign_metrics This commit looks good
Details
|
2019-11-19 14:52:38 +01:00 |
|
Carlos Jimenez Ruiz
|
8d2cc56216
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-19 14:33:33 +01:00 |
|
Carlos Jimenez Ruiz
|
43c1c34cf3
|
#1888 nightmarejs extension
|
2019-11-19 14:33:25 +01:00 |
Bernat
|
2bfa0873a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:24 +01:00 |
|
Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:10 +01:00 |
|
Bernat
|
20088c6712
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 13:40:50 +01:00 |
|
Bernat
|
ee3a83ac0a
|
update structure and fixtures
|
2019-11-19 13:40:29 +01:00 |
 Joan Sanchez
|
615cfe15cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-11-19 13:07:21 +01:00 |
|
Joan Sanchez
|
e499d44018
|
dont use payMethodId on view #1854
gitea/salix/dev This commit looks good
Details
|
2019-11-19 12:53:25 +01:00 |
|
Bernat
|
b608273510
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-19 12:51:11 +01:00 |
|
Bernat
|
99585b9cc9
|
fix fixtures
|
2019-11-19 12:50:50 +01:00 |
|
Joan Sanchez
|
3d90e80c82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-19 11:53:04 +01:00 |
|
Joan Sanchez
|
f9deb9f52d
|
send closure error by email
|
2019-11-19 11:53:01 +01:00 |
|
Bernat
|
9743b61f63
|
delete endpoint getWorkerInfo
gitea/salix/dev Build queued...
Details
|
2019-11-19 11:51:47 +01:00 |
|
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-19 11:43:00 +01:00 |
|
Bernat
|
0b58b5d09a
|
update fixtures tblContadores
|
2019-11-19 11:40:46 +01:00 |
|
Joan Sanchez
|
ed5458a264
|
error handling fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 10:32:09 +01:00 |
|
Joan Sanchez
|
cba578d42e
|
fixed zoom photo url #1884
gitea/salix/dev This commit looks good
Details
|
2019-11-19 09:24:53 +01:00 |
|
Carlos Jimenez Ruiz
|
e74cb52867
|
Merge branch '1391-ticket_closure' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
LGTM
|
2019-11-19 07:02:12 +00:00 |
|
Joan Sanchez
|
06e4cbb783
|
renamed view atenderFk to
gitea/salix/dev This commit looks good
Details
|
2019-11-19 07:41:02 +01:00 |
|
Carlos Jimenez Ruiz
|
f5aacc804d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:46:51 +01:00 |
|
Carlos Jimenez Ruiz
|
f998a04808
|
#1852 worker.time-control
|
2019-11-18 16:37:33 +01:00 |
|
Carlos Jimenez Ruiz
|
eeead2cc86
|
corrected a typo
|
2019-11-18 16:37:03 +01:00 |
|
Juan Ferrer
|
bdb03729b7
|
zone_getOptionsForShipment fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:36:08 +01:00 |
|
Carlos Jimenez Ruiz
|
04b4f60c48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 16:35:21 +01:00 |
|
Juan Ferrer
|
4d4e4f31f4
|
vnZoneEvents refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:31:37 +01:00 |
 Javi Gallego
|
f12b1b8595
|
test fron arreglados
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:03:10 +01:00 |
|
Joan Sanchez
|
8643030bf0
|
restructure router methods, added closure method
gitea/salix/1391-ticket_closure This commit looks good
Details
|
2019-11-18 15:04:51 +01:00 |
|
Javi Gallego
|
60cdc1114c
|
#1602 back confirm.js
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-18 14:48:37 +01:00 |
|
Carlos Jimenez Ruiz
|
3c2ad2df48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 12:35:30 +01:00 |
|
Javi Gallego
|
c736e4de29
|
#1850 descomentar test back
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-18 12:32:50 +01:00 |
|
Carlos Jimenez Ruiz
|
7c199b5d74
|
#1852 worker.time-control
|
2019-11-18 11:00:09 +01:00 |
|
Javi Gallego
|
4b51d607f7
|
error getLanded con drop temporary table
gitea/salix/dev This commit looks good
Details
|
2019-11-15 15:42:00 +01:00 |
|
Joan Sanchez
|
e056184337
|
holidays fix #1853
gitea/salix/master This commit looks good
Details
|
2019-11-15 10:58:45 +01:00 |
|
Joan Sanchez
|
3e0b175b11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-11-15 10:46:10 +01:00 |
|
Joan Sanchez
|
c83a97d7ec
|
holidays fix #1853
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:44:11 +01:00 |
|
Carlos Jimenez Ruiz
|
d1b114de59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-15 10:37:42 +01:00 |
|
Joan Sanchez
|
ddb19cb198
|
added event
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:03:46 +01:00 |
|
Joan Sanchez
|
6e5f460fab
|
#1867 show warehouses on summary
gitea/salix/dev This commit looks good
Details
|
2019-11-15 07:35:51 +01:00 |
|
Juan Ferrer
|
6018414fa8
|
Merge branch '1838-searchbar_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-14 14:28:21 +00:00 |
|
Juan Ferrer
|
4f5c1404d7
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 15:24:08 +01:00 |
|
Juan Ferrer
|
a47dd521a4
|
Style fix
|
2019-11-14 15:05:56 +01:00 |
|
Juan Ferrer
|
09a187ecfe
|
Merge
|
2019-11-14 15:05:49 +01:00 |
|
Juan Ferrer
|
2621da8dce
|
Hour formating fix
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 14:40:19 +01:00 |
|
Juan Ferrer
|
64124376f0
|
Final fixes
|
2019-11-14 14:37:18 +01:00 |
|
Joan Sanchez
|
35565cc287
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-11-14 14:25:26 +01:00 |
|
Carlos Jimenez Ruiz
|
8629b72d55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-14 14:22:22 +01:00 |
|
Carlos Jimenez Ruiz
|
34bd35ce4e
|
#1852 worker.time-control
|
2019-11-14 14:20:05 +01:00 |
|
Joan Sanchez
|
c028233012
|
ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good
Details
|
2019-11-14 14:19:39 +01:00 |