gerard
|
9e39c28b51
|
Translations updated
|
2018-08-02 11:06:30 +02:00 |
|
gerard
|
71a559783c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-02 10:54:08 +02:00 |
|
gerard
|
49ea108771
|
Bug #571 usuario con privilegios cambia el estado de un ticket bloqueado
|
2018-08-02 10:54:03 +02:00 |
 Joan Sanchez
|
ff0f0436af
|
Fixed locales: client & back-end validations, back-end UserError. #464
|
2018-08-02 09:49:00 +02:00 |
Bernat
|
bde19ffdc8
|
update fixtures, fix problems with item Visible and Available
|
2018-08-01 19:33:22 +02:00 |
Carlos Jimenez
|
d8fb0b2d95
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-01 14:01:59 +02:00 |
|
Carlos Jimenez
|
d799ac8100
|
renamed spec files accordingly plus linter and indentation corrections
|
2018-08-01 14:01:42 +02:00 |
|
Bernat
|
0c6ae08d4a
|
change idWorker from to users and fix back unit test
|
2018-08-01 13:24:38 +02:00 |
|
Bernat
|
0447d2f521
|
update fixtures
|
2018-07-31 15:03:53 +02:00 |
|
Carlos Jimenez
|
5aae572566
|
renamed spec files plus fixtures update for ticket basicdata #462 e2e
|
2018-07-31 13:49:54 +02:00 |
|
Joan Sanchez
|
4103f7fcf6
|
Added sample create #440
|
2018-07-31 11:08:22 +02:00 |
|
Bernat
|
81c6546e96
|
update fixtures
|
2018-07-30 20:45:26 +02:00 |
|
Bernat
|
8e1ef327c2
|
add model ClaimDevelopment
|
2018-07-30 20:16:25 +02:00 |
|
Bernat
|
c3956b2354
|
add model ClaimDevelopment
|
2018-07-30 15:41:02 +02:00 |
|
Bernat
|
1ec3777f4a
|
update fixtures and fix test
|
2018-07-30 15:21:12 +02:00 |
|
Bernat
|
23b7e5a0cc
|
update fixtures and add new models for claim module
|
2018-07-30 14:10:09 +02:00 |
|
gerard
|
97cbb4fb25
|
Iban validation for french clients desactivated
|
2018-07-27 15:13:01 +02:00 |
|
Joan Sanchez
|
23993ce717
|
updated model sample & clientSample
|
2018-07-27 11:18:27 +02:00 |
|
Bernat
|
4e2ff17121
|
add new models and fixtures
|
2018-07-25 20:47:07 +02:00 |
|
Joan Sanchez
|
2433d7684d
|
Change page title #426
|
2018-07-25 15:14:03 +02:00 |
|
gerard
|
b68f34d3d4
|
Tarea #427 mover create order de ticket a order
|
2018-07-24 13:48:31 +02:00 |
|
gerard
|
81dc09999f
|
Tarea #406 order.volumen
|
2018-07-24 12:57:07 +02:00 |
|
gerard
|
a7ec730216
|
bug with barcodes solved
|
2018-07-24 12:56:07 +02:00 |
|
Joan Sanchez
|
bea6378f6a
|
Change shipment date on landed data selection. #410
|
2018-07-24 12:14:35 +02:00 |
|
gerard
|
dc60156277
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-24 11:36:28 +02:00 |
|
gerard
|
7e62f2afa7
|
excluded french TIN test as it has been disabled
|
2018-07-24 11:36:07 +02:00 |
|
Bernat
|
6b73a6392f
|
update fixtures
|
2018-07-24 11:32:10 +02:00 |
|
gerard
|
3dfa4bfc04
|
Bug #425 Split no funciona en produccion
|
2018-07-24 11:27:04 +02:00 |
|
Joan Sanchez
|
896c033594
|
added order catalogue #408
|
2018-07-24 09:35:23 +02:00 |
|
Bernat
|
d2904bd065
|
update fixtures
|
2018-07-24 08:11:55 +02:00 |
|
Bernat
|
65bf807195
|
update fixtures
|
2018-07-24 08:01:04 +02:00 |
|
Bernat
|
78f3376c20
|
export production structure DB to local
|
2018-07-24 07:34:14 +02:00 |
|
gerard
|
72d9212262
|
Bug #422 refactorizar el summary de item y añadir el visible y avaible
|
2018-07-23 09:58:07 +02:00 |
|
gerard
|
9a80f22e93
|
Tarea #405 crear order
|
2018-07-20 16:32:34 +02:00 |
|
Bernat
|
4ba541bec2
|
update structure
|
2018-07-20 11:30:55 +02:00 |
|
Bernat
|
62988fade8
|
update structure
|
2018-07-20 09:42:08 +02:00 |
|
Joan Sanchez
|
2c9ace654e
|
payment update mail fr translation
|
2018-07-19 14:16:51 +02:00 |
|
Bernat
|
eb159453cf
|
update structure
|
2018-07-19 09:44:58 +02:00 |
|
gerard
|
51e96d0bbf
|
Tarea #417 quitar de item.clone la foto
|
2018-07-18 14:34:45 +02:00 |
|
gerard
|
3c3abb9063
|
Tarea #405 crear order
|
2018-07-18 14:21:58 +02:00 |
|
Joan Sanchez
|
ebf38e225e
|
Deleted unused filter methods, fixed summary css
|
2018-07-18 13:18:40 +02:00 |
|
gerard
|
1542e38746
|
quitada la validacion del dni frances
|
2018-07-18 09:49:04 +02:00 |
|
Joan Sanchez
|
291c00e2da
|
Show address city & province on ticket summary #414
|
2018-07-18 09:23:51 +02:00 |
|
Bernat
|
c9a43d98b8
|
update structure
|
2018-07-17 14:09:59 +02:00 |
|
Bernat
|
8c7f05785c
|
update structure
|
2018-07-17 13:39:20 +02:00 |
 Javi Gallego
|
56344ac301
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-17 13:11:20 +02:00 |
|
Joan Sanchez
|
ef71f5c7cf
|
item & ticket crud-refactor #372
|
2018-07-17 08:44:31 +02:00 |
|
Bernat
|
7e1a2025a5
|
update structure
|
2018-07-17 08:34:27 +02:00 |
|
gerard
|
ee1ee77240
|
bug solved
|
2018-07-16 14:24:03 +02:00 |
|
Bernat
|
8040db4d17
|
update structure
|
2018-07-16 13:23:54 +02:00 |
|
Javi Gallego
|
77e0494b37
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-16 12:34:03 +02:00 |
|
Joan Sanchez
|
75d7c79af1
|
item crud model refactor #372
|
2018-07-16 09:28:32 +02:00 |
|
gerard
|
4cf5777b4e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-16 09:19:44 +02:00 |
|
gerard
|
467df7acbe
|
bugs solved
|
2018-07-16 09:19:38 +02:00 |
|
Joan Sanchez
|
bd37f91c46
|
client crud-model refactor #372
|
2018-07-16 08:00:04 +02:00 |
|
gerard
|
84e61c6cdf
|
Bug fixed
|
2018-07-16 07:55:13 +02:00 |
|
gerard
|
13e9b53a73
|
#390 Crear nuevo tipo de textfield
|
2018-07-13 15:21:37 +02:00 |
|
gerard
|
ef9b72b78c
|
Bug #331 Revisar los ACL en back-end
|
2018-07-13 12:37:58 +02:00 |
|
Joan Sanchez
|
dce8d16077
|
Deleted data
|
2018-07-12 13:53:52 +02:00 |
|
Bernat
|
755e0c1360
|
update structure
|
2018-07-12 08:43:41 +02:00 |
|
gerard
|
675c6be73e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-11 13:52:35 +02:00 |
|
Bernat
|
c65211de46
|
update structure DB
|
2018-07-11 13:52:10 +02:00 |
|
gerard
|
67030370a1
|
Bug #398 El SPLUR crea los nuevos tickets sin Alias(nickname)
|
2018-07-11 13:52:04 +02:00 |
|
Bernat
|
26a0ee1096
|
update ACL
|
2018-07-11 08:47:20 +02:00 |
|
gerard
|
7ecefab8ce
|
cleanup
|
2018-07-10 15:36:59 +02:00 |
|
gerard
|
0f795102cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-10 14:55:20 +02:00 |
|
gerard
|
1df2daa569
|
Bug #379 Loopback trata las horas en UTC y deberia tratarlas en CEST
|
2018-07-10 14:55:13 +02:00 |
|
Joan Sanchez
|
2d020268fe
|
Change dueDay to 5 only with paymethod with iban #341
|
2018-07-10 14:13:47 +02:00 |
|
Bernat
|
841a72a269
|
update fixtures
|
2018-07-10 10:55:35 +02:00 |
Juan
|
303290af53
|
Merge
|
2018-07-09 18:07:02 +02:00 |
|
Juan
|
542d9dca86
|
#345 - Filter items by tag
|
2018-07-09 18:06:25 +02:00 |
|
gerard
|
f4417f924a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-09 13:54:49 +02:00 |
|
gerard
|
18929e379c
|
Tarea #356 Crear Order
|
2018-07-09 13:54:43 +02:00 |
|
Joan Sanchez
|
10953841ec
|
show grade on client summary + fix insurance datetime #375
|
2018-07-09 13:01:46 +02:00 |
|
gerard
|
e90ba9d785
|
Bug #379 Loopback guarda las horas en UTC
|
2018-07-09 12:47:22 +02:00 |
|
Joan Sanchez
|
5608b1bd26
|
itemDiary alertLevel replaced by state name #384
|
2018-07-09 09:37:38 +02:00 |
|
Juan
|
96d755cd21
|
Code linting, code clean
|
2018-07-06 16:32:23 +02:00 |
|
Joan Sanchez
|
9a87a40293
|
Fixed ticketPriceDifference, fixed ticketComponentUpdate #385
|
2018-07-06 12:43:34 +02:00 |
|
gerard
|
f3f86c2dff
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-06 08:19:07 +02:00 |
|
gerard
|
4044b13175
|
Bug #353 El error de usuario web repetido es confuso
|
2018-07-06 08:18:55 +02:00 |
|
Joan Sanchez
|
059aa3462f
|
Payment method email translation to FR.
|
2018-07-05 07:34:46 +02:00 |
|
gerard
|
2ac0c34085
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-04 14:44:02 +02:00 |
|
gerard
|
36a3d04216
|
Tarea #330 Añadir a ticket.line el indicador de problemas
|
2018-07-04 14:41:01 +02:00 |
|
Bernat
|
c9ec2e53a8
|
update structure DB
|
2018-07-04 13:35:45 +02:00 |
|
Joan Sanchez
|
cdd477a8e5
|
Recovery recovery on "grade" field #368
|
2018-07-04 13:33:40 +02:00 |
|
Juan
|
1e54b9e228
|
Merge
|
2018-07-04 12:25:24 +02:00 |
|
Bernat
|
902909d8d1
|
update structure DB
|
2018-07-04 09:20:10 +02:00 |
|
Joan Sanchez
|
86a8ae0322
|
itemDiary, filter, grid and new directive repeat-last #346
|
2018-07-04 08:50:34 +02:00 |
|
Bernat
|
2ab6eb5e83
|
fix fixtures
|
2018-07-04 08:30:33 +02:00 |
|
Joan Sanchez
|
28a2c45c46
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-03 15:01:19 +02:00 |
|
Joan Sanchez
|
7dc1d5c811
|
Added saleTracking section #351. CR: Juan + Javi
|
2018-07-03 15:00:33 +02:00 |
|
gerard
|
237c2afecd
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-03 15:00:25 +02:00 |
|
gerard
|
8a655a7003
|
Bug #378 Refactorizar marcar como reservado para que no utilice el crud
|
2018-07-03 15:00:16 +02:00 |
|
Bernat
|
15de049317
|
update structure DB
|
2018-07-03 14:28:29 +02:00 |
|
Juan
|
98001b364e
|
vnAutoPaging renamed to vnPagination plus bugs fixed
|
2018-07-03 13:45:25 +02:00 |
|
Bernat
|
d36483875b
|
update structure DB
|
2018-07-03 12:01:53 +02:00 |
|
Bernat
|
844fa3a682
|
update structure DB
|
2018-07-03 11:43:05 +02:00 |
|
Javi Gallego
|
f417dba3ba
|
#367 addressesPropagateRe desmarcar campo hasToInvoiceByAddress cr JOAN
|
2018-07-03 11:13:33 +02:00 |
|
Bernat
|
371c24a9ad
|
update acl
|
2018-07-03 07:31:01 +02:00 |
|
Bernat
|
963f6df655
|
update model client
|
2018-07-02 14:03:42 +02:00 |
|
Bernat
|
a9f9509138
|
update structure DB
|
2018-07-02 13:42:23 +02:00 |
|
Bernat
|
0c33f3296e
|
update fixtures and fix backend test
|
2018-07-02 08:18:54 +02:00 |
|
Bernat
|
dfff317414
|
update structure DB
|
2018-06-29 08:32:22 +02:00 |
|
gerard
|
81988e0753
|
bug fixed
|
2018-06-29 08:07:40 +02:00 |
|
gerard
|
19c89ec7d3
|
changed duplicated scope
|
2018-06-28 16:00:28 +02:00 |
|
gerard
|
88a2569054
|
removed console logs (my fault)
|
2018-06-28 15:56:45 +02:00 |
|
gerard
|
88033a7539
|
Tarea #373, Tarea #355,Tarea #352 getSalesPersonMana
|
2018-06-28 15:29:00 +02:00 |
|
gerard
|
cebb7030c5
|
Tarea #373 ticket.sale Modificar precio
|
2018-06-28 15:27:29 +02:00 |
|
gerard
|
ffc8c54899
|
Tarea #355 ticket.lineas Modificar cantidad
|
2018-06-28 15:25:09 +02:00 |
|
gerard
|
4bc391e083
|
Tarea #354 seccion ticket.line menu de mover lineas
|
2018-06-28 15:24:27 +02:00 |
|
gerard
|
accd66f63a
|
Tarea #352 ticket.lines Modificar descuento
|
2018-06-28 15:21:04 +02:00 |
|
Joan Sanchez
|
9527b839df
|
crud test updated
|
2018-06-28 14:54:05 +02:00 |
|
Bernat
|
fb07f5e860
|
update structure DB
|
2018-06-28 12:34:49 +02:00 |
|
Bernat
|
b78f83ae30
|
add new procedure in the DB
|
2018-06-27 14:22:07 +02:00 |
|
Bernat
|
a290857dc1
|
fix fixtures
|
2018-06-27 08:28:21 +02:00 |
|
Bernat
|
71a5f8aed3
|
update acl
|
2018-06-26 11:34:37 +02:00 |
|
Bernat
|
9e1a591be2
|
update acl
|
2018-06-26 11:32:05 +02:00 |
|
Bernat
|
49f8770584
|
fix test and update fixtures for procedure manaSpelleersRequery
|
2018-06-26 11:28:29 +02:00 |
|
Joan Sanchez
|
dfa1d1edb2
|
Added new section client contacts #365 - CR: Javi
|
2018-06-26 09:41:27 +02:00 |
|
Bernat
|
f0cb20736b
|
update fixturs for table clientContact
|
2018-06-25 12:27:27 +02:00 |
|
Bernat
|
656f26abff
|
update squema DB, fix test and update fixtures
|
2018-06-22 14:52:11 +02:00 |
|
Bernat
|
2b82d37b4b
|
update tblContadores cau7201
|
2018-06-21 12:01:12 +02:00 |
|
Bernat
|
2d78d1e50e
|
update structure DB
|
2018-06-21 11:19:20 +02:00 |
|
Bernat
|
56dc43e023
|
update structure DB and add fixtures for saleTracing
|
2018-06-21 10:57:37 +02:00 |
|
Bernat
|
7f8ceb6d37
|
add view saleTracking and ACL for news models
|
2018-06-21 07:27:17 +02:00 |
|
Joan Sanchez
|
723ea3f57b
|
model saleTracking
|
2018-06-20 12:47:43 +02:00 |
|
gerard
|
42eacd4905
|
Tarea #333 Ultimas Entradas
|
2018-06-20 11:39:29 +02:00 |
|
Juan
|
e33df7098d
|
Merge branch 'test' into dev
|
2018-06-20 09:54:10 +02:00 |
|
Juan
|
6e137283ec
|
salesPerson filter fixed
|
2018-06-20 09:53:13 +02:00 |
|
Bernat
|
377332a4d7
|
update procedure itemLastEntries
|
2018-06-20 09:48:08 +02:00 |
|
Bernat
|
2eeaf9e66b
|
create new modul 'pedidos' update structure DB, fixtures, add hedera to the package and create model Order and orderRow
|
2018-06-20 08:30:16 +02:00 |
|
Joan Sanchez
|
8f6a88f9b6
|
Display sale taxes #342
|
2018-06-19 12:10:38 +02:00 |
|
Joan Sanchez
|
0822f3ce53
|
back-end tests updated
|
2018-06-19 09:20:14 +02:00 |
|
gerard
|
1ecb3f3d2b
|
Bug #358 Credit create no da un error comprensible
|
2018-06-18 13:41:49 +02:00 |
|
Juan
|
cd94460168
|
Merge branch 'test' into dev
|
2018-06-12 17:01:56 +02:00 |
|
Juan
|
cde2458404
|
nginx SSL
|
2018-06-12 14:38:27 +02:00 |
|
Juan
|
e053515997
|
Config volume on all containers
|
2018-06-12 13:45:20 +02:00 |
|
Juan
|
f24395f074
|
Lavels to compose services
|
2018-06-12 11:24:43 +02:00 |
|
Juan
|
8dbbaafa47
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-11 21:03:56 +02:00 |
|
Juan
|
a860873819
|
Deploy speed inprovements
|
2018-06-11 14:03:40 +02:00 |
|
Juan
|
281f539aea
|
Improved deploy speed
|
2018-06-11 12:31:11 +02:00 |
|
Juan
|
bf909c6620
|
Deploy bugs solved
|
2018-06-11 09:09:47 +02:00 |
|
Javi Gallego
|
80b98f14e5
|
traduccion grade
|
2018-06-09 12:15:16 +02:00 |
|
Juan
|
2951a737a7
|
Merge
|
2018-06-07 23:56:16 +02:00 |
|
Juan
|
9fa12d4baf
|
Automatic pagination with vnPagination, improved vnSearchbar
|
2018-06-07 23:47:19 +02:00 |
|
Bernat
|
61eb0d1551
|
update structure DB
|
2018-06-07 07:19:27 +02:00 |
|
Bernat
|
905122c864
|
update structure DB
|
2018-06-07 07:11:43 +02:00 |
|
gerard
|
8c34dba79e
|
Tarea #296 seccion ticket.line menu de mover lineas
|
2018-06-06 16:54:40 +02:00 |
|
Bernat
|
16a9201302
|
update structure db
|
2018-06-06 15:08:22 +02:00 |
|
Bernat
|
f7930ad664
|
update structure and fixtures
|
2018-06-06 14:49:31 +02:00 |