 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 |