Bernat Exposito
|
b8979e76f5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 14:20:17 +01:00 |
|
Bernat Exposito
|
0e04d97dc0
|
update model packaging.sql
|
2018-03-14 14:20:01 +01:00 |
Daniel Herrero
|
8f0f71a3ca
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 13:59:04 +01:00 |
|
Daniel Herrero
|
e6a8b34fe4
|
filter tickets
|
2018-03-14 13:59:01 +01:00 |
|
Bernat Exposito
|
a4166cc14d
|
update model packaging.json
|
2018-03-14 13:51:07 +01:00 |
|
Bernat Exposito
|
ab3ead6a28
|
added modelconfig.json for models in the commit 60f3bfc and new procedure 04.ticketVolume
|
2018-03-14 13:00:17 +01:00 |
|
Bernat Exposito
|
5e01ab1a9f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 12:58:30 +01:00 |
|
Bernat Exposito
|
60f3bfc7b8
|
create models saleChecked saleComponent, added fixtures and ACL
|
2018-03-14 12:06:21 +01:00 |
 Javi Gallego
|
19870a7732
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 12:04:09 +01:00 |
 Joan Sanchez
|
708c822ab0
|
Credit classification & credit insurance task #150, #151, #152
|
2018-03-14 11:36:57 +01:00 |
|
Javi Gallego
|
6879435011
|
fuentes client descriptor
|
2018-03-14 11:15:14 +01:00 |
Carlos Jimenez
|
0e8fe7fead
|
merge plus #167 error en el id al crear item task
|
2018-03-13 14:46:39 +01:00 |
|
Daniel Herrero
|
5530828d62
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 14:30:51 +01:00 |
|
Daniel Herrero
|
176ce860ca
|
Tarea #164 Filtros con superpoderes
|
2018-03-13 14:30:25 +01:00 |
|
Javi Gallego
|
a6994b0179
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 14:07:47 +01:00 |
|
Javi Gallego
|
d9f932b2c1
|
añadir fuentes
|
2018-03-13 14:07:42 +01:00 |
Juan
|
9b153aec5a
|
DNI validation fixes
|
2018-03-13 12:14:06 +01:00 |
Vicente Falco
|
95e96a91a7
|
datasource loopback unique
|
2018-03-13 11:15:39 +01:00 |
|
Juan
|
6b1ad875cb
|
DNI validation fix
|
2018-03-12 17:18:18 +01:00 |
|
Juan
|
ada0f40ece
|
DNI validation fixed
|
2018-03-12 14:13:36 +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
|
fdd71951a0
|
sin el id falla el test de back
|
2018-03-12 12:16:18 +01:00 |
|
Javi Gallego
|
f0164fc4a4
|
fix Validador de mail ahora acepta guiones
|
2018-03-12 12:08:34 +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
|
11d4c835ba
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-07 12:25:37 +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
|
f1ef403126
|
update salix.ACL with invoiceOut permissions
|
2018-03-07 09:53:44 +01:00 |
|
Carlos Jimenez
|
7de0db5902
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-06 15:14:57 +01:00 |
|
Carlos Jimenez
|
a47769f7c0
|
#154 credito ya inserta el usuario que efectua el cambio
|
2018-03-06 15:14:49 +01:00 |
|
Bernat Exposito
|
afaa7504e9
|
update models creditInsurance and creditClassification
|
2018-03-06 13:11:22 +01:00 |
|
Bernat Exposito
|
a6556e594d
|
update trigger client, #154
|
2018-03-06 11:22:57 +01:00 |
|
Carlos Jimenez
|
bc13abbe50
|
#114 mostrar current user en la top bar
|
2018-03-06 11:13:05 +01:00 |
|
Bernat Exposito
|
e9ad6bf879
|
update model creditClassification
|
2018-03-06 09:41:16 +01:00 |
|
Bernat Exposito
|
96689eccc8
|
add models creditClassification and creditInsurance, update fixtures #151
|
2018-03-06 08:55:54 +01:00 |
|
Carlos Jimenez
|
13c3ffce27
|
routes spec fix
|
2018-03-05 15:24:54 +01:00 |
|
Bernat Exposito
|
70ef95fc8f
|
refactor fixtures update id clients,debug web test and back test
|
2018-03-05 14:59:26 +01:00 |
|
Joan Sanchez
|
24abbffba7
|
Client summary updated
|
2018-03-05 10:56:51 +01:00 |
|
Juan
|
8673d2b25f
|
Eslint fix
|
2018-03-02 13:46:25 +01:00 |
|
Bernat Exposito
|
8776a46e58
|
add more tables in export-data.cmd
|
2018-03-02 12:41:52 +01:00 |
|
Carlos Jimenez
|
d3e2f93816
|
now two users havent got the verified data checked
|
2018-03-02 12:00:47 +01:00 |
|
Carlos Jimenez
|
f354a420bc
|
e2e item tags #121, plus item tags and item descriptor refactor #117
|
2018-03-02 10:51:01 +01:00 |
|
Bernat Exposito
|
836d7dc054
|
update structure and data from production DB
|
2018-03-01 14:47:25 +01:00 |
|
Juan
|
2c88d24e24
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 14:04:40 +01:00 |
|
Juan
|
9881c4e6f3
|
Merge
|
2018-03-01 14:04:33 +01:00 |
|
Bernat Exposito
|
f6c6ee1596
|
update fixtures adding data to vn.recovery
|
2018-03-01 14:02:51 +01:00 |
|
Juan
|
de145bd814
|
#128 - Client invoices form
|
2018-03-01 14:01:45 +01:00 |
|
Bernat Exposito
|
cfbb94e9c3
|
Update fixtures in backend test
|
2018-03-01 12:28:22 +01:00 |
|
Javi Gallego
|
c8eab7dc24
|
merge model-config
|
2018-03-01 11:57:33 +01:00 |
|
Javi Gallego
|
f3b00f4b47
|
entidad recovery con list, create y tests
|
2018-03-01 11:55:28 +01:00 |
|
Bernat Exposito
|
319cab6223
|
update fixtures for invoiceOut
|
2018-02-28 15:52:24 +01:00 |
|
Bernat Exposito
|
274d1475c9
|
resolve bugs in e2e test in windows and new module invoice-out
|
2018-02-28 15:40:52 +01:00 |
|
Juan
|
d9c54415cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-28 12:07:59 +01:00 |
|
Juan
|
a1ee22d153
|
#96 - Email validation errors fixed
|
2018-02-28 12:07:56 +01:00 |
|
Carlos Jimenez
|
884f7fe954
|
mini refactor on validateDni back end unit test
|
2018-02-28 10:02:57 +01:00 |
|
Juan
|
8ee649b9d0
|
Bug with empty value validations fixed
|
2018-02-27 22:50:14 +01:00 |
|
Juan
|
4eebdf96ee
|
Small fix before commit
|
2018-02-27 20:28:59 +01:00 |
|
Juan
|
fba637f3b3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-27 20:28:19 +01:00 |
|
Juan
|
2a06244fd6
|
Create client E2E fixed, tests for validateDni
|
2018-02-27 20:28:07 +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
|
688881fac4
|
Bug #97 - Show dash when no secured credit
|
2018-02-27 13:28:07 +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 |
|
Juan
|
3c1467ec97
|
Bug validateDni
|
2018-02-27 12:00:39 +01:00 |
|
Juan
|
4bfdf2a90f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-27 10:00:56 +01:00 |
|
Juan
|
5830a0d8f9
|
Bug #94 - FI validation
|
2018-02-27 10:00:43 +01:00 |
|
Bernat Exposito
|
665fcd3976
|
uptade ACL table and add recovery model
|
2018-02-26 14:37:01 +01:00 |
|
Juan
|
eb582b51a9
|
Bug #132 solved
|
2018-02-26 12:56:42 +01:00 |
|
Carlos Jimenez
|
9054c32aba
|
niche validation fix
|
2018-02-23 15:20:24 +01:00 |
Juan Ferrer Toribio
|
bff00dc98e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-23 13:05:00 +01:00 |
|
Juan Ferrer Toribio
|
cfc4b01fb0
|
Item tax form and service
|
2018-02-23 13:04:44 +01:00 |
|
Javi Gallego
|
f4a244398a
|
greuge con decimales y favicon
|
2018-02-23 12:51:36 +01:00 |
|
Juan Ferrer Toribio
|
fdf2f017a0
|
DB upgraded
|
2018-02-23 11:59:58 +01:00 |
|
Daniel Herrero
|
632a5209c1
|
item Tags faltan test
|
2018-02-23 08:09:09 +01:00 |
|
Vicente Falco
|
443c888d73
|
merge
|
2018-02-23 07:18:26 +01:00 |
|
Vicente Falco
|
b3d692aaa0
|
Docker nginx
|
2018-02-23 07:17:33 +01:00 |
|
Javi Gallego
|
51f8d01d24
|
Error de roles solucionado a falta de dump
|
2018-02-22 16:17:30 +01:00 |
|
Daniel Herrero
|
10e47acd6b
|
item clonation finish
|
2018-02-22 13:40:23 +01:00 |
|
Daniel Herrero
|
91b7be32fb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-22 11:20:22 +01:00 |
|
Daniel Herrero
|
43eef84ecf
|
renamed item models to kebab-case
|
2018-02-22 11:20:08 +01:00 |
|
Bernat Exposito
|
f92c6faa22
|
fixed blocking errors on e2e due to snackbar restet time plus fixtures permisions
|
2018-02-22 10:03:58 +01:00 |
|
Bernat Exposito
|
e377e9e452
|
update fixtures and mudole itemTag.json
|
2018-02-21 13:44:25 +01:00 |
|
Javi Gallego
|
41dfa9f9a1
|
creacion de ACL en diferentes modelos
|
2018-02-21 09:28:17 +01:00 |
|
Bernat Exposito
|
2daed2bda9
|
import fixtures from DB produccion and create unique index for vn2008.Articles_nicho
|
2018-02-20 15:01:59 +01:00 |
|
Daniel Herrero
|
60e2d8132b
|
itemBotanical
|
2018-02-20 14:30:02 +01:00 |
|
Daniel Herrero
|
ada3d9480b
|
bug fixed acl obervationType
|
2018-02-20 14:05:05 +01:00 |
|
Carlos Jimenez
|
6b70556320
|
acls are back to obersvation-type.json properties
|
2018-02-20 13:38:04 +01:00 |
|
Carlos Jimenez
|
4251ee20e4
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-20 12:26:29 +01:00 |
|
Carlos Jimenez
|
144d5a2bf0
|
issue 40 completed: niches
|
2018-02-20 12:25:51 +01:00 |
|
Bernat Exposito
|
4c26879fdb
|
update fixtures edi.genus/specie
|
2018-02-20 11:16:02 +01:00 |
SAMBA\bernat
|
20229cf3e1
|
update fixtures
|
2018-02-19 13:39:31 +01:00 |
|
SAMBA\bernat
|
171d0f5867
|
update changes05-articles_nicho
|
2018-02-19 13:21:15 +01:00 |
|
SAMBA\bernat
|
0f1004f5de
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-19 12:52:33 +01:00 |