 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
|
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 |
|
Juan Ferrer
|
4436acec10
|
Merge
|
2019-11-14 14:07:48 +01:00 |
|
Javi Gallego
|
8ac6e52045
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-14 13:40:57 +01:00 |
|
Javi Gallego
|
1301ea5962
|
test buyUltimateFromInterval arreglado
|
2019-11-14 13:40:53 +01:00 |
|
Joan Sanchez
|
6b4d7f0aeb
|
Added delivery-note french translation
gitea/salix/dev This commit looks good
Details
|
2019-11-14 11:51:46 +01:00 |
|
Joan Sanchez
|
5561ff169e
|
deprecated worker.sendMessage()
|
2019-11-14 11:21:08 +01:00 |
|
Joan Sanchez
|
5b2367bfc9
|
updated delivery-note translations
gitea/salix/dev This commit looks good
Details
|
2019-11-14 11:19:01 +01:00 |
|
Javi Gallego
|
136d1ef05f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-14 10:36:26 +01:00 |
|
Javi Gallego
|
5da4722bdd
|
No borra warehouse de zone
|
2019-11-14 10:36:21 +01:00 |
|
Joan Sanchez
|
f8c90832fd
|
Deprecated LCR
gitea/salix/dev This commit looks good
Details
|
2019-11-14 09:59:11 +01:00 |
|
Joan Sanchez
|
1bf114f4cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-11-14 08:53:34 +01:00 |
|
Joan Sanchez
|
d170f73662
|
Assign datasource props
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-14 08:53:10 +01:00 |
|
Joan Sanchez
|
f02a68cbd8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-11-14 08:17:58 +01:00 |
|
Joan Sanchez
|
e0ed9072c9
|
unified LCR and CORE #1868
gitea/salix/dev This commit looks good
Details
|
2019-11-14 08:16:52 +01:00 |
|
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good
Details
|
2019-11-13 13:22:39 +01:00 |
|
Carlos Jimenez Ruiz
|
d12f815c80
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 12:31:13 +01:00 |
|
Joan Sanchez
|
c166067888
|
updated tests & email compatibility with phone
gitea/salix/dev This commit looks good
Details
|
2019-11-13 12:18:30 +01:00 |
Bernat
|
dfd29ced70
|
1711 delete references
|
2019-11-13 11:04:52 +01:00 |
|
Carlos Jimenez Ruiz
|
d5dd45534a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 10:43:34 +01:00 |
|
Bernat
|
a3159f7dbd
|
dumped data updated
gitea/salix/dev This commit looks good
Details
|
2019-11-13 10:41:14 +01:00 |
|
Juan Ferrer
|
d8d6937093
|
Style fixes
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-13 09:35:25 +01:00 |
|
Carlos Jimenez Ruiz
|
b4669270c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 08:54:27 +01:00 |
|
Joan Sanchez
|
729b7e9412
|
Merge branch '1466-print_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
LGTM
|
2019-11-13 07:41:46 +00:00 |
|
Joan Sanchez
|
308c4dfb88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-13 08:09:54 +01:00 |
|
Joan Sanchez
|
603bb034a1
|
Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:56:09 +01:00 |
|
Carlos Jimenez Ruiz
|
65b84d752c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 07:51:06 +01:00 |
|
Joan Sanchez
|
7f2af116bc
|
updated translation
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:04:47 +01:00 |