Carlos Jimenez Ruiz
|
050c5c1126
|
#1131 Refactor vn-icon a vn-icon-button en las templates.
|
2019-02-21 11:40:27 +01:00 |
Gerard
|
506c857b70
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 10:17:54 +01:00 |
|
Gerard
|
03e168739b
|
updated icons
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:17:13 +01:00 |
 Juan Ferrer
|
02569aeea4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:10:48 +01:00 |
|
Juan Ferrer
|
e42da544cd
|
Styles fixed
|
2019-02-21 10:10:38 +01:00 |
|
Gerard
|
ab6606a624
|
Merge branch 'test' into dev
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 10:07:27 +01:00 |
|
Gerard
|
8d6fdc4b2f
|
added envialia and solved problems with worker popover
gitea/salix/test This commit looks good
Details
|
2019-02-21 10:06:38 +01:00 |
 Joan Sanchez
|
c9746521dc
|
removed unused getSubTotal() method
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:44:03 +01:00 |
|
Joan Sanchez
|
06be535115
|
ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures
Details
|
2019-02-21 08:43:04 +01:00 |
|
Gerard
|
42cc2bde0d
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-21 07:48:31 +01:00 |
|
Gerard
|
444d531162
|
summary action now shows ticket id
gitea/salix/test This commit looks good
Details
|
2019-02-21 07:46:27 +01:00 |
|
Gerard
|
a651142fff
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 18:50:08 +01:00 |
|
Gerard
|
4b54b82a9d
|
#1150 descriptor popover intentar abrir con id movimiento
gitea/salix/test This commit looks good
Details
|
2019-02-20 18:46:30 +01:00 |
|
Gerard
|
a3dab9013c
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 17:53:10 +01:00 |
|
Gerard
|
0cca3bb9ce
|
#1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good
Details
|
2019-02-20 17:52:36 +01:00 |
|
Gerard
|
902b654f80
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 16:43:52 +01:00 |
|
Gerard
|
c95b2d71d4
|
tag not closed correctly fixed
gitea/salix/test This commit looks good
Details
|
2019-02-20 16:43:01 +01:00 |
|
Gerard
|
79cf4afb3e
|
#1116 loggable now works with transaction and log enabled on ticket module
gitea/salix/dev This commit has test failures
Details
|
2019-02-20 16:30:46 +01:00 |
|
Juan Ferrer
|
8c401b6921
|
Style fixes
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-20 14:38:41 +01:00 |
|
Juan Ferrer
|
752a703cdb
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-02-20 14:34:56 +01:00 |
|
Juan Ferrer
|
8f1e41e744
|
Style fixes
|
2019-02-20 14:34:16 +01:00 |
|
Joan Sanchez
|
646e6c7b46
|
Disabled delivery-note preview
gitea/salix/dev This commit looks good
Details
|
2019-02-20 13:26:31 +01:00 |
|
Joan Sanchez
|
90092a4f48
|
fixed treeview order
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:31:08 +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 |
|
Gerard
|
b97cb52abe
|
changed traduction of email
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:52:36 +01:00 |
|
Gerard
|
5d6951a610
|
deleted deprecated component
gitea/salix/dev There was a failure building this commit
Details
|
2019-02-20 11:41:06 +01:00 |
|
Gerard
|
efff9d2184
|
deleted duplicated data
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:36:55 +01:00 |
|
Gerard
|
0f5d1e55c0
|
item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:30:55 +01:00 |
|
Joan Sanchez
|
20843a9068
|
updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:59:39 +01:00 |
|
Joan Sanchez
|
40d765adc1
|
removed fi from worker module
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:16:19 +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 |
|
Gerard
|
a8a17b72bd
|
Merge remote-tracking branch 'origin/dev' into jgallego
|
2019-02-19 16:10:16 +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 |
|
Gerard
|
5ef524559e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-19 12:59:58 +01:00 |
|
Gerard
|
abfbf791f3
|
added one time bindings
|
2019-02-19 12:50:24 +01:00 |
|
Carlos Jimenez Ruiz
|
ff415dc654
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-19 12:14:27 +01:00 |
|
Gerard Miguel
|
12337d6bcf
|
Merge branch 'test' of gerard/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-19 10:42:40 +00:00 |
|
Gerard
|
280803f2ad
|
tests updated
gitea/salix/PR-11 This commit looks good
Details
gitea/salix/PR-12 This commit looks good
Details
|
2019-02-19 11:17:08 +01:00 |
|
Gerard
|
054cf21c1f
|
item index fixes
gitea/salix/PR-10 This commit has test failures
Details
|
2019-02-19 10:15:39 +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
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +01:00 |
|
Joan Sanchez
|
75053618a2
|
zoneLocation order
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:39:48 +01:00 |
|
Joan Sanchez
|
813d7368f3
|
fixed zoneLocation order
|
2019-02-18 13:37:36 +01:00 |
|
Javi Gallego
|
da4d961c8b
|
Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures
Details
|
2019-02-18 13:35:33 +01:00 |
|
Javi Gallego
|
a3e69d604a
|
getAvailable aislado
|
2019-02-18 13:31:57 +01:00 |
|
Joan Sanchez
|
0ea161ff19
|
fixed zoneLocation search
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:23:24 +01:00 |
|
Gerard
|
3adc035cab
|
#1121 worker.descriptor
|
2019-02-18 12:54:33 +01:00 |
|
Gerard
|
f5759f131b
|
#1145 item diary no va a la linea actual
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-18 09:50:46 +01:00 |
|
Gerard
|
13473e7bec
|
#1145 item diary no va a la linea actual
|
2019-02-18 09:50:09 +01:00 |
|
Joan Sanchez
|
5eb4eb2e79
|
Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-02-18 08:38:14 +01:00 |
|
Joan Sanchez
|
3b0d003322
|
treeview refactor & zone #1140
gitea/salix/dev This commit looks good
Details
|
2019-02-18 08:37:26 +01:00 |
|
Javi Gallego
|
58706b8694
|
backPreparado
gitea/salix/jgallego There was a failure building this commit
Details
|
2019-02-18 07:57:15 +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 |
|
Gerard
|
cb9e2284eb
|
styles, imports of titles and traductions added
|
2019-02-15 17:30:22 +01:00 |
|
Javi Gallego
|
2b4f5984cc
|
principio 1146
|
2019-02-15 16:04:24 +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 |
|
Gerard
|
8bed065f62
|
My team checkbox now has three states
|
2019-02-15 13:59:44 +01:00 |
|
Gerard
|
b01f401286
|
Merge branch 'dev' into jgallego
|
2019-02-15 13:33:24 +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
|
d6a8cd68d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:19:21 +01:00 |
|
Javi Gallego
|
8bea3afbfb
|
karma reparado
|
2019-02-15 13:13: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 |
|
Gerard
|
db6a5cfc3e
|
changed hide for on-hide binding
|
2019-02-14 20:18:10 +01:00 |
|
Gerard
|
1144a197a5
|
#1112 ticket.sale
|
2019-02-14 12:06:14 +01:00 |
|
Gerard
|
16f92ce646
|
changed Type traduction
|
2019-02-14 12:05:46 +01:00 |
|
Gerard
|
f7968ff15b
|
tests fixed
|
2019-02-14 11:41:06 +01:00 |
|
Gerard
|
9c439e9a92
|
added category to item search panel
|
2019-02-14 11:24:04 +01:00 |
|
Gerard
|
2a48e183e9
|
information added to the table
|
2019-02-14 09:59:54 +01:00 |
|
Juan Ferrer
|
f3e3c1bbae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 14:01:38 +01:00 |
|
Juan Ferrer
|
1f759b6b8c
|
Style fixes
|
2019-02-13 14:01:37 +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 |
|
Gerard
|
b93e2f5359
|
#1114 item.regularize
|
2019-02-13 09:49:41 +01:00 |
|
Gerard
|
5063bd8137
|
#1128 item.index
|
2019-02-13 09:27:11 +01:00 |
|
Carlos Jimenez Ruiz
|
fb4a4cd3de
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 08:19:44 +01:00 |
|
Joan Sanchez
|
7f96eae312
|
$applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072
|
2019-02-13 07:57:08 +01:00 |
|
Juan Ferrer
|
d65a6fd59e
|
Ticket summary fix: lines with no claim
|
2019-02-12 15:39:37 +01:00 |
|
Carlos Jimenez Ruiz
|
3a5b5096da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-12 14:40:22 +01:00 |
|
Carlos Jimenez Ruiz
|
9c0613e8e7
|
#1127
|
2019-02-12 14:40:13 +01:00 |
|
Gerard
|
5b50bbd5d0
|
Merge branch 'test' into dev
|
2019-02-12 14:36:24 +01:00 |
|
Gerard
|
208936f979
|
Merge branch 'master' into test
|
2019-02-12 14:29:45 +01:00 |
|
Gerard
|
41d950eaef
|
hotfix errors creting tickets
|
2019-02-12 14:23:04 +01:00 |
|
Carlos Jimenez Ruiz
|
8ef6db9017
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-12 13:33:21 +01:00 |
|
Joan Sanchez
|
108d9d4044
|
calculate swift on load #1132
|
2019-02-12 13:26:52 +01:00 |
|
Carlos Jimenez Ruiz
|
b0e22febd3
|
#1127 mover ticket.descriptor al modulo ticket
|
2019-02-12 09:03:56 +01:00 |
|
Joan Sanchez
|
604f75c84b
|
Show/send claim pickup order #1106
|
2019-02-12 07:42:19 +01:00 |
|
Carlos Jimenez Ruiz
|
82d59b544d
|
removed unused fdescribe
|
2019-02-11 15:01:12 +01:00 |
|
Joan Sanchez
|
58c95fac19
|
Merge branch 'test' into dev
|
2019-02-11 13:59:39 +01:00 |
|
Gerard
|
93aa94c5a0
|
fixed typo
|
2019-02-11 13:14:02 +01:00 |
|
Joan Sanchez
|
0a5860e59c
|
fixed agency descriptor & summary
|
2019-02-11 12:59:54 +01:00 |
|
Bernat
|
d994bd8e9d
|
#9783 update model and fixtures
|
2019-02-11 10:39:53 +01:00 |
|
Joan Sanchez
|
7365a1e001
|
updated delivery-note, fixed fallback locale
|
2019-02-11 10:06:26 +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 |
|
Javi Gallego
|
394a987a05
|
defaulter no muestra negativos
|
2019-02-08 09:37:11 +01:00 |
|
Gerard
|
8bef242a54
|
fixed lines icon not preventing event default
|
2019-02-07 09:33:54 +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 |
|
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 |
|
Joan Sanchez
|
35bd82c9cb
|
item summary fix & css report fixes
|
2019-02-06 10:53:12 +01:00 |
|
Gerard
|
6d54c860cd
|
#1029 ir a lineas pedido en ticket.index
|
2019-02-06 09:55:17 +01:00 |
|
Gerard
|
3b4126ee79
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-06 09:25:40 +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
|
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 |
|
Gerard
|
de654f270f
|
Merge branch 'test' into dev
|
2019-02-04 12:55:27 +01:00 |
|
Gerard
|
a19745a3e3
|
Merge branch 'master' into test
|
2019-02-04 12:52:58 +01:00 |
|
Gerard
|
3869742fd7
|
#1088 ticket.descriptor añadir polizon interval server error
|
2019-02-04 12:41:38 +01:00 |
|
Gerard
|
879c9b8877
|
#1093 ticket.descriptor ha dejado de funcionar en el modulo item
|
2019-02-04 12:24:47 +01:00 |
|
Joan Sanchez
|
af6a9d8022
|
fixed zone treeview bugs
|
2019-02-04 12:14:07 +01:00 |
|
Joan Sanchez
|
7986405a72
|
added sepa-core & letter-debtor
|
2019-02-04 10:10:57 +01:00 |
|
Juan Ferrer
|
84c0002cb1
|
Hot bugs fixed
|
2019-02-01 17:11:14 +01:00 |
|
Gerard
|
d648db504c
|
added card.reload and fixed remove stowaway not showing
|
2019-02-01 12:11:56 +01:00 |
|
Gerard
|
48aa29c4a3
|
updated stowaway icon
|
2019-02-01 11:42:31 +01:00 |
|
Juan Ferrer
|
3f08ab1b22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-01 11:06:39 +01:00 |
|
Carlos Jimenez Ruiz
|
2ac6342838
|
test fixed for fixtures dates
|
2019-02-01 09:43:30 +01:00 |
|
Juan Ferrer
|
e63e4319cd
|
Worker module fixes
|
2019-02-01 09:31:01 +01:00 |
|
Carlos Jimenez Ruiz
|
fd4205f9ab
|
#1069
|
2019-01-31 17:01:33 +01:00 |
|
Carlos Jimenez Ruiz
|
a288f9efd9
|
removed unused file
|
2019-01-31 15:06:12 +01:00 |
|
Carlos Jimenez Ruiz
|
8e6d38ab31
|
#1069 mostrar el nickname en los sitios donde aparezca nombre solo
|
2019-01-31 14:58:14 +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 |
|
Joan Sanchez
|
e74b7e3118
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-31 09:48:11 +01:00 |
|
Joan Sanchez
|
a49d937fd9
|
ita-tag validation error + home shortcuts
|
2019-01-31 09:47:52 +01:00 |
|
Bernat
|
0ca4881fdd
|
fix test
|
2019-01-31 09:12:45 +01:00 |
|
Bernat
|
19cfa1ab75
|
upadte structure db and models
|
2019-01-31 09:12:29 +01:00 |
|
Bernat
|
cd89550678
|
#9670 export acl fix test
|
2019-01-31 09:10:40 +01:00 |
|
Joan Sanchez
|
9cb97662d7
|
removed developer role from agency module
|
2019-01-31 07:20:36 +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
|
f27ca4ce3b
|
#1069 descriptor de claim
|
2019-01-30 16:03:29 +01:00 |
|
Carlos Jimenez Ruiz
|
f4e202dc62
|
#1069 index now show nicknames
|
2019-01-30 15:10:52 +01:00 |
|
Carlos Jimenez Ruiz
|
a48fa07cad
|
#1069 activeWrokersWithRole now returns the nickname
|
2019-01-30 14:27:35 +01:00 |
|
Juan Ferrer
|
259079b051
|
Translations fixed
|
2019-01-30 14:13:47 +01:00 |
|
Juan Ferrer
|
84737a0bb9
|
#997 worker.summary, bugs fixed
|
2019-01-30 13:32:25 +01:00 |
|
Gerard
|
21e30bcaef
|
#1064 quitar comprobación isTaxDataChecked
|
2019-01-30 08:46:05 +01:00 |
|
Gerard
|
b791195b89
|
#1068 claim.descriptor
|
2019-01-30 08:44:15 +01:00 |
|
Gerard
|
8aad79886c
|
fdescribe deleted
|
2019-01-30 08:28:09 +01:00 |
|
Joan Sanchez
|
c20a08e99b
|
updated clientSample with new reports uri #1001
|
2019-01-30 08:09:21 +01:00 |
|
Joan Sanchez
|
8d2f56a547
|
updated clientBillingData email test #1001
|
2019-01-30 07:18:33 +01:00 |
|
Juan Ferrer
|
7893c784aa
|
#997 worker summary
|
2019-01-29 21:45:43 +01:00 |
|
Juan Ferrer
|
e553d63492
|
#996 worker.descriptor
|
2019-01-29 21:00:27 +01:00 |
|
Juan Ferrer
|
d46575a072
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-29 16:38:11 +01:00 |
|
Juan Ferrer
|
f47fe9c1cc
|
#998 worker.index, back tests fixed
|
2019-01-29 16:37:59 +01:00 |
|
Joan Sanchez
|
c76bbb5a27
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-29 15:04:57 +01:00 |
|
Joan Sanchez
|
7537d35446
|
uncheck zones,removed treeview model #1066
|
2019-01-29 15:04:38 +01:00 |
|
Carlos Jimenez Ruiz
|
6f335a0753
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-29 14:46:30 +01:00 |
|
Carlos Jimenez Ruiz
|
8f7fd03d6e
|
#1035 ticket al borrar falta traduccion
|
2019-01-29 14:46:21 +01:00 |
|
Gerard
|
5db2783385
|
Merge branch 'test' into dev
|
2019-01-29 14:44:25 +01:00 |
|
Gerard
|
ef3930fdd7
|
Merge branch 'master' into test
|
2019-01-29 14:43:57 +01:00 |
|
Gerard
|
94f19c2cb5
|
#1073 item.tags no busca tags cuando se añade una linea nueva
|
2019-01-29 14:38:31 +01:00 |
|
Carlos Jimenez Ruiz
|
69a176a661
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-29 13:24:30 +01:00 |
|
Gerard
|
d4c6d28fec
|
Merge branch 'test' into dev
|
2019-01-29 11:23:42 +01:00 |
|
Gerard
|
036a75617a
|
Merge branch 'master' into test
|
2019-01-29 11:22:48 +01:00 |
|
Gerard
|
f6f1dba1d9
|
#1071 modificar update.claim para que no utilice updateAll
|
2019-01-29 11:14:01 +01:00 |
|
Carlos Jimenez Ruiz
|
fc450168c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-29 08:53:56 +01:00 |
|
Carlos Jimenez Ruiz
|
c04071366f
|
#1063 client.summary añadir explicaciones
|
2019-01-29 08:53:29 +01:00 |
|
Juan Ferrer
|
9209424bca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-28 16:24:56 +01:00 |
|
Juan Ferrer
|
3e40c651af
|
#998 worker.index
|
2019-01-28 16:24:45 +01:00 |
|
Joan Sanchez
|
0fcbc65ecc
|
plantilla claim-pickup #1044
|
2019-01-28 12:28:22 +01:00 |
|
Juan Ferrer
|
3bb42b1d7b
|
Project configuration fixed
|
2019-01-28 12:14:22 +01:00 |
|
Joan Sanchez
|
6495698308
|
treeview fixes #1015
|
2019-01-28 12:07:46 +01:00 |
|
Juan Ferrer
|
ce99ab64bd
|
#1058 Fixed
|
2019-01-28 10:04:08 +01:00 |
|
Juan Ferrer
|
18c7851fb7
|
Merge
|
2019-01-28 00:32:28 +01:00 |
|
Juan Ferrer
|
317102b612
|
Section titile in topbar, responsive
|
2019-01-28 00:26:01 +01:00 |
|
Carlos Jimenez Ruiz
|
7333cb4114
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-27 20:49:21 +01:00 |
|
Carlos Jimenez Ruiz
|
20bea9679c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-26 13:04:20 +01:00 |
|
Juan Ferrer
|
af5ab770ec
|
More cleaning, deps in routes.json, module autodetection
|
2019-01-26 02:30:46 +01:00 |
|
Joan Sanchez
|
8f07ac1751
|
print fixes & claim pickup order
|
2019-01-25 15:08:11 +01:00 |
|
Carlos Jimenez Ruiz
|
5b252fbc47
|
#1040 ticket.step2
|
2019-01-25 12:52:12 +01:00 |
|
Gerard
|
6e6b646978
|
#1022 ticket.create
|
2019-01-25 11:58:50 +01:00 |
|
Gerard
|
f4839cb642
|
#1022 ticket.create
|
2019-01-25 08:50:13 +01:00 |
|
Carlos Jimenez Ruiz
|
d6255bc997
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 16:05:37 +01:00 |
|
Juan Ferrer
|
e600a4b5b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 16:04:51 +01:00 |
|
Juan Ferrer
|
bfb2f7f533
|
#981 vnLeftMenu fixes
|
2019-01-24 16:04:38 +01:00 |
|
Carlos Jimenez Ruiz
|
18d7d07f56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 15:41:56 +01:00 |
|
Carlos Jimenez Ruiz
|
7096273800
|
#1045 ticket.datos basicos
|
2019-01-24 15:41:48 +01:00 |
|
Bernat
|
31dc2bd5e2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 14:15:16 +01:00 |
|
Carlos Jimenez Ruiz
|
6bfa39e0eb
|
#1030 ticket.index orden siempre por fecha ascencente
|
2019-01-24 13:50:57 +01:00 |
|
Bernat
|
b7aa8e97a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 12:37:43 +01:00 |
|
Juan Ferrer
|
637c61063b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 10:57:45 +01:00 |
|
Gerard
|
91b0484c74
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 10:04:20 +01:00 |
|
Gerard
|
8b17524432
|
changed salesperson definition
|
2019-01-24 10:04:18 +01:00 |
|
Juan Ferrer
|
1ccffd63a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 09:25:57 +01:00 |
|
Juan Ferrer
|
498ae5d4fe
|
Keybindings bugs fixed
|
2019-01-24 09:25:51 +01:00 |
|
Carlos Jimenez Ruiz
|
79ee9bb0da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-24 09:08:38 +01:00 |
|
Carlos Jimenez Ruiz
|
8cbde4c137
|
removed global variable serviceRoot
|
2019-01-24 09:08:28 +01:00 |
|
Gerard
|
e6ee15fc8d
|
console log removed
|
2019-01-24 08:25:48 +01:00 |
|
Gerard
|
bbb7fafed1
|
fixed default search on ticket index
|
2019-01-24 08:21:00 +01:00 |
|
Bernat
|
9ad703f625
|
update structure cau 9511 and fix test
|
2019-01-24 07:39:23 +01:00 |
|
Juan Ferrer
|
30749f0f4d
|
#981 Back & front tests passed, keybinds on it's own module routes.json
|
2019-01-23 17:49:28 +01:00 |
|
Gerard
|
288300db41
|
#1048 ticket.index quitar columnas
|
2019-01-23 16:51:39 +01:00 |
|
Gerard
|
23d26dec07
|
updated issue number
|
2019-01-23 16:32:17 +01:00 |
|
Gerard
|
649c09c551
|
#1025 item.create al crear articulo nuevo no busca tipo ni color
|
2019-01-23 15:06:11 +01:00 |
|
Gerard
|
cd28d559c4
|
#1026 ticket.line
|
2019-01-23 14:12:05 +01:00 |
|
Juan Ferrer
|
e080802445
|
#981 Login unified without passing tests
|
2019-01-23 13:11:44 +01:00 |
|
Gerard
|
61bd8740ce
|
modal-form class renamed
|
2019-01-23 12:46:45 +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 |
|
Gerard
|
e6213fb83f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-23 11:17:35 +01:00 |
|
Gerard
|
05ed72661e
|
test fixed
|
2019-01-23 11:17:18 +01:00 |
|
Joan Sanchez
|
5bf430400d
|
show results count #992
|
2019-01-23 11:08:27 +01:00 |
|
Gerard
|
9ebd7a2922
|
unwanted property deleted
|
2019-01-23 08:37:52 +01:00 |
|
Gerard
|
abea582014
|
#1017 ticket.index
|
2019-01-22 16:18:26 +01:00 |
|
Carlos Jimenez Ruiz
|
8f23b0b127
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-22 14:08:35 +01:00 |
|
Carlos Jimenez Ruiz
|
5f850e76e2
|
#884 e2e claim.detail + bug fixes en autocompleteSearch extension
|
2019-01-22 13:18:20 +01:00 |
|
Gerard
|
972f71552a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-22 12:24:31 +01:00 |
|
Gerard
|
b24f0a9442
|
#1023 claim.detail cantidad total parecer ser erronea
|
2019-01-22 12:24:19 +01:00 |
|
Joan Sanchez
|
166546564d
|
updated payment-update path Method
|
2019-01-22 11:30:25 +01:00 |
|
Gerard
|
471374f32d
|
excluded test due changes in mailer #79
|
2019-01-22 10:31:36 +01:00 |
|
Gerard
|
b0a60fc94a
|
#1023 claim.detail cantidad total parecer ser erronea
|
2019-01-22 10:31:12 +01:00 |
|
Gerard
|
457e68cd3c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-22 10:04:53 +01:00 |
|
Gerard
|
87a0a0bccc
|
#972 ticket.tracking
|
2019-01-22 10:04:42 +01:00 |
|
Joan Sanchez
|
4e83172dae
|
added print service part 1 #1001
|
2019-01-22 09:55:35 +01:00 |
|
Juan Ferrer
|
0f55512918
|
Style fixes
|
2019-01-21 16:08:25 +01:00 |
|
Juan Ferrer
|
d856a3ae97
|
Merge
|
2019-01-21 15:22:20 +01:00 |
|
Juan Ferrer
|
09811d322a
|
Descriptor style fixes
|
2019-01-21 15:21:24 +01:00 |
|
Bernat
|
643dcc3856
|
update model sip
|
2019-01-21 14:53:23 +01:00 |
|
Bernat
|
79a7447030
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-21 13:47:21 +01:00 |
|
Joan Sanchez
|
5a53195574
|
agency module
|
2019-01-21 11:45:53 +01:00 |
|
Bernat
|
c87fd81a62
|
new model sip and fixtures #9474
|
2019-01-21 11:35:37 +01:00 |
|
Joan Sanchez
|
1989232949
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-21 09:12:33 +01:00 |
|
Gerard
|
2a339185fc
|
stowaway fixes
|
2019-01-21 08:45:02 +01:00 |
|
Gerard
|
ea0504db21
|
stowaway fixes
|
2019-01-21 08:44:21 +01:00 |
|
Joan Sanchez
|
b73c02c595
|
client summary red color on negative balance #1007
|
2019-01-21 08:16:43 +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
|
97b2c23179
|
#952 Ticket.descriptor eliminar polizon
|
2019-01-18 13:37:26 +01:00 |
|
Gerard
|
345acc1353
|
#951 ticket.descriptor añadir polizon
|
2019-01-18 13:36:13 +01:00 |
|
Gerard
|
e9bc3f00a1
|
#954 ticket.descriptor añadir link a polizon
|
2019-01-18 13:34:50 +01:00 |
|
Joan Sanchez
|
fc7b4e4eda
|
changed item diary colors #990
|
2019-01-18 10:59:33 +01:00 |
|
Gerard
|
0c0a465784
|
descriptor not showing correctly fixed
|
2019-01-17 11:11:45 +01:00 |
|
Gerard
|
2b2fe69d0d
|
alert level not available fixed
|
2019-01-17 11:04:00 +01:00 |
|
Juan Ferrer
|
114c9ded7f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-16 15:48:26 +01:00 |
|
Javi Gallego
|
f7cf8cd656
|
Bug #976
|
2019-01-16 15:38:50 +01:00 |
|
Juan Ferrer
|
d02dc68c3e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-16 15:29:13 +01:00 |
|
Juan Ferrer
|
47b7596381
|
#938 Searchbar fixes
|
2019-01-16 15:29:01 +01:00 |
|
Gerard
|
175926d7fb
|
#965 claim.index colores
|
2019-01-16 15:05:35 +01:00 |
|
Gerard
|
542dd9f280
|
#973 order.action
|
2019-01-16 12:55:38 +01:00 |
|
Gerard
|
0fd1149c55
|
#975 ticket.summary
|
2019-01-16 12:43:18 +01:00 |
|
Gerard
|
ef7660162c
|
#966 loggable
|
2019-01-16 12:09:43 +01:00 |
|
Gerard
|
140e7b4f92
|
#968 ticket/servicios
|
2019-01-16 10:49:49 +01:00 |
Carlos Jimenez
|
f586a30a1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-16 08:53:05 +01:00 |
|
Carlos Jimenez
|
8ea3278a10
|
#875 e2e ticket create
|
2019-01-16 08:52:56 +01:00 |
|
Gerard
|
601295a170
|
#936 item.create
|
2019-01-16 08:46:40 +01:00 |
|
Gerard
|
13d9a57635
|
autocomplete not pointing to the correct endpoint fixed
|
2019-01-16 08:17:22 +01:00 |
|
Gerard
|
c0170628f4
|
autopcomplete not pointing to the right endpoint fixed
|
2019-01-16 08:11:28 +01:00 |
|
Gerard
|
3b5ea47848
|
bug not opening search panel solved
|
2019-01-15 14:53:38 +01:00 |
|
Javi Gallego
|
b60deafff1
|
actualiza fuentes a 1.19
|
2019-01-15 13:22:31 +01:00 |
|
Bernat
|
b4b630118a
|
merge
|
2019-01-15 12:38:07 +01:00 |
|
Bernat
|
bb8a9e2035
|
fix test and update fixtures #9153
|
2019-01-15 12:28:13 +01:00 |
|
Juan Ferrer
|
f402bb5afb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-15 12:17:47 +01:00 |
|
Juan Ferrer
|
9767ca7b71
|
#255 Download PDFs improvements
|
2019-01-15 12:17:33 +01:00 |
|
Gerard
|
7db288a8c5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-01-15 12:06:35 +01:00 |
|
Gerard
|
08a9233e8d
|
#964 claim bugs solved
|
2019-01-15 12:06:19 +01:00 |
|
Juan Ferrer
|
1c6fee22d2
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2019-01-15 12:04:45 +01:00 |