Carlos Jimenez Ruiz
|
50399ba325
|
merge
|
2019-02-06 16:10:18 +01:00 |
|
Carlos Jimenez Ruiz
|
8aed4013e1
|
#1051
|
2019-02-06 16:08:23 +01:00 |
 Javi Gallego
|
6e421d8442
|
Tarea #808 order.basic-data cr juan
|
2019-02-06 14:56:36 +01:00 |
|
Carlos Jimenez Ruiz
|
cdee2d21e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 14:19:31 +01:00 |
Gerard
|
ffea839250
|
fixed broken selector
|
2019-02-06 12:15:08 +01:00 |
|
Gerard
|
519350442f
|
#1057 modificar el component vn-user-configuration
|
2019-02-06 12:14:54 +01:00 |
|
Gerard
|
d714c34f59
|
#1049 ticket.sale
|
2019-02-06 11:42:22 +01:00 |
|
Gerard
|
9573c875e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 11:40:43 +01:00 |
|
Gerard
|
87b3032a4f
|
#1067 error en boton "Importar Reclamacion"
|
2019-02-06 11:39:22 +01:00 |
 Juan Ferrer
|
91d83bc132
|
Merge
|
2019-02-06 11:25: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 |
Bernat
|
fd9e14690c
|
#9751 update fixtures
|
2019-02-06 10:57:16 +01:00 |
 Joan Sanchez
|
35bd82c9cb
|
item summary fix & css report fixes
|
2019-02-06 10:53:12 +01:00 |
|
Gerard
|
c531d849a1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 09:55:20 +01:00 |
|
Gerard
|
6d54c860cd
|
#1029 ir a lineas pedido en ticket.index
|
2019-02-06 09:55:17 +01:00 |
|
Bernat
|
7b25a26a73
|
#9762 update structure db
|
2019-02-06 09:51:46 +01:00 |
|
Gerard
|
3b4126ee79
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 09:25:40 +01:00 |
|
Carlos Jimenez Ruiz
|
cf57d866ff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 09:13:02 +01:00 |
|
Carlos Jimenez Ruiz
|
b0420a8aac
|
#1051 selector updated
|
2019-02-06 09:12:58 +01:00 |
|
Javi Gallego
|
f9982047aa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 07:58:43 +01:00 |
|
Javi Gallego
|
60c5d3062f
|
expedition.json new externalId field
|
2019-02-06 07:56:10 +01:00 |
|
Gerard
|
391c5e42c0
|
#1101 ticket.index
|
2019-02-05 17:01:01 +01:00 |
|
Gerard
|
a605b8f9b7
|
#1065 item.last-entries
|
2019-02-05 16:53:55 +01:00 |
|
Gerard
|
f59d022da8
|
#1078 risk.create
|
2019-02-05 16:46:02 +01:00 |
|
Gerard
|
48bb876bea
|
Revert "#1012 claim.action"
This reverts commit 44893b57e7.
|
2019-02-05 16:42:28 +01:00 |
|
Gerard
|
44893b57e7
|
#1012 claim.action
|
2019-02-05 16:41:36 +01:00 |
|
Gerard
|
69edf3fc43
|
Merge branch 'master' into test
|
2019-02-05 12:24:34 +01:00 |
|
Gerard
|
d51ed26025
|
tracking edit not showing hotfix
|
2019-02-05 12:20:03 +01:00 |
|
Gerard
|
2e1b47b0c5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 11:44:12 +01:00 |
|
Gerard
|
8d714e655f
|
bug fixed
|
2019-02-05 11:44:08 +01:00 |
|
Joan Sanchez
|
391a092754
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 11:32:37 +01:00 |
|
Joan Sanchez
|
fa47c15d7a
|
catalog item type dropdown show limit #1041
|
2019-02-05 11:31:30 +01:00 |
|
Gerard
|
edd433561b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 11:25:50 +01:00 |
|
Gerard
|
a32ea66a15
|
#913 ticket-basic data step one
|
2019-02-05 11:25:47 +01:00 |
|
Joan Sanchez
|
4f2ca4af05
|
report sample
|
2019-02-05 11:11:05 +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 |
|
Bernat
|
b2dc6ce8c6
|
#9746 update structure db
|
2019-02-05 10:48:33 +01:00 |
|
Bernat
|
7ce54d223a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-05 09:49:52 +01:00 |
|
Bernat
|
2c9a10f277
|
update structure db #9764
|
2019-02-05 09:49:33 +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 |
|
Bernat
|
3a7413dda1
|
update acl
|
2019-02-05 08:44:56 +01:00 |
|
Joan Sanchez
|
333d853335
|
fixed print translations bug
|
2019-02-05 07:58:05 +01:00 |
|
Carlos Jimenez Ruiz
|
d463130515
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-04 15:41:06 +01:00 |
|
Carlos Jimenez Ruiz
|
ee62ecc843
|
#1051 task update plus e2e fixes
|
2019-02-04 15:40:57 +01:00 |