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 |