Carlos Jimenez Ruiz
|
250bb359e1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-19 18:00:07 +01:00 |
|
Carlos Jimenez Ruiz
|
7d2bc25c95
|
#1142 order.line total
|
2019-02-19 17:55:19 +01:00 |
Gerard
|
927957aed8
|
Merge remote-tracking branch 'upstream/dev' into jgallego
|
2019-02-19 16:12:01 +01:00 |
|
Gerard
|
e041cef586
|
vn-empty-rows deleted as its not longer needed
|
2019-02-19 16:11:57 +01:00 |
 Joan Sanchez
|
d11a51b3f1
|
added color filter #1041
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:13:27 +01:00 |
|
Gerard
|
b7db5f969b
|
fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:09:50 +01:00 |
 Javi Gallego
|
a0cf617cca
|
#498 e2e arreglado
gitea/salix/jgallego This commit looks good
Details
|
2019-02-19 08:42:36 +01:00 |
|
Carlos Jimenez Ruiz
|
4186fbacb3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-16 17:15:03 +01:00 |
|
Joan Sanchez
|
42e3fede23
|
fixed ng-repeat transition
|
2019-02-15 17:33:03 +01:00 |
|
Carlos Jimenez Ruiz
|
b034a8fab7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 15:33:11 +01:00 |
|
Javi Gallego
|
32cc39ad00
|
order.json regularizados campos addressFk, agencyModeFk
|
2019-02-15 13:26:49 +01:00 |
|
Javi Gallego
|
7f7f47d861
|
bug no results duplicado
|
2019-02-15 13:25:23 +01:00 |
|
Carlos Jimenez Ruiz
|
3ab0b2eb19
|
merge
|
2019-02-15 12:43:18 +01:00 |
|
Carlos Jimenez Ruiz
|
92a645f395
|
#1122 + worker descriptor popover + small refactors for worker.nickname
|
2019-02-15 12:39:21 +01:00 |
|
Gerard
|
4f851c9eed
|
#1111 poder buscar pedidos confirmados o sin confirmar
|
2019-02-15 11:05:14 +01:00 |
|
Gerard
|
90a4e5a7d1
|
#1144 fixed bugs with $destroy
|
2019-02-15 11:03:27 +01:00 |
Bernat
|
df452ff345
|
merge
|
2019-02-13 13:28:02 +01:00 |
|
Bernat
|
bbd4188695
|
#9848 fix test and update fixtures
|
2019-02-13 13:19:15 +01:00 |
|
Joan Sanchez
|
7f96eae312
|
$applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072
|
2019-02-13 07:57:08 +01:00 |
|
Gerard
|
5187a7e15b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-11 09:02:26 +01:00 |
|
Gerard
|
b38aa57894
|
order line not redirecting correctly to ticket index fixed
|
2019-02-11 09:02:09 +01:00 |
 Juan Ferrer
|
c0dd1624f6
|
Table style
|
2019-02-10 22:52:35 +01:00 |
|
Juan Ferrer
|
20382b2b14
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-08 17:49:53 +01:00 |
|
Juan Ferrer
|
f52d306db4
|
Color style unified
|
2019-02-08 17:49:51 +01:00 |
|
Gerard
|
0aefe73379
|
#1032 order.index buscador avanzado no se puede buscar a carlos lopez
|
2019-02-08 15:07:18 +01:00 |
|
Gerard
|
b7f8a642be
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 16:38:14 +01:00 |
|
Gerard
|
171716806a
|
#1096 back validaciones crear ticket
|
2019-02-06 16:37:59 +01:00 |
|
Javi Gallego
|
6e421d8442
|
Tarea #808 order.basic-data cr juan
|
2019-02-06 14:56:36 +01:00 |
|
Juan Ferrer
|
2bf9244770
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 11:24:31 +01:00 |
|
Juan Ferrer
|
03406a7d9b
|
Style fixes
|
2019-02-06 11:24:29 +01:00 |
|
Joan Sanchez
|
fa47c15d7a
|
catalog item type dropdown show limit #1041
|
2019-02-05 11:31:30 +01:00 |
|
Joan Sanchez
|
353dc38e48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 11:08:04 +01:00 |
|
Juan Ferrer
|
1355fb80e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 09:47:45 +01:00 |
|
Gerard
|
8f575fbc45
|
strings added to the locale
|
2019-02-05 09:37:01 +01:00 |
|
Gerard
|
6c2fe1d4a3
|
#1036 order.line
|
2019-02-05 09:27:01 +01:00 |
|
Joan Sanchez
|
d87e2dbbf0
|
fixed order item category filter #1079
|
2019-02-05 09:21:29 +01:00 |
|
Juan Ferrer
|
8f72fbad23
|
Merge
|
2019-02-05 09:14:22 +01:00 |
|
Juan Ferrer
|
1dbb75a1b8
|
vnSideMenu, vnBackground, style fixes
|
2019-02-05 09:13:15 +01:00 |
|
Joan Sanchez
|
bce67487c1
|
catalog filter requery fix #1034
|
2019-02-04 15:21:10 +01:00 |
|
Juan Ferrer
|
84c0002cb1
|
Hot bugs fixed
|
2019-02-01 17:11:14 +01:00 |
|
Carlos Jimenez Ruiz
|
a288f9efd9
|
removed unused file
|
2019-01-31 15:06:12 +01:00 |
|
Carlos Jimenez Ruiz
|
d109e480a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 14:14:52 +01:00 |
|
Carlos Jimenez Ruiz
|
00ccf9a4a0
|
#1069 mostrar el nickname en los sitios donde aparezca nombre solo
|
2019-01-31 14:14:39 +01:00 |
|
Joan Sanchez
|
1bcaf27563
|
changed currency filter, fixed tag value errors
|
2019-01-31 11:44:03 +01:00 |
|
Gerard
|
aac96f4b87
|
#1080 fallos de estilos en order prices-popover
|
2019-01-31 11:26:03 +01:00 |
|
Juan Ferrer
|
f643261a85
|
Styles fixed, change language moved to user config popover
|
2019-01-31 00:33:43 +01:00 |
|
Juan Ferrer
|
1dc8cafc73
|
Style & translation fixes
|
2019-01-30 23:47:06 +01:00 |
|
Carlos Jimenez Ruiz
|
f4e202dc62
|
#1069 index now show nicknames
|
2019-01-30 15:10:52 +01:00 |
|
Juan Ferrer
|
259079b051
|
Translations fixed
|
2019-01-30 14:13:47 +01:00 |
|
Gerard
|
21e30bcaef
|
#1064 quitar comprobación isTaxDataChecked
|
2019-01-30 08:46:05 +01:00 |
|
Juan Ferrer
|
3e40c651af
|
#998 worker.index
|
2019-01-28 16:24:45 +01:00 |
|
Juan Ferrer
|
ce99ab64bd
|
#1058 Fixed
|
2019-01-28 10:04:08 +01:00 |
|
Juan Ferrer
|
317102b612
|
Section titile in topbar, responsive
|
2019-01-28 00:26:01 +01:00 |
|
Juan Ferrer
|
af5ab770ec
|
More cleaning, deps in routes.json, module autodetection
|
2019-01-26 02:30:46 +01:00 |
|
Carlos Jimenez Ruiz
|
8cbde4c137
|
removed global variable serviceRoot
|
2019-01-24 09:08:28 +01:00 |
|
Gerard
|
05933781dc
|
#1031 order.create que se puedan crear tickets para clientes con riesgo
|
2019-01-23 12:34:42 +01:00 |
|
Gerard
|
aeb0f65fec
|
#1037 order.descriptor
|
2019-01-23 12:30:32 +01:00 |
|
Joan Sanchez
|
5bf430400d
|
show results count #992
|
2019-01-23 11:08:27 +01:00 |
|
Carlos Jimenez Ruiz
|
5f850e76e2
|
#884 e2e claim.detail + bug fixes en autocompleteSearch extension
|
2019-01-22 13:18:20 +01:00 |
|
Juan Ferrer
|
09811d322a
|
Descriptor style fixes
|
2019-01-21 15:21:24 +01:00 |
|
Juan Ferrer
|
6e43b11e16
|
Left menu fixed
|
2019-01-20 18:48:03 +01:00 |
|
Juan Ferrer
|
2df9579f2c
|
Summary style fixes
|
2019-01-20 16:47:04 +01:00 |
|
Joan Sanchez
|
9cb298fb08
|
modules summary were not updating view data #978
|
2019-01-18 14:04:12 +01:00 |
|
Gerard
|
cb650bbdbc
|
added missing locale
|
2019-01-18 13:38:18 +01:00 |
|
Gerard
|
32743cb1d2
|
updated description
|
2019-01-18 13:37:48 +01:00 |
|
Gerard
|
0c0a465784
|
descriptor not showing correctly fixed
|
2019-01-17 11:11:45 +01:00 |
|
Gerard
|
60c368baa2
|
fixed typo
|
2019-01-14 15:04:30 +01:00 |
|
Gerard
|
a32b1ba71e
|
temporally excluded test
|
2019-01-14 15:03:51 +01:00 |
|
Gerard
|
80fbd14c78
|
test temporally excluded
|
2019-01-14 15:01:35 +01:00 |
|
Gerard
|
8633f76017
|
fdescribe deleted
|
2019-01-14 14:59:50 +01:00 |
|
Gerard
|
8d0366e7bf
|
test fixed
|
2019-01-14 14:59:14 +01:00 |
|
Gerard
|
1d5cd1c86d
|
#960 order.line bugs solved
|
2019-01-14 11:35:48 +01:00 |
|
Bernat
|
f7244cc22b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-11 12:26:06 +01:00 |
|
Bernat
|
f678bfea37
|
exportDB step 3
|
2019-01-11 12:25:53 +01:00 |
|
Gerard
|
100871edf6
|
clients autocompletes now order by id
|
2019-01-11 08:03:36 +01:00 |
|
Gerard
|
7f745de314
|
#927 order.basic-data
|
2019-01-07 16:53:34 +01:00 |
|
Gerard
|
007516b0cb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-07 16:28:24 +01:00 |
|
Gerard
|
650becf455
|
#945 en salix no se pueden modificar los consignatarios antiguos
|
2019-01-07 16:28:18 +01:00 |
Joan
|
6cffc0f633
|
fixed order catalog item category
|
2019-01-07 15:08:05 +01:00 |
|
Juan Ferrer
|
9cdfe0c5d9
|
#814 First stable version
|
2018-12-27 12:54:16 +01:00 |
|
Juan Ferrer
|
f2fc5b6b2b
|
#841 Client modules mixed with service modules
|
2018-12-22 11:59:26 +01:00 |
|
Juan Ferrer
|
97e0b33d0d
|
#814 Service modules moved to project root, models reclassified
|
2018-12-21 20:22:13 +01:00 |