 Juan Ferrer
|
26419e75c9
|
Style fixes
gitea/salix/test This commit looks good
Details
|
2019-02-22 16:15:54 +01:00 |
|
Juan Ferrer
|
961eb6edaf
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good
Details
|
2019-02-22 14:38:45 +01:00 |
|
Juan Ferrer
|
9fc6a2c4c2
|
Style fixes
|
2019-02-22 14:34:11 +01:00 |
Gerard
|
9370142731
|
styles fixed
gitea/salix/test This commit looks good
Details
|
2019-02-22 12:43:08 +01:00 |
|
Gerard
|
1e199e9d5a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
gitea/salix/test This commit looks good
Details
|
2019-02-21 12:58:05 +01:00 |
|
Gerard
|
6fb936a08a
|
ticket log disabled temporally
|
2019-02-21 12:57:19 +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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
Carlos Jimenez Ruiz
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
Carlos Jimenez Ruiz
|
fb4a4cd3de
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 08:19:44 +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
|
b0e22febd3
|
#1127 mover ticket.descriptor al modulo ticket
|
2019-02-12 09:03:56 +01:00 |