Juan
|
518a82bf26
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-22 11:44:33 +02:00 |
|
Juan
|
2f1e5b4fb4
|
#82 Non-generated files removed from generated directory, vnTooltip refactor
|
2018-05-22 11:44:24 +02:00 |
Bernat
|
edc3db3f02
|
update ArticlesUpdateTrigger
|
2018-05-21 14:38:38 +02:00 |
|
Bernat
|
7566da8421
|
update ACL
|
2018-05-21 13:05:03 +02:00 |
|
Bernat
|
4ce1af97df
|
update table ACL
|
2018-05-18 12:15:31 +02:00 |
|
Bernat
|
ec38ed64e5
|
add new procedure in the BD
|
2018-05-18 11:58:04 +02:00 |
|
Bernat
|
74751e3ecd
|
drop deprecated views in salix
|
2018-05-18 09:25:24 +02:00 |
gerard
|
8cbe02a1b6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-17 15:37:20 +02:00 |
|
gerard
|
bbfa066640
|
Bug #307 CR JOAN
|
2018-05-17 15:37:09 +02:00 |
|
Bernat
|
665d819c34
|
new model itemTypeTag
|
2018-05-17 14:28:15 +02:00 |
|
gerard
|
983e66d7ee
|
Bug #307 Modificar changeState en ticket.sale
|
2018-05-17 13:29:18 +02:00 |
|
gerard
|
595d878f93
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-17 13:19:44 +02:00 |
|
gerard
|
5203755fd1
|
Bug #310 Error en client.credit
|
2018-05-17 13:18:16 +02:00 |
|
Bernat
|
b49b4ce5a8
|
update ACL
|
2018-05-17 09:10:56 +02:00 |
 Joan Sanchez
|
fe60481b1f
|
Disabled unused services
|
2018-05-16 13:26:36 +02:00 |
|
Joan Sanchez
|
f0e8b90316
|
Added description field on item basic data #303
|
2018-05-16 13:02:19 +02:00 |
|
Joan Sanchez
|
11b7c133a4
|
Added package & dropdown replaced search regexp with like
|
2018-05-16 13:01:14 +02:00 |
|
gerard
|
0fdb4a4785
|
Bug #306 Modificar TicketTracking para tener en cuenta los nuevos ACL
|
2018-05-16 12:56:46 +02:00 |
|
Bernat
|
e6b7cd8516
|
update tbl tickets
|
2018-05-16 10:47:25 +02:00 |
|
Joan Sanchez
|
8f9f7c1fe6
|
Ticket basic data and date-picker refactor
|
2018-05-16 08:13:39 +02:00 |
 Javi Gallego
|
63cd55cd66
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-15 14:02:20 +02:00 |
|
Javi Gallego
|
8cffc556d0
|
bug: al clonar item no clonaba su iva
|
2018-05-15 14:02:16 +02:00 |
|
Bernat
|
d9b43ce84d
|
update fixtures tbl:ticket and ticketTracking
|
2018-05-14 14:32:58 +02:00 |
|
Bernat
|
fa222ab398
|
refactor fixtures
|
2018-05-14 07:50:33 +02:00 |
|
Bernat
|
b301d07cd6
|
delete deprecated files
|
2018-05-11 15:06:31 +02:00 |
|
Bernat
|
4191c97beb
|
update views sale and componenTypeRate
|
2018-05-11 14:09:24 +02:00 |
|
Bernat
|
0dbba4e159
|
add model deliveryMethod
|
2018-05-11 13:08:01 +02:00 |
|
Joan Sanchez
|
35735c15a3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-11 11:34:20 +02:00 |
|
Joan Sanchez
|
a990a950a1
|
Keep SQL comments on docker dump
|
2018-05-11 11:34:05 +02:00 |
|
gerard
|
f841e25b7f
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:30:05 +02:00 |
|
gerard
|
85aa3b0156
|
Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta""
This reverts commit d9862b8922.
|
2018-05-11 11:16:16 +02:00 |
|
gerard
|
d9862b8922
|
Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"
This reverts commit 9b07cd444c.
|
2018-05-11 11:10:15 +02:00 |
|
gerard
|
9b07cd444c
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:09:07 +02:00 |
|
Joan Sanchez
|
700fea1d54
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-10 14:07:28 +02:00 |
|
Joan Sanchez
|
b14154b4e2
|
Prevent container shutdown forcing SQL import
|
2018-05-10 14:07:25 +02:00 |
|
gerard
|
4ebca3f3cb
|
pequeño refactor CR JOAN
|
2018-05-10 13:39:11 +02:00 |
|
Bernat
|
52b3567b47
|
update Local schema from Production schema and update fixtures bugs
|
2018-05-10 12:04:08 +02:00 |
|
Bernat
|
dfd4242c00
|
update fixtures tbl clientCredit
|
2018-05-09 14:42:51 +02:00 |
|
Bernat
|
86766b88e0
|
update fixtures tbl recovery
|
2018-05-09 14:22:21 +02:00 |
|
Bernat
|
0c4378f562
|
update fixtures
|
2018-05-09 14:17:33 +02:00 |
|
Bernat
|
a74eff251f
|
update fixtures tbl agencyHour and saleComponent
|
2018-05-09 12:20:40 +02:00 |
|
Bernat
|
806ba305f0
|
add ACl for workerMana
|
2018-05-09 11:27:47 +02:00 |
|
Bernat
|
868dac95a2
|
add new ACL for workerMana
|
2018-05-09 11:19:54 +02:00 |
|
Bernat
|
f6a7efae0c
|
update fixtures and schema
|
2018-05-09 07:20:30 +02:00 |
|
Joan Sanchez
|
3c839cea07
|
gulp docker && docker-build tasks updated
|
2018-05-08 11:34:50 +02:00 |
|
gerard
|
5111efa2b9
|
refactorizacion InstallCrudModel CR: JUAN
|
2018-05-08 09:57:11 +02:00 |
|
gerard
|
ba5a135434
|
CRUD para Tarea #284
|
2018-05-08 09:56:25 +02:00 |
|
gerard
|
a9ade07aa0
|
Cambiado ticketTracking por tracking CR JUAN
|
2018-05-08 09:40:37 +02:00 |
|
gerard
|
b37dbfb9f7
|
ACL para Tarea #265
|
2018-05-08 09:32:30 +02:00 |
|
gerard
|
024a248797
|
#265 Añadir boton ok y estado CR: JUAN
|
2018-05-08 09:25:15 +02:00 |
|
Bernat
|
68b13efb83
|
add new fixtures and update BD schema
|
2018-05-07 12:31:48 +02:00 |
|
Joan Sanchez
|
e1bc434f34
|
Added front-end & back-end "order" service #267
|
2018-05-07 09:08:46 +02:00 |
|
Joan Sanchez
|
22250984ae
|
CSS class ellipsize with max-width 20em
|
2018-05-04 14:27:45 +02:00 |
|
Joan Sanchez
|
681731e886
|
back-end refactor & item search fix. #260
|
2018-05-04 11:46:03 +02:00 |
|
Bernat
|
7732dfc5ec
|
new model ticketWeekly with fixtures
|
2018-05-03 13:24:35 +02:00 |
Daniel Herrero
|
628dd5a99b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-30 13:57:14 +02:00 |
|
Daniel Herrero
|
a7e5f1a623
|
new component for infinite scroll vnAutoPaging
|
2018-04-30 13:57:10 +02:00 |
|
Bernat
|
c31d1ed888
|
update fixtures and dumpedfixtures with table vn.state
|
2018-04-30 12:48:29 +02:00 |
|
Bernat
|
09a731c812
|
refactor docker for mac users CR: Joan
|
2018-04-30 08:46:41 +02:00 |
|
Bernat
|
3ff20d48d7
|
refactor back end test,failed because of new fixtures
|
2018-04-29 13:50:42 +02:00 |
|
Bernat
|
f7b2bf9794
|
add fixtures and model for workerMana
|
2018-04-29 13:47:33 +02:00 |
Carlos Jimenez
|
57123f4887
|
#266 popover for item descriptor on ticket section plus some minor refactors on inte tags relations
|
2018-04-26 16:41:08 +02:00 |
|
Joan Sanchez
|
e4b536e439
|
Added gulp task docker-image.
|
2018-04-26 15:13:56 +02:00 |
|
Bernat
|
9f3609a3be
|
update fixutes table itemTag ans sale with more items
|
2018-04-25 09:13:47 +02:00 |
|
Bernat
|
73e92d3c5b
|
update fixtures table invoiceOut
|
2018-04-25 07:47:30 +02:00 |
|
Bernat
|
d3ad20055e
|
update dumpedFixtures and create model for updateTicketAction
|
2018-04-24 14:03:43 +02:00 |
|
Carlos Jimenez
|
e11c0936bc
|
eslint errors corrected
|
2018-04-24 12:46:07 +02:00 |
|
Bernat
|
93653ca67e
|
update fixtures and dumpedfixtures with table vn.state
|
2018-04-24 12:36:20 +02:00 |
|
Bernat
|
c9941ac1a7
|
update fixtures #211
|
2018-04-24 07:54:30 +02:00 |
|
Carlos Jimenez
|
64bddaa0b4
|
#269 back end unit test for creditClassification/insurance transaction CR Joan
|
2018-04-23 14:50:06 +02:00 |
|
Carlos Jimenez
|
03c61bb30f
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-20 16:26:06 +02:00 |
|
Joan Sanchez
|
12e67b7b60
|
Added method to send message to salesPerson on credit classification.
|
2018-04-20 15:16:03 +02:00 |
|
Carlos Jimenez
|
1fb366d11c
|
#190 install crud model backend unit test CR Mr Joan
|
2018-04-20 12:53:30 +02:00 |
|
Javi Gallego
|
de40c400b4
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-19 16:32:59 +02:00 |
|
Javi Gallego
|
59979b87bd
|
#263 No mostrar sumatorio en client.factura CR Juan
|
2018-04-19 16:31:47 +02:00 |
|
Carlos Jimenez
|
4748f594de
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-19 15:48:29 +02:00 |
|
Carlos Jimenez
|
b959982911
|
#192 item clone test CR Joan
|
2018-04-19 15:48:19 +02:00 |
|
Gerard
|
1e15826f8d
|
Bug #211 Forzar a ciertos tags
|
2018-04-19 15:12:39 +02:00 |
|
Gerard
|
592b34a879
|
Bug #243 Indice de Tickets
|
2018-04-19 14:56:05 +02:00 |
|
Gerard
|
79fafa7dfc
|
merge
|
2018-04-19 14:51:21 +02:00 |
|
Carlos Jimenez
|
6f162c774e
|
fixes and refactor in several spec files
|
2018-04-19 11:20:41 +02:00 |
|
Gerard
|
b4af50cc48
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-19 09:31:28 +02:00 |
|
Joan Sanchez
|
ded1ab5d93
|
Sql messageSend() and messageSendWithUser()
|
2018-04-18 15:11:05 +02:00 |
|
Gerard
|
25d099513d
|
fix wrong type of data
|
2018-04-18 14:42:48 +02:00 |
|
Carlos Jimenez
|
bf66dcbf10
|
disabled clone spec while investigating how to extend loopback methods
|
2018-04-18 14:42:30 +02:00 |
|
Gerard
|
2d5cd04b8a
|
fix wrong type of the id after a change iin the fixtures
|
2018-04-18 14:42:11 +02:00 |
|
Carlos Jimenez
|
e5bd430ff8
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-18 14:37:23 +02:00 |
|
Carlos Jimenez
|
f3eecf53b7
|
#192 refactor on back end unit test helpers to ready loopback methods extensions CR Joan
|
2018-04-18 14:37:17 +02:00 |
|
Javi Gallego
|
9e6aaf8ac6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-18 13:59:28 +02:00 |
|
Javi Gallego
|
f5014b7824
|
# 186 CANCEL button en secciones pertinentes CR juan
|
2018-04-18 13:47:45 +02:00 |
|
Bernat
|
78b79b6fde
|
update fixtures and refactor ticketVolume and backend test
|
2018-04-18 13:40:09 +02:00 |
|
Joan Sanchez
|
228239b027
|
Added step-control component and basic data step controllers
|
2018-04-18 09:47:05 +02:00 |
|
Joan Sanchez
|
5e09df1c9d
|
Ticket summary. #213
|
2018-04-17 14:49:55 +02:00 |
|
Joan Sanchez
|
f95a2f646b
|
Refactor back-end unit test + helpers
|
2018-04-17 13:38:40 +02:00 |
|
Joan Sanchez
|
808ff40794
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-17 12:19:51 +02:00 |
|
Joan Sanchez
|
136a5e26a3
|
Created component vn-label-value and replaced vn-label on descriptors
|
2018-04-17 12:19:40 +02:00 |
|
Bernat
|
7426bc9e04
|
update fixtures with table cache.calc and dumpedfixtures with table cache
|
2018-04-17 11:20:00 +02:00 |
|
Bernat
|
ba22900908
|
update fixtures, table ticket
|
2018-04-17 08:17:37 +02:00 |
|
Carlos Jimenez
|
18cf6eb739
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-16 16:47:24 +02:00 |
|
Carlos Jimenez
|
03b2a75a84
|
#236 client side unit test for ticket volumes
|
2018-04-16 16:47:04 +02:00 |