 Joan Sanchez
|
9bf54f34dd
|
Added fruit translation
gitea/salix/dev This commit looks good
Details
|
2019-09-12 07:26:15 +02:00 |
|
Joan Sanchez
|
176750046a
|
Scroll component #643
gitea/salix/dev This commit looks good
Details
|
2019-09-05 13:06:40 +02:00 |
 Carlos Jimenez Ruiz
|
b9234fc1a8
|
#1642 order.summary en el descriptor
|
2019-08-29 13:16:38 +02:00 |
Bernat
|
b749cb80df
|
Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good
Details
|
2019-08-13 07:45:29 +02:00 |
|
Bernat
|
f05f3a3df7
|
Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good
Details
|
2019-08-12 14:58:46 +02:00 |
|
Joan Sanchez
|
a5486ec694
|
Get allowed content-types from model #1598
gitea/salix/dev This commit looks good
Details
|
2019-08-08 08:37:03 +02:00 |
|
Bernat
|
fa4fd15450
|
Tarea #1573 order.catalog No deben de mostrar familias vacias
|
2019-08-07 07:27:00 +02:00 |
|
Joan Sanchez
|
85049c126b
|
catalogFilter show items without color
gitea/salix/dev This commit looks good
Details
|
2019-07-19 09:25:59 +02:00 |
|
Carlos Jimenez Ruiz
|
fc80848506
|
merge
|
2019-07-03 14:40:53 +02:00 |
|
Carlos Jimenez Ruiz
|
ea5cbf634b
|
#1392 order.catalog
|
2019-07-03 14:39:08 +02:00 |
|
Bernat
|
82a1d00b0c
|
Tarea #1516 order.index buscador avanzado añadir mi equipo
gitea/salix/dev This commit looks good
Details
|
2019-07-03 14:06:27 +02:00 |
|
Joan Sanchez
|
bddfbc4b34
|
add new item from ticket.sale #1414, checkedLines fixed
|
2019-07-02 12:12:15 +02:00 |
|
Bernat
|
e945967762
|
Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:03:03 +02:00 |
|
Carlos Jimenez Ruiz
|
5270693bdd
|
#1387 e2e Ticket Edit sale path
gitea/salix/dev This commit looks good
Details
|
2019-06-26 15:27:58 +02:00 |
|
Carlos Jimenez Ruiz
|
fcc0ad6098
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-14 12:27:54 +02:00 |
|
Carlos Jimenez Ruiz
|
b8a4861f01
|
#1526 refactor fixtures
|
2019-06-14 12:27:41 +02:00 |
 Juan Ferrer
|
ced4578f75
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-14 08:33:44 +02:00 |
|
Juan Ferrer
|
91174d1c8e
|
fdescribe removed, SQL refactor
gitea/salix/master This commit looks good
Details
|
2019-06-13 11:47:32 +02:00 |
|
Carlos Jimenez Ruiz
|
921af523f8
|
#1526 refactor fixtures
|
2019-06-12 11:38:31 +02:00 |
|
Joan Sanchez
|
4545d1f649
|
merge from test to dev - no structure
|
2019-06-07 13:06:54 +02:00 |
|
Joan Sanchez
|
073c457abb
|
Merge branch 'test'
gitea/salix/master This commit looks good
Details
|
2019-06-05 08:56:56 +02:00 |
|
Bernat
|
798d4063ea
|
fix karma test
gitea/salix/dev This commit looks good
Details
|
2019-06-03 12:41:57 +02:00 |
|
Bernat
|
fa7b79b1c8
|
Bug/Test #1491, #1500 refactor new.js
gitea/salix/dev There was a failure building this commit
Details
|
2019-06-03 10:05:22 +02:00 |
 Javi Gallego
|
e01765e34e
|
test back-front fixed
gitea/salix/test This commit looks good
Details
|
2019-05-30 08:41:08 +02:00 |
|
Carlos Jimenez Ruiz
|
027602e18a
|
#1476 ticket.Sale check all checkbox
gitea/salix/dev This commit looks good
Details
|
2019-05-27 15:10:57 +02:00 |
|
Javi Gallego
|
3776e0588c
|
merge paso 1
|
2019-05-23 13:05:02 +02:00 |
|
Joan Sanchez
|
cc72432a37
|
accessType refactor #1460
gitea/salix/master This commit looks good
Details
|
2019-05-22 12:38:51 +02:00 |
|
Joan Sanchez
|
f73b42b0be
|
accessType refactor #1460
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:35:24 +02:00 |
|
Bernat
|
b86cf1d98a
|
1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good
Details
|
2019-05-17 07:34:25 +02:00 |
|
Carlos Jimenez Ruiz
|
ed14f94fd6
|
small amends
gitea/salix/dev This commit has test failures
Details
|
2019-05-15 08:33:27 +02:00 |
|
Joan Sanchez
|
5cc78ce5ac
|
ticket & order index fixes #1422 & #1423
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-05-14 08:14:37 +02:00 |
|
Joan Sanchez
|
790577acaf
|
ticket & order index fixes #1422 & #1423
gitea/salix/dev This commit has test failures
Details
|
2019-05-14 08:13:04 +02:00 |
|
Joan Sanchez
|
eae6a6f43c
|
show spinner on load for table & catalog components #1424
gitea/salix/dev This commit looks good
Details
|
2019-05-10 14:42:46 +02:00 |
|
Bernat
|
83898c9ba7
|
1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good
Details
|
2019-05-07 11:32:35 +02:00 |
|
Carlos Jimenez Ruiz
|
46756dfdcb
|
#1351 e2e order.catalog
|
2019-05-02 11:41:24 +02:00 |
|
Carlos Jimenez Ruiz
|
511e33b835
|
#1350 route.index worker descriptor + filters
|
2019-04-25 14:24:02 +02:00 |
|
Joan Sanchez
|
00c11a95c6
|
fixed catalog filter bugs #1352
gitea/salix/dev This commit looks good
Details
|
2019-04-24 09:21:24 +02:00 |
|
Joan Sanchez
|
76269a8a16
|
added drag & drop directives on worker department #1319
gitea/salix/dev This commit has test failures
Details
|
2019-04-23 08:29:23 +02:00 |
|
Bernat
|
54f65a9227
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-16 12:21:58 +02:00 |
|
Joan Sanchez
|
842101e239
|
fixed catalog price popover
gitea/salix/dev This commit looks good
Details
|
2019-04-16 12:11:06 +02:00 |
|
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
|
Bernat
|
dbe56b2496
|
#1330 add info in the search panel
gitea/salix/dev This commit has test failures
Details
|
2019-04-12 14:33:08 +02:00 |
Gerard
|
00b7442b89
|
#1247 reparar tests excluidos
gitea/salix/dev This commit looks good
Details
|
2019-04-05 07:52:08 +02:00 |
|
Joan Sanchez
|
8db51fdf64
|
added shrink class to item index #1278
gitea/salix/dev This commit looks good
Details
|
2019-03-29 08:01:15 +01:00 |
Bernat
|
4e27581045
|
cau 10269 fix test and update fixtures
gitea/salix/dev This commit looks good
Details
|
2019-03-27 08:44:15 +01:00 |
|
Joan Sanchez
|
2ca5def095
|
build english locale on dist directory #1268
gitea/salix/dev This commit looks good
Details
|
2019-03-26 12:05:53 +01:00 |
|
Joan Sanchez
|
3df5f4cae9
|
replaced numeric fields with input-number #1138
|
2019-03-26 07:29:45 +01:00 |
|
Joan Sanchez
|
4a4b997e1b
|
added subName to fetched-tags #1246
gitea/salix/dev This commit looks good
Details
|
2019-03-22 15:05:15 +01:00 |
|
Gerard
|
e23a184166
|
styles added
|
2019-03-22 11:56:21 +01:00 |
|
Bernat
|
981800a0e2
|
import production structure db to local and fix test
gitea/salix/dev This commit looks good
Details
|
2019-03-20 08:52:54 +01:00 |
Carlos Jimenez Ruiz
|
b165f0d06b
|
removed unexpected fdescribe
gitea/salix/dev There was a failure building this commit
Details
|
2019-03-14 08:29:35 +01:00 |
|
Joan Sanchez
|
12308de5d1
|
catalog filter by item id #1219
gitea/salix/dev This commit looks good
Details
|
2019-03-13 15:09:10 +01:00 |
|
Carlos Jimenez Ruiz
|
17654ef71e
|
#1183 Crear enlace a client summary en /order/descriptor
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:37:43 +01:00 |
|
Gerard
|
d6683918bb
|
#1165 Añadir al buscador avanzado de order la búsqueda por ticket
gitea/salix/dev This commit looks good
Details
|
2019-03-04 16:06:41 +01:00 |
|
Gerard
|
2f7c544c52
|
changed showfield of salesperson autocomplete
gitea/salix/dev This commit looks good
Details
|
2019-03-05 12:25:37 +01:00 |
|
Bernat
|
11c6fd2da7
|
Cau 8402 fix test and update structure
gitea/salix/dev This commit looks good
Details
|
2019-03-01 12:19:12 +01:00 |
|
Carlos Jimenez Ruiz
|
acbe9b8488
|
#1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good
Details
|
2019-03-01 11:50:26 +01:00 |
|
Gerard
|
7dd08dc6e5
|
merge test
gitea/salix/dev This commit looks good
Details
|
2019-02-28 10:19:31 +01:00 |
|
Joan Sanchez
|
4729dda5f6
|
isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good
Details
|
2019-02-28 08:55:34 +01:00 |
|
Gerard
|
9a7bd834df
|
date offset fixed
gitea/salix/test This commit looks good
Details
|
2019-02-27 17:04:32 +01:00 |
|
Gerard
|
87e8be0ede
|
time filter changed by dateTime
|
2019-02-27 17:04:00 +01:00 |
|
Carlos Jimenez Ruiz
|
048c5c2ad8
|
#1104 order.index mostar mas campos
gitea/salix/dev This commit looks good
Details
|
2019-02-27 12:03:54 +01:00 |
|
Juan Ferrer
|
c3f20dba3c
|
Small fix
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-02-22 17:23:03 +01:00 |
|
Juan Ferrer
|
26419e75c9
|
Style fixes
gitea/salix/test This commit looks good
Details
|
2019-02-22 16:15:54 +01:00 |
|
Juan Ferrer
|
9fc6a2c4c2
|
Style fixes
|
2019-02-22 14:34:11 +01:00 |
|
Gerard
|
c590dc6270
|
traduction added
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 14:08:32 +01:00 |
|
Carlos Jimenez Ruiz
|
413d2f2855
|
merge
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 11:53:19 +01:00 |
|
Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
|
Gerard
|
03e168739b
|
updated icons
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:17:13 +01:00 |
|
Gerard
|
23e08331fc
|
fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:12:16 +01:00 |
|
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 |