 Javi Gallego
|
56344ac301
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-17 13:11:20 +02:00 |
gerard
|
ee1ee77240
|
bug solved
|
2018-07-16 14:24:03 +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
|
467df7acbe
|
bugs solved
|
2018-07-16 09:19:38 +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 |
|
gerard
|
67030370a1
|
Bug #398 El SPLUR crea los nuevos tickets sin Alias(nickname)
|
2018-07-11 13:52:04 +02:00 |
|
gerard
|
7ecefab8ce
|
cleanup
|
2018-07-10 15:36:59 +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 |
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 |
|
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 |
|
gerard
|
36a3d04216
|
Tarea #330 Añadir a ticket.line el indicador de problemas
|
2018-07-04 14:41:01 +02:00 |
|
Joan Sanchez
|
86a8ae0322
|
itemDiary, filter, grid and new directive repeat-last #346
|
2018-07-04 08:50:34 +02:00 |
|
gerard
|
8a655a7003
|
Bug #378 Refactorizar marcar como reservado para que no utilice el crud
|
2018-07-03 15:00:16 +02:00 |
|
Javi Gallego
|
f417dba3ba
|
#367 addressesPropagateRe desmarcar campo hasToInvoiceByAddress cr JOAN
|
2018-07-03 11:13:33 +02:00 |
Bernat
|
0c33f3296e
|
update fixtures and fix backend test
|
2018-07-02 08:18:54 +02:00 |
|
gerard
|
81988e0753
|
bug fixed
|
2018-06-29 08:07:40 +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 |
|
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
|
656f26abff
|
update squema DB, fix test and update fixtures
|
2018-06-22 14:52:11 +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 |
|
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 |
|
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 |
|
gerard
|
8c34dba79e
|
Tarea #296 seccion ticket.line menu de mover lineas
|
2018-06-06 16:54:40 +02:00 |
|
Bernat
|
0931cf2906
|
update structure DB
|
2018-06-05 12:49:33 +02:00 |
|
Bernat
|
8b7710746b
|
update structure BD and clone.js error
|
2018-06-05 08:24:53 +02:00 |
|
gerard
|
c0c3925470
|
Tarea #316 Nuevo formulario del registro de compra-venta
|
2018-06-04 09:48:32 +02:00 |
|
Joan Sanchez
|
d316b17899
|
Merge branch 'dev' into test
|
2018-05-31 14:58:51 +02:00 |
|
Joan Sanchez
|
4173180fde
|
fixed eslint rules
|
2018-05-31 14:48:10 +02:00 |
|
Juan
|
3c9d8f32bb
|
Merge
|
2018-05-31 11:56:52 +02:00 |
|
Juan
|
a78bb24e09
|
Tests fixed, bugs solved, vnCrudModel, vnRestModel, UserError
|
2018-05-31 11:52:39 +02:00 |
|
Joan Sanchez
|
d6f0be2209
|
Remove ticket from route. Added warehouse to procedure. #326
|
2018-05-30 10:55:54 +02:00 |
|
Juan
|
3833339cc6
|
Merge
|
2018-05-29 17:46:10 +02:00 |
|
Javi Gallego
|
1273f92e85
|
test back fixed
|
2018-05-28 09:35:05 +02:00 |
|
Javi Gallego
|
8b03ba420f
|
#309 seccion ticket.volume con m3 y sumatorio CR juan
|
2018-05-28 09:16:06 +02:00 |
|
Joan Sanchez
|
74410d4045
|
getVolume route should return only data #324 CR: Juan
|
2018-05-28 08:52:18 +02:00 |
|
Bernat
|
8231a935d6
|
update fixtures and refactor test
|
2018-05-28 07:55:10 +02:00 |
|
Juan
|
30aea3d086
|
Tests fixed, watcher refactor, global error handling, angular 1.7
|
2018-05-25 17:25:35 +02:00 |
|
Joan Sanchez
|
7a5d8bdd03
|
Added warehouse & isDeleted on ticket basic data #322
|
2018-05-25 11:40:04 +02:00 |
|
gerard
|
bbfa066640
|
Bug #307 CR JOAN
|
2018-05-17 15:37:09 +02:00 |
|
Joan Sanchez
|
f0e8b90316
|
Added description field on item basic data #303
|
2018-05-16 13:02:19 +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 |
|
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 |
|
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 |
|
Joan Sanchez
|
681731e886
|
back-end refactor & item search fix. #260
|
2018-05-04 11:46:03 +02:00 |
Daniel Herrero
|
a7e5f1a623
|
new component for infinite scroll vnAutoPaging
|
2018-04-30 13:57:10 +02:00 |
|
Bernat
|
3ff20d48d7
|
refactor back end test,failed because of new fixtures
|
2018-04-29 13:50:42 +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 |
|
Carlos Jimenez
|
e11c0936bc
|
eslint errors corrected
|
2018-04-24 12:46:07 +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 |
|
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 |
|
Carlos Jimenez
|
bf66dcbf10
|
disabled clone spec while investigating how to extend loopback methods
|
2018-04-18 14:42:30 +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 |
|
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
|
136a5e26a3
|
Created component vn-label-value and replaced vn-label on descriptors
|
2018-04-17 12:19:40 +02:00 |
|
Carlos Jimenez
|
3e8b26c91e
|
#235 back end unit tests for getAverageInvoiced
|
2018-04-16 11:21:13 +02:00 |
|
Carlos Jimenez
|
9928521557
|
#235 getMana back unit test plus helpers setup
|
2018-04-13 18:32:20 +02:00 |
|
Carlos Jimenez
|
dafb554792
|
#232 components section plus unit tests
|
2018-04-13 16:03:43 +02:00 |
|
Gerard
|
4c6213cd01
|
Tarea #240 Añadir comprador
|
2018-04-13 08:59:23 +02:00 |
|
Carlos Jimenez
|
d12bbed929
|
linter error
|
2018-04-11 08:11:14 +02:00 |
|
Carlos Jimenez
|
ee7651b4e6
|
bug fixes for ticket volume procedure
|
2018-04-10 13:40:24 +02:00 |
|
Carlos Jimenez
|
e65942a296
|
#229 ticket descriptor
|
2018-04-10 11:14:33 +02:00 |
joan
|
4b8ae91705
|
Ticket summary
|
2018-04-10 07:48:04 +02:00 |
|
Juan
|
ded0c6a53a
|
#166 - Item list ordered by name
|
2018-04-04 19:59:03 +02:00 |
|
Carlos Jimenez
|
04ac260738
|
#175 e2e for ticket packages
|
2018-04-04 16:41:06 +02:00 |
|
Juan
|
ae7a8f1245
|
Bugs solved on method Client.activeSalesPerson()
|
2018-04-03 19:37:37 +02:00 |
|
Juan
|
749681ac73
|
Client.activeSalesPerson() method refactor
|
2018-04-03 19:29:01 +02:00 |
|
Juan
|
8970abe903
|
Test bug solved
|
2018-04-03 18:33:00 +02:00 |
|
Juan
|
bf04c73b42
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-03 18:31:54 +02:00 |
|
Juan
|
c8aa7dc43c
|
#199 - Bug solved: Client service crash when calling Client.card() method with invalid id
|
2018-04-03 18:31:13 +02:00 |
|
Carlos Jimenez
|
ce3600a01e
|
ticket volume plus e2e, and back-front unit test fixed
|
2018-04-03 16:10:39 +02:00 |
|
Joan Sanchez
|
85810e2f7e
|
Client summary & package
|
2018-03-27 15:06:22 +02:00 |
|
Javi Gallego
|
6351f4a93d
|
merge
|
2018-03-22 18:05:52 +01:00 |
|
Javi Gallego
|
46a6b0fb70
|
ticket line basico
|
2018-03-22 18:02:48 +01:00 |
|
Carlos Jimenez
|
0c4246847b
|
#182 files preparation for ticket volume
|
2018-03-22 15:06:21 +01:00 |
|
Juan
|
70f854a463
|
French TIN validation bugs fixed
|
2018-03-21 12:57:23 +01:00 |
|
Joan Sanchez
|
af2fca3879
|
Ticket packages, moved Item model to loopback service
|
2018-03-15 14:36:09 +01:00 |
|
Daniel Herrero
|
e6a8b34fe4
|
filter tickets
|
2018-03-14 13:59:01 +01:00 |
|
Bernat Exposito
|
a813fe805e
|
create services ticket, fixtures and models for salix 1.7.0
|
2018-03-12 13:55:18 +01:00 |
|
Juan
|
3dbd7e6bc0
|
Client.createWithUser refactored to async/await
|
2018-03-12 13:09:52 +01:00 |
|
Javi Gallego
|
dcf45f014c
|
minor bugs en account
|
2018-03-12 12:07:55 +01:00 |
|
Carlos Jimenez
|
db88d00560
|
#156 client descriptor icons missing correct icons
|
2018-03-09 16:44:18 +01:00 |
|
Carlos Jimenez
|
8ef0814fcc
|
back end unit test fixes plus small refactors
|
2018-03-08 12:23:51 +01:00 |
|
Carlos Jimenez
|
1e48f4a4a9
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-07 14:55:42 +01:00 |
|
Daniel Herrero
|
f82a616940
|
semantic refactor
|
2018-03-07 14:13:30 +01:00 |
|
Bernat Exposito
|
dd677b11f7
|
update fixtures #155 and fixed listWorker back unit test
|
2018-03-07 13:07:48 +01:00 |
|
Carlos Jimenez
|
a95f2c3ada
|
#155 back end unit tests for webaccess new functionality
|
2018-03-07 12:25:23 +01:00 |
|
Carlos Jimenez
|
60e4ca132a
|
#155 web access functionality completed
|
2018-03-07 12:24:47 +01:00 |
|
Bernat Exposito
|
70ef95fc8f
|
refactor fixtures update id clients,debug web test and back test
|
2018-03-05 14:59:26 +01:00 |
|
Juan
|
8673d2b25f
|
Eslint fix
|
2018-03-02 13:46:25 +01:00 |
|
Bernat Exposito
|
cfbb94e9c3
|
Update fixtures in backend test
|
2018-03-01 12:28:22 +01:00 |
|
Daniel Herrero
|
34e35ee139
|
new global crudMethod
|
2018-02-27 14:55:59 +01:00 |
|
Carlos Jimenez
|
cdfc2a6779
|
solved merge comflics with item tags
|
2018-02-27 13:40:33 +01:00 |
|
Juan
|
b864a8382c
|
Backend test repaired
|
2018-02-27 12:56:03 +01:00 |
|
Carlos Jimenez
|
c22d1b0e72
|
salesperson spec repairs
|
2018-02-27 12:08:19 +01:00 |
|
Daniel Herrero
|
60e2d8132b
|
itemBotanical
|
2018-02-20 14:30:02 +01:00 |
|
Carlos Jimenez
|
84bc505937
|
adapted test to show now 6 sales person
|
2018-02-19 11:58:02 +01:00 |
SAMBA\bernat
|
2390ee3b01
|
update fixtures / script for automatic change update in the BD
|
2018-02-16 13:01:04 +01:00 |
Juan Ferrer Toribio
|
2240b4f6d8
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-15 16:11:54 +01:00 |
|
Juan Ferrer Toribio
|
e6a753d1cf
|
Addresses ordered by nickname
|
2018-02-15 16:11:44 +01:00 |
|
Daniel Herrero
|
505ff1dcfe
|
removed role from activeSalesPerson
|
2018-02-15 13:11:23 +01:00 |
|
Daniel Herrero
|
f0356eb047
|
join addressObservation into list Addresses service
|
2018-02-06 07:59:36 +01:00 |
|
Carlos Jimenez
|
48f6f5a18d
|
successfully moved all specs from services/client/c../m../client alongside their respective js files
|
2018-02-02 16:24:22 +01:00 |
|
Juan Ferrer Toribio
|
9090c56c64
|
Backend tests fixed
|
2018-01-31 13:40:26 +01:00 |
|
Juan Ferrer Toribio
|
cba0645f92
|
Merge with dev
|
2018-01-31 12:19:34 +01:00 |
|
Juan Ferrer Toribio
|
3d6f9fbbca
|
Backend tests refactor, bug fixes
|
2018-01-31 12:17:17 +01:00 |
|
Juan Ferrer Toribio
|
f4a790f87c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-01-29 12:38:08 +01:00 |
|
Juan Ferrer Toribio
|
a3188b204f
|
Views migrated to vn schema, Node v8, Error handling, async-await, bugs solved
|
2018-01-29 12:37:54 +01:00 |
|
Juan Ferrer Toribio
|
4267b5fe0a
|
Eliminando código redundante v2
|
2017-10-13 16:22:45 +02:00 |