Commit Graph

1198 Commits

Author SHA1 Message Date
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 ffde937022 Credit classification fixes #189 2018-03-28 15:07:48 +02:00
Gerard cf98b1303e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-28 09:30:58 +02:00
Gerard 28c80d9ed3 Tarea #212 Mostrar solo las agencias con el campo isActive(tpv) en TRUE 2018-03-28 09:30:33 +02:00
Joan Sanchez 85810e2f7e Client summary & package 2018-03-27 15:06:22 +02:00
Gerard 6b390b72f8 Tarea #212 Mostrar solo las agencias con el campo isActive(tpv) en TRUE 2018-03-27 14:28:02 +02:00
Gerard 151a19b0ba Tarea #171 Añadir revision 2018-03-27 14:26:20 +02:00
Gerard 4d1609c445 Tarea #170 Mostrar modelo ticketTracking 2018-03-27 14:24:47 +02:00
Gerard 56f774a07f Bug #210 Añadir automaticamente en el campo relevancy 2018-03-27 14:16:42 +02:00
Gerard a746d2d58f Listar modelo saleChecked 2018-03-26 15:10:51 +02:00
Gerard d773082f82 solucionado checkbox sin tag utilizando 100 de su contenedor 2018-03-26 15:02:26 +02:00
Gerard 2f052a9d28 table width: 100% 2018-03-26 15:00:43 +02:00
Gerard 5b558a9f79 Solucionado el problema de alineamiento de la columnas 2018-03-26 14:59:14 +02:00
Gerard 58c6c080eb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-26 14:57:32 +02:00
Gerard b3b874c39d Solucionado problema con el filter 2018-03-26 14:55:10 +02:00
Joan Sanchez e38999acfa Hide clear icon on disabled components autocomplete and textfield 2018-03-26 12:24:34 +02:00
Carlos Jimenez d29dcf2e11 #195 listar lineas de ticket componente fetched-tags 2018-03-23 16:50:11 +01:00
Carlos Jimenez 8c07288378 seccion mana creada 2018-03-23 12:21:26 +01:00
Javi Gallego e651619714 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-23 11:32:40 +01:00
Gerard 4926ad7e01 Move padding tag to card.html 2018-03-23 11:33:54 +01:00
Javi Gallego 3ebf2039fc nuevo icono en el login 2018-03-23 11:32:31 +01: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 e927826646 pending translates 2018-03-22 16:45:41 +01:00
Carlos Jimenez 0c4246847b #182 files preparation for ticket volume 2018-03-22 15:06:21 +01:00
Carlos Jimenez d57dbe2224 #208 ticket expedition e2e path plus some ticket volume files preparation and refactors 2018-03-22 15:01:36 +01:00
Carlos Jimenez 43c412beeb çMerge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-22 12:40:18 +01:00
Gerard 0ae7c4822f Delete padding 2018-03-22 12:35:00 +01:00
Carlos Jimenez 8c631012b1 ticket notes logic refactor plus unit tests 2018-03-22 10:57:55 +01:00
Carlos Jimenez f7cac19be4 merge conflict 2018-03-21 15:56:20 +01:00
Carlos Jimenez 613054e29f #184 listar modelo expeditions 2018-03-21 15:51:09 +01:00
Joan Sanchez a9c690a48c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-21 14:55:10 +01:00
Joan Sanchez 7aeed467e9 Quantity validation on ticket packaging 2018-03-21 14:54:12 +01:00
Gerard 735544aed6 Mostrar modelo ticketTracking 2018-03-21 12:56:18 +01:00
Joan Sanchez ff047559e3 Ticket packaging 2018-03-21 11:08:59 +01:00
Javi Gallego ee6137c8e0 Ahora el acceso web lo puede modificar employee 2018-03-21 09:06:05 +01:00
Javi Gallego cec2b2a3a5 creacion de item con busqueda por codigo de tipo y de intrastat 2018-03-21 08:59:18 +01:00
Javi Gallego d4e3855b0d rutas vacias de sale 2018-03-20 14:45:39 +01:00
Javi Gallego e93daa9299 modelo sale con hasMany 2018-03-20 14:01:46 +01:00
Javi Gallego c0014ef468 merge de rutas 2018-03-20 13:53:01 +01:00
Javi Gallego 7e71e8c08c permisos de cambio de comercial 2018-03-20 13:20:17 +01:00
Juan ffe216f630 vnPopover bugfix 2018-03-20 11:28:41 +01:00
Carlos Jimenez e08fd21f4c #203 add isFrozen to fiscal data form 2018-03-19 17:46:28 +01:00
Juan 1c8b541e83 vnPopover code clean, vnSearchbar popover bugs solved 2018-03-17 20:59:02 +01:00
Juan 378f053b18 vnAutocomplete behavior modified to act like ms access combo 2018-03-17 13:17:48 +01:00
Carlos Jimenez 7bbc83832b spanish traduction for #179 ticket notes 2018-03-16 15:53:29 +01:00
Carlos Jimenez 31df9ec0e2 fixed all e2e paths 2018-03-16 15:09:04 +01:00
Carlos Jimenez 945a1b3049 corrected bug on all htmls using crud 2018-03-16 15:08:36 +01:00
Carlos Jimenez ece2fd384d #179 listar notas de ticket 2018-03-16 15:06:42 +01:00
Vicente Falco a218e50658 interface ticket Revision 2018-03-16 08:56:40 +01:00
Joan Sanchez af2fca3879 Ticket packages, moved Item model to loopback service 2018-03-15 14:36:09 +01:00
Daniel Herrero 2877ec05cc mock ticketItem 2018-03-14 14:26:25 +01:00
Daniel Herrero e6a8b34fe4 filter tickets 2018-03-14 13:59:01 +01:00
Daniel Herrero 82949b42b5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 12:12:12 +01:00
Daniel Herrero c21efeeb63 ticket summary structure 2018-03-14 12:12:06 +01:00
Javi Gallego 19870a7732 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 12:04:09 +01:00
Daniel Herrero 6df5f1c3fa Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-14 11:41:22 +01:00
Daniel Herrero 856fc64742 frontEnd ticket module file system 2018-03-14 11:41:19 +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
Javi Gallego 93baddbfc2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-13 17:39:16 +01:00
Javi Gallego 2ef22e7e83 indice con mas tamaño 2018-03-13 16:25:24 +01:00
Daniel Herrero 9d46009e2b remove old template in autocomplete 2018-03-13 14:53:52 +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 fa9f8a79a8 vnAutocomplete filter fixes 2018-03-13 13:55:21 +01:00
Juan 75c1dd886d vnAutocomplete fixes 2018-03-13 13:41:54 +01:00
Juan 06e9c97b3e vnDropDown positioning bug fixed 2018-03-13 13:21:53 +01:00
Juan d8b39ea5ac Missing $inject fixed 2018-03-13 13:15:06 +01:00
Juan 3fd4e29429 vnTextarea style fix, new component vnMenu wich extends vnPopover 2018-03-13 12:07:28 +01:00
Juan 5c9dab163d Added client ticket module 2018-03-12 14:02:29 +01:00
Javi Gallego 3dac1be401 Modificacion de traduccion mas apropiada 2018-03-12 12:58:29 +01:00
Juan b952ab502a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-12 12:31:52 +01:00
Juan 6eed9f081b vnPopover refactor: code duplications removed, improved style 2018-03-12 12:31:50 +01:00
Carlos Jimenez edf2e61bd0 #168 client permissions plus e2e path verified data update 2018-03-12 11:10:05 +01:00
Carlos Jimenez ca2b84f73c fixed descriptor test 2018-03-12 10:23:24 +01:00
Javi Gallego fc2ea2b33b Quito sigle binding :: porque no ordenaba 2018-03-09 19:57:29 +01:00
Carlos Jimenez db88d00560 #156 client descriptor icons missing correct icons 2018-03-09 16:44:18 +01:00
Juan c9ba1d00e4 Dropdown fixes 2018-03-09 15:09:54 +01:00
Juan fbd6a5d58a vnDropDown style fixes 2018-03-09 15:04:25 +01:00
Juan 6cc6703002 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-09 14:59:14 +01:00
Juan ae3ff3c25c vnDropDown style fixes 2018-03-09 14:59:08 +01:00
Javi Gallego b260157171 recobro añadir candado #158 faltan los test de front 2018-03-09 14:54:25 +01:00
Juan 839fffb8fa Dropdown style fixes 2018-03-09 14:53:31 +01:00
Javi Gallego c0fbfa458e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-09 14:51:50 +01:00
Juan b5bc7f24c4 Style fixes 2018-03-09 14:20:36 +01:00
Juan bbcd39f30d #135 Refactor vnAutocomplete 2018-03-09 14:15:30 +01:00
Daniel Herrero 80b22a4e7d Bug #157 Sumario de item mostrar iva 2018-03-08 09:47:56 +01:00
Daniel Herrero 94bbbef2d0 Bug fixed address observations 2018-03-08 08:14:49 +01:00
Carlos Jimenez 6eaaa6dde5 #148 client web-access task 2018-03-07 15:05:09 +01:00
Carlos Jimenez 1e48f4a4a9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-07 14:55:42 +01:00
Javi Gallego cfccd71ca3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-07 14:19:39 +01:00
Daniel Herrero 43bfbf3f4b front unit test fixed 2018-03-07 13:42:15 +01:00
Daniel Herrero 78f893b811 Bug #124 address observations validations 2018-03-07 13:34:34 +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 60e4ca132a #155 web access functionality completed 2018-03-07 12:24:47 +01:00
Daniel Herrero 0bf4e292a1 recuperados los estilos borrados para los inputs 2018-03-07 08:05:55 +01:00
Javi Gallego d12524d045 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-06 13:09:15 +01:00
Javi Gallego 4c7ba9859c anguar inject minimify fixed factor VnPatch 2018-03-06 13:08:39 +01:00
Carlos Jimenez 8ee3c18cbc removed unused code 2018-03-06 13:02:28 +01:00
Javi Gallego ffee716409 Revert "Merge branch 'test' into dev"
This reverts commit b6091775e5, reversing
changes made to 42f1e1ec6f.
2018-03-06 13:01:05 +01:00
Javi Gallego b6091775e5 Merge branch 'test' into dev 2018-03-06 12:48:22 +01:00
Javi Gallego 2a5efb04ae angular inject minimify fixed factor VnPatch 2018-03-06 12:44:10 +01:00
Carlos Jimenez 42f1e1ec6f #114 style 2018-03-06 12:08:25 +01:00
Carlos Jimenez bc13abbe50 #114 mostrar current user en la top bar 2018-03-06 11:13:05 +01:00
Joan Sanchez 24abbffba7 Client summary updated 2018-03-05 10:56:51 +01:00
Carlos Jimenez bdc0e5ddc1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-03-02 14:46:04 +01:00
Juan 8970662ff8 Redundant LDAP authentification test 2018-03-02 14:34:44 +01:00
Juan d9a75acde0 LDAP authentification test 2018-03-02 14:31:15 +01:00
Carlos Jimenez 56a32343fd style fix 2018-03-02 13:00:01 +01:00
Carlos Jimenez b23617fcfb item tag unit tests 2018-03-02 10:54:03 +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
Juan 4a473f5c0f Style fix 2018-03-01 23:49:01 +01:00
Juan 2c4fed4938 Style fixes 2018-03-01 23:41:27 +01:00
Juan 128c0d0ea3 vnCard style bug fixed 2018-03-01 23:38:14 +01:00
Juan 127c5e6c02 Style fixes 2018-03-01 21:54:18 +01:00
Juan 4b12411d6b Style fixes 2018-03-01 21:18:43 +01:00
Juan 98388dde85 Image zoom bugs solved 2018-03-01 19:35:32 +01:00
Juan e713ce01b4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 16:52:47 +01:00
Juan c0f34bdd37 #142 & #143 - New descriptors header 2018-03-01 16:52:35 +01:00
Daniel Herrero e683ee66c1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 14:48:09 +01:00
Daniel Herrero 40e2b73e7c tarea #105 in progress 2018-03-01 14:48:02 +01:00
Juan 9881c4e6f3 Merge 2018-03-01 14:04:33 +01:00
Juan de145bd814 #128 - Client invoices form 2018-03-01 14:01:45 +01:00
Joan Sanchez 52503c1015 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 13:53:16 +01:00
Joan Sanchez 5dc7b0bb58 Client summary 2018-03-01 13:53:11 +01:00
Daniel Herrero 77b20ae764 clientIndex unit test fixed 2018-03-01 13:26:54 +01:00
Daniel Herrero a78292ffb8 merge conflicts 2018-03-01 12:55:07 +01:00
Daniel Herrero b92f8bdd43 tarea #105 esturcctura montada, falta rellenar datos 2018-03-01 12:51:35 +01:00
Javi Gallego 4ee4c07b19 Bug #125 Modelo item 2018-03-01 12:47:51 +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
Juan 3d4ff56888 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-03-01 11:36:48 +01:00
Daniel Herrero 465d210b51 bug 103 falcar cliente, acl condicionales 2018-03-01 10:54:02 +01:00
Juan e6c44d74eb Client invoices 2018-02-28 20:55:44 +01:00
Juan b3037e2db9 Addresses E2E fixed 2018-02-28 13:07:58 +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
Daniel Herrero 50fb035dd9 Bug #108 tooltip outsides 2018-02-28 09:12:48 +01:00
Juan 8ee649b9d0 Bug with empty value validations fixed 2018-02-27 22:50:14 +01:00
Carlos Jimenez cf77d05156 fixed a merge conflit problem 2018-02-27 14:39:50 +01:00
Carlos Jimenez cdfc2a6779 solved merge comflics with item tags 2018-02-27 13:40:33 +01:00
Carlos Jimenez 701e6f9976 completed task #144 tem tags bugs 2018-02-27 13:31:45 +01:00
Juan 688881fac4 Bug #97 - Show dash when no secured credit 2018-02-27 13:28:07 +01:00
Carlos Jimenez 33f19949d8 fixed item tags plus added watcher to niches 2018-02-27 12:32:47 +01:00
Daniel Herrero 5b928f3e04 itemtags i18n 2018-02-27 08:14:28 +01:00
Daniel Herrero 687b011f9a minWatcher in tags 2018-02-27 08:09:51 +01:00
Daniel Herrero e048402223 itemTag added priority 2018-02-27 07:54:41 +01:00
Carlos Jimenez 4e5cbef155 corrected error message when tags are repeated 2018-02-26 17:34:40 +01:00
Carlos Jimenez 456e63700f removed unused code from item niche 2018-02-26 17:32:23 +01:00
Carlos Jimenez c0106b11d2 fixed BUG in #123 item tags 2018-02-26 16:49:44 +01:00
Juan f9d6d63b6b #124 Validación de la description en observaciones de direcciones 2018-02-26 14:23:26 +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
Daniel Herrero 632a5209c1 item Tags faltan test 2018-02-23 08:09:09 +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 b999254433 ItemSummary into dialog 2018-02-22 08:18:57 +01:00
Daniel Herrero b5611d0cc5 refactor vnTooltip 2018-02-21 13:42:47 +01:00
Daniel Herrero 027c19f5c5 bug fixed itemData 2018-02-21 13:15:50 +01:00
Daniel Herrero d69954bb36 itemBotanical fixed with test 2018-02-21 13:10:23 +01:00
Daniel Herrero 8d5b329839 bug fixed in getModifiedData 2018-02-21 12:36:37 +01:00
Daniel Herrero 626a0ec7ca custom icons v1 2018-02-21 11:41:22 +01:00
Daniel Herrero ade0e3beb0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-21 11:11:18 +01:00
Daniel Herrero a153005a79 bugs fixed with itemBotanical model 2018-02-21 11:10:00 +01:00
Daniel Herrero f1f8c74175 refactor watcher added requiredField 2018-02-21 11:09:27 +01:00
Javi Gallego 26b8bcfe94 cambio de los permisos del menu 2018-02-21 09:43:13 +01:00
Javi Gallego 41dfa9f9a1 creacion de ACL en diferentes modelos 2018-02-21 09:28:17 +01:00
Daniel Herrero c983859cde bug fixed ItemBotanical 2018-02-21 08:44:00 +01:00
Daniel Herrero 7ab1a8852b itemSummary 2018-02-20 14:51:46 +01:00
Daniel Herrero 60e2d8132b itemBotanical 2018-02-20 14:30:02 +01:00
Juan Ferrer Toribio 7c3efd40d5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 13:48:37 +01:00
Juan Ferrer Toribio e491b2a7b3 E2E merge 2018-02-20 13:48:25 +01:00
Daniel Herrero 93134cb39f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 12:58:10 +01:00
Daniel Herrero 099d7ff7fe fixed unit test in ItemCard 2018-02-20 12:58:00 +01:00
Carlos Jimenez a70f65f0b9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-20 12:33:44 +01:00
Daniel Herrero 5f07fab6cf item-summary 2018-02-20 12:33:17 +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 09508aaef1 acls for niches 2018-02-20 12:26:09 +01:00
Carlos Jimenez 144d5a2bf0 issue 40 completed: niches 2018-02-20 12:25:51 +01:00
Daniel Herrero ecc513272f refactor itemBotanical and item 2018-02-20 11:10:54 +01:00
Juan Ferrer Toribio 1dfafe0d44 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-20 10:00:26 +01:00
Juan Ferrer Toribio eb0276183f E2E refactor, Snackbar with hide button, Dialog, bugs solved 2018-02-20 10:00:19 +01:00
Daniel Herrero a3985e70ed Tarea #37 ItemBotanical 2018-02-20 08:53:06 +01:00
Carlos Jimenez feabfc05d6 html indent refactors 2018-02-19 20:52:07 +01:00
Carlos Jimenez dcf5bf61da backend unit test for barcode duplicity plus e2e path completed 2018-02-19 11:55:45 +01:00
Daniel Herrero 6fe1f96ef3 Bug fixeds and merge with test 2018-02-15 14:37:54 +01:00
Daniel Herrero 1b4fd50929 Bugs fixed: postalCode, credit list and validate DNI 2018-02-15 13:04:48 +01:00
Daniel Herrero a1dd3e1a77 Bug fixed postalCode in Adresses 2018-02-15 11:44:03 +01:00
Daniel Herrero 81b374d744 Merge conflicts 2018-02-15 10:51:31 +01:00
Carlos Jimenez 0354628324 acl for item barcode 2018-02-15 08:49:58 +01:00
Carlos Jimenez 79c4aac3f5 corrected indentation on routes.json and added one path to services tests js 2018-02-14 15:56:22 +01:00
Carlos Jimenez bde655bd1e merge 2018-02-14 14:32:26 +01:00
Carlos Jimenez 6e1d3135d5 mini refactor on routes.json and crudAddressObervations 2018-02-14 14:24:14 +01:00
Carlos Jimenez 61cd4acca5 item-barcode functionality plus front end tests 2018-02-14 14:22:35 +01:00
Daniel Herrero ca03005e10 test fixed 2018-02-14 14:05:02 +01:00
Daniel Herrero 21cc4e3320 semantic refactor 2018-02-14 14:04:47 +01:00
Javi Gallego 225508dd07 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:34:47 +01:00
Javi Gallego aadf763e76 refactor html 2018-02-14 11:33:21 +01:00
Daniel Herrero a4341b3682 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-14 11:21:23 +01:00
Daniel Herrero 9c9015a197 zoomImage test fixed 2018-02-14 11:21:14 +01:00
Javi Gallego 8130b35434 Tarea #62 abre foto en otra pestaña 2018-02-14 10:56:41 +01:00
Javi Gallego 48f0554a6a Tarea #62 link a la foto 2018-02-14 10:06:51 +01:00
Juan Ferrer Toribio e4595da2a7 E2E test partially fixed 2018-02-14 10:03:00 +01:00
Daniel Herrero 20506bdc59 re-refactor zoomImage 2018-02-14 09:25:41 +01:00
Daniel Herrero 087b1d9a61 refactor zoomImage 2018-02-14 09:21:43 +01:00
Juan Ferrer Toribio 8be4e0fb1f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 22:40:17 +01:00
Juan Ferrer Toribio 72830652b4 Documented Gulpfile, improved 'docker-wait' to handle errors 2018-02-13 22:40:02 +01:00
Javi Gallego 595cbfbed6 quitado el antiguo campo de iva 2018-02-13 14:19:06 +01:00
Javi Gallego a50c3d565e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 13:29:28 +01:00
Daniel Herrero 5565b7daa4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-13 13:15:17 +01:00
Daniel Herrero d964f7efaa SPR1.3 TASK#36 - zoom image 2018-02-13 13:15:03 +01:00
Carlos Jimenez c99f22430b mini refactor filter panel 2018-02-13 11:41:39 +01:00
Carlos Jimenez 0bcc638af7 mini refactor on address edit 2018-02-13 09:32:07 +01:00
Juan Ferrer Toribio 4c76718bce Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-12 13:17:00 +01:00
Juan Ferrer Toribio c4b184e5e8 vnCheck componentized, Client style changes 2018-02-12 13:16:49 +01:00
Javi Gallego b5db0abbf1 Creacion sin relevancy y acl de clientObservation 2018-02-12 12:02:00 +01:00
Carlos Jimenez 813e160499 pagination for item log plus more fixtures 2018-02-12 12:01:39 +01:00
Juan Ferrer Toribio 88d50e3d00 Core refactor, first step 2018-02-10 16:18:01 +01:00
Juan Ferrer Toribio 8852bfd4bb Bug solved: Modules are not loaded when language is not recognized 2018-02-10 11:41:29 +01:00
Carlos Jimenez 32cd96b443 item history now shows descriptions acction changed by and date order or collumns 2018-02-08 14:52:24 +01:00
Daniel Herrero 5ac17fe8de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 13:28:12 +01:00
Daniel Herrero 6387f6cedb noteCreate fixed 2018-02-08 13:28:01 +01:00
Juan Ferrer Toribio f7ea8e6435 watcher lint 2018-02-08 13:13:42 +01:00
Daniel Herrero d0432140d7 create address fixed 2018-02-08 12:57:57 +01:00
Carlos Jimenez 013880cb0a item history html completed 2018-02-08 12:25:51 +01:00
Daniel Herrero 4ec0a3c46d item history 2018-02-08 12:04:33 +01:00
Daniel Herrero 71eaa53dae generic class to list models into view with mg-crud 2018-02-08 12:04:17 +01:00
Javi Gallego 378c04b123 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-08 09:44:32 +01:00
Daniel Herrero a3917aae32 addresses list improvement 2018-02-08 09:04:29 +01:00
Daniel Herrero a83bae465f new tests added into address-edit 2018-02-08 07:54:20 +01:00
Carlos Jimenez 03faa09284 item history functionality, awaiting for clientfilters refactor 2018-02-07 15:06:21 +01:00
Daniel Herrero 2cc6dfd553 changes in last test 2018-02-07 14:48:11 +01:00
Daniel Herrero a2fb33963b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-07 14:47:16 +01:00
Daniel Herrero 87d423fd52 new testing in address-edit 2018-02-07 14:47:08 +01:00
Javi Gallego 220baa717e roles de credito y greuges 2018-02-07 14:16:11 +01:00
Carlos Jimenez 3d7d0762b6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-07 13:49:05 +01:00
Carlos Jimenez de9f7a5545 item history 2018-02-07 13:48:55 +01:00
Daniel Herrero d251227107 changes in logic address-edit 2018-02-07 13:26:21 +01:00
Daniel Herrero fb9ba713bd addresses observations finish 2018-02-07 13:10:22 +01:00
Carlos Jimenez 93ef3c7fea item history js files implementation 2018-02-07 08:49:27 +01:00
Carlos Jimenez 8de88aa046 small refactor on greuge list and fixtures 2018-02-07 08:47:04 +01:00
Carlos Jimenez 86aab2ca31 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 16:23:22 +01:00
Daniel Herrero 7eee1cad50 address observations crud created 2018-02-06 15:09:31 +01:00
Carlos Jimenez 335847358f fixtures addition plus item en.yml created 2018-02-06 14:03:09 +01:00
Carlos Jimenez e690a72dfe Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 10:55:49 +01:00
Daniel Herrero fd4b427518 bug fixed watcher 2018-02-06 09:33:37 +01:00
Carlos Jimenez 8f6f7fb2a3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-02-06 09:08:02 +01:00
Carlos Jimenez 9c39974380 added expenses to create item form 2018-02-06 09:07:40 +01:00
Daniel Herrero 806734fb13 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-02-06 07:01:47 +01:00
Carlos Jimenez d24058bab1 front unit tests for item card, item create and started over production index 2018-02-05 16:53:41 +01:00
Carlos Jimenez d77faf8e47 removed unused code from autocomplete spec and fixed a broken test from drop-down 2018-02-05 13:58:13 +01:00
Carlos Jimenez 1a1f861205 front unit tests for address-edit, fiscal-data and removed spec file for search-panel as theres nothing to test anymore 2018-02-05 10:58:49 +01:00
Juan Ferrer Toribio 89c745244a YAML configuration, client module register simplified 2018-02-04 19:39:56 +01:00
Juan Ferrer Toribio 3e2e2f3c3a Client i18n now uses YAML format 2018-02-04 15:46:46 +01:00
Carlos Jimenez 249052cc12 item descriptor shows max 4 tags 2018-02-02 12:32:44 +01:00
Daniel Herrero f78f1413bd merge conflicts 2018-02-01 14:34:50 +01:00
Daniel Herrero 51cc783521 side front address observations 2018-02-01 13:28:45 +01:00
Juan Ferrer Toribio aae0cd9128 Merge 2018-02-01 12:55:06 +01:00
Carlos Jimenez 4a2418eb7c removed unused code from the compile method on focus front unit tests 2018-02-01 11:28:41 +01:00
Carlos Jimenez 03116ed595 item descriptor now shows itemTags ordered by priority 2018-02-01 10:05:20 +01:00
Juan Ferrer Toribio 3d6f9fbbca Backend tests refactor, bug fixes 2018-01-31 12:17:17 +01:00
Juan Ferrer Toribio 109f04c517 Merge 2018-01-30 16:34:32 +01:00
Juan Ferrer Toribio 7d7d179bdd Fontend tests fixed 2018-01-30 14:48:21 +01:00
Daniel Herrero 90fab7b01a address observations, list and view edit (TODO save) 2018-01-30 14:47:47 +01:00
Daniel Herrero 7eab262175 CRUD item basic data finish 2018-01-30 08:59:43 +01:00
Juan Ferrer Toribio f688090cba i18n on backend, improved backend error handling, redundant model-config removed 2018-01-29 19:57:00 +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
Carlos Jimenez 28096df321 nightmare controlles now the snackbarTimeout with nightmareModifiers.js plus small db update 2018-01-26 08:01:26 +01:00
Daniel Herrero d49e497b15 item card v.1 2018-01-25 14:49:21 +01:00
Daniel Herrero 64b3d3107d item module only accessible by developers 2018-01-25 14:14:58 +01:00
Daniel Herrero 84e15ae80c moved card style 2018-01-25 14:12:45 +01:00
Daniel Herrero e4cb7f7fdf new style for disabled inputs 2018-01-25 14:05:50 +01:00
Daniel Herrero abed869052 onErrorSrc directive for images 2018-01-25 13:37:27 +01:00
Daniel Herrero e6bba9e20e global var snackbarTimeout for e2e 2018-01-25 11:35:41 +01:00
Carlos Jimenez 4b8eb3de85 timeout removed 2018-01-24 09:06:04 +01:00
Daniel Herrero 986abe9e5a autocomplete setDirty form 2018-01-24 08:42:57 +01:00
Daniel Herrero c3c31884a6 todo set autocomplete dirty 2018-01-23 15:04:16 +01:00
Carlos Jimenez b068abc101 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-18 15:27:51 +01:00
Carlos Jimenez 300f3d543a corrections 2018-01-18 15:27:35 +01:00
Daniel Herrero e52bb28e2e modulo items: estructura de carpetas y archivos basicos 2018-01-18 08:38:04 +01:00
Daniel Herrero c4ff568ec8 model expense create and added into Item's basic data view 2018-01-17 14:28:06 +01:00
Daniel Herrero 78e5dd3109 test fixed for watcher 2018-01-17 10:42:54 +01:00
Daniel Herrero 260830dc95 watcher mira dirty antes de ver si los datos cambian 2018-01-17 09:13:44 +01:00
Daniel Herrero 8f9f14239e ficha cliente muestra los campos vacios 2018-01-17 09:00:41 +01:00
Daniel Herrero 7503179cb8 merge conflict 2018-01-16 13:56:09 +01:00
Daniel Herrero 397a764dc7 refactor de dropdown, textfield, focus y navegacion por tabs 2018-01-16 13:54:21 +01:00
Carlos Jimenez d20c38e21e greuge-create.js client unit tests 2018-01-15 09:39:06 +01:00
Carlos Jimenez 9240c36685 added property name to the html form for the watcher to show the right error messages when the form is empty 2018-01-11 22:18:38 +01:00
Carlos Jimenez 5f1c0a0e5a validations bug of add consignee fixed plus e2e greuge path tests 2018-01-11 15:25:03 +01:00
Carlos Jimenez f6314d0c2b removed a console log :D 2018-01-11 13:24:40 +01:00
Carlos Jimenez d9438e6b77 form validations now validates imputs being empty when dirty plus e2e updated tests for it. 2018-01-11 13:16:39 +01:00
Daniel Herrero 5486413a0a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-10 14:09:14 +01:00
Daniel Herrero 410bed4c8b test fixed datePicker 2018-01-10 14:08:56 +01:00
Carlos Jimenez 96a0b0dd3a Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-10 14:04:08 +01:00
Carlos Jimenez b2bfcb7b3f docker container time correction plus small refactor on validator.js 2018-01-10 14:03:52 +01:00
Daniel Herrero 586ad2911c item create 2018-01-10 12:49:52 +01:00
Daniel Herrero 1a772978b0 eliminados los segundos de la fecha en greuge 2018-01-10 11:29:41 +01:00
Daniel Herrero 9d5ae5a665 greuge shipped with time 2018-01-10 10:48:02 +01:00
Daniel Herrero 027cc84d6f validacion para enteros 2018-01-10 08:07:40 +01:00
Daniel Herrero beed136e3c item validations 2018-01-09 14:54:18 +01:00
Daniel Herrero 9ea6be5333 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-01-09 14:21:44 +01:00
Daniel Herrero dd1b8655a5 dropDown error corregido cuando el servidor tarda en responder 2018-01-09 14:21:17 +01:00
Carlos Jimenez 268162c3f7 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-09 13:53:54 +01:00
Carlos Jimenez c3d6a9c043 fixed client observations to apply eslint rules plus bug fixed in datePicker 2018-01-09 13:53:21 +01:00
Daniel Herrero 628c77a440 bug fixed watcher 2018-01-09 13:52:20 +01:00
Daniel Herrero 234f187139 watcher save method to lowercase 2018-01-09 13:51:17 +01:00
Carlos Jimenez 245025453a translation for amount 2018-01-09 13:50:39 +01:00
Daniel Herrero b1afc20b95 refactor watcher 2018-01-09 13:49:15 +01:00
Daniel Herrero 37af88ee19 watcher bug fixed 2018-01-09 09:50:08 +01:00
Daniel Herrero deddbccae4 bug fixed in fullEmpty function 2018-01-09 09:00:34 +01:00
Carlos Jimenez 22d482f1c6 gulp task created to run fixtures before e2e tests 2018-01-08 09:42:16 +01:00
Carlos Jimenez c1e798790f e2e path for add credit and gulp tasks for faster fixtures in progress 2018-01-08 08:12:39 +01:00
Carlos Jimenez b3ddeaf4a7 credit refactor to build employee name and surname on client side 2018-01-05 08:06:21 +01:00
Carlos Jimenez f1202a318e client side unit test for aclService 2018-01-04 07:56:26 +01:00
Carlos Jimenez 50dd055c99 removed the timeout 400 of the snackbar as it shouldnt be hardcoded 2018-01-02 14:51:39 +01:00
Carlos Jimenez 67d99e788e unit tests for valudation > validator inclusion, exclusion and format 2018-01-02 14:49:11 +01:00
Carlos Jimenez b172f12ff6 validation unit tests for absence, length and numericality 2018-01-02 14:10:17 +01:00
Carlos Jimenez 86630be398 validation unit tests for validation > validator presence plus small refactor on validator 2018-01-02 08:26:46 +01:00
Carlos Jimenez 12b3342953 validation Presence() unit tests for ng-invalid class 2018-01-02 08:17:40 +01:00
Carlos Jimenez 8c6131322f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-01-02 08:06:47 +01:00
Carlos Jimenez f2872da4db validation client side unit tests 2018-01-02 08:05:50 +01:00
Joan Sanchez e94d29f97b Errores de renderización imágenes adjuntas. Escritos de cliente deutor. 2017-12-26 10:02:47 +01:00
Daniel Herrero 9e44803c66 New module Item in progress 2017-12-21 14:09:55 +01:00
Daniel Herrero 424f607063 refactor watcher 2017-12-21 14:09:16 +01:00
Daniel Herrero 862420e434 new generic function 2017-12-21 14:09:02 +01:00
Daniel Herrero 86209e43cd card item structure 2017-12-20 14:36:12 +01:00
Daniel Herrero 7acb047ec9 Item: interfaz crear item 2017-12-20 12:40:29 +01:00
Daniel Herrero 75c77fcdc6 filtro de items 2017-12-20 12:20:59 +01:00
Daniel Herrero bd80c9cbe0 locale list item 2017-12-19 15:00:15 +01:00
Daniel Herrero 29c75d3d8d model Itemype added 2017-12-19 14:58:14 +01:00
Daniel Herrero adb2f60fef list item widht image forced by css 2017-12-19 14:33:01 +01:00
Daniel Herrero 5bc375d324 list items with images 2017-12-19 14:28:19 +01:00
Daniel Herrero 55691b4cc9 nuevo micro servicio Item 2017-12-19 12:29:35 +01:00
Daniel Herrero 2c03dcf139 renamed item module 2017-12-19 11:25:45 +01:00
Daniel Herrero 37bdd9d2b6 rename new module article to item 2017-12-19 11:24:24 +01:00
Daniel Herrero f0c9b2beca new module articles, structure 2017-12-19 11:05:07 +01:00
Daniel Herrero c04020d0e7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-12-14 15:09:46 +01:00
Daniel Herrero 3e1d6ee4e5 bug fixed in address pagination 2017-12-14 15:08:07 +01:00
Carlos Jimenez 868a76756e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2017-12-14 14:57:54 +01:00
Carlos Jimenez 3bffedf86d refactor on all e2e paths plus addresses path test for EQtax propagation 2017-12-14 14:56:20 +01:00
Daniel Herrero e2d3daf6ea removed attr style from html 2017-12-14 14:28:54 +01:00
Daniel Herrero 59061927c6 new style in client 2017-12-14 13:48:29 +01:00
Daniel Herrero c9ff880591 style bug fixed in descriptor 2017-12-14 13:29:18 +01:00
Daniel Herrero 34953e3a71 arreglado teste del nuevo descriptor para client 2017-12-14 12:43:28 +01:00
Daniel Herrero 3ec5594e71 new client descriptor 2017-12-14 10:11:34 +01:00
Daniel Herrero da3fd1672d create greuge with intial data 2017-12-13 15:13:13 +01:00
Daniel Herrero b56ec520cf datePicker test 2017-12-13 14:19:21 +01:00
Daniel Herrero afa4f6532f corregido test de datePicker 2017-12-13 14:14:44 +01:00
Daniel Herrero b8f50b64da Componente datePicker añadido atributo todate, (hoy como fecha por defecto) 2017-12-13 14:11:48 +01:00
Daniel Herrero 9fe0aadff8 modelos con inicial mayuscula 2017-12-13 13:40:21 +01:00
Daniel Herrero 2680bc52ec Test fixed for columnHeader 2017-12-13 12:47:19 +01:00
Daniel Herrero 0e11cb8b47 cabecera para listas, flechas para las columnas ordenables 2017-12-13 12:34:53 +01:00
Daniel Herrero b8a6340afd [R12 - T16] REST para mandatos 2017-12-13 08:24:14 +01:00
Daniel Herrero 786d321794 Tarea #14 Interfaz lista mandatos 2017-12-13 08:04:53 +01:00
Daniel Herrero 7f0dc42500 nuevo refactor a dropDown 2017-12-12 14:14:32 +01:00
Daniel Herrero 5c54550283 refactorizacion de production, menos watchers 2017-12-12 14:00:02 +01:00
Daniel Herrero 93c915ec26 bug corregido para anterior refactor en dropDown 2017-12-12 13:59:31 +01:00
Daniel Herrero 6d1bbfe6c2 refactoring de dropDown, ya no watchea si no está abierto 2017-12-12 13:38:23 +01:00
Carlos Jimenez de71e5a454 translations for some form fields 2017-12-11 12:41:55 +01:00
Carlos Jimenez 92fe65b898 repairs on e2e tests completed plus Fiscal Data Path completed 2017-12-07 13:35:40 +01:00
Carlos Jimenez 08bfb80912 refactor to fix and update testing fixtures 2017-12-05 11:21:48 +01:00
Javi Gallego f575a6b570 merge descriptor 2017-12-04 08:22:50 +01:00
Javi Gallego 8755d4846a merge 2017-12-04 08:17:29 +01:00
Daniel Herrero d1eacedcc1 credito en card 2017-11-30 14:48:47 +01:00
Daniel Herrero 30d59a6843 tests fixed 2017-11-30 14:05:47 +01:00
Daniel Herrero c8dcf2b971 posibilidad de añadir paramateros a las rutas 2017-11-30 14:00:07 +01:00
Daniel Herrero 7d32f95c23 creada clase para listar modelos relacionados con el modelo cliente 2017-11-30 13:37:21 +01:00
Daniel Herrero c8b510f09f quitado el credito de la vista forma de pago 2017-11-30 13:01:11 +01:00
Daniel Herrero 7d8c28f9d3 added test to dropDown 2017-11-30 10:16:33 +01:00
Daniel Herrero ea9c5f3457 tests arreglados 2017-11-30 10:13:34 +01:00
Daniel Herrero 83301070e7 created quitado desde lado cliente 2017-11-30 09:37:13 +01:00
Daniel Herrero 1416cab07a greuge ya crea 2017-11-30 09:33:32 +01:00
Daniel Herrero 4667b39b1a bug fixed in datePicker, onclick action added 2017-11-30 08:10:44 +01:00
Daniel Herrero 78f4685001 mejora visual en las listas de credito y greuge 2017-11-30 07:41:14 +01:00
Daniel Herrero d5550c3402 greuge list 100% and create 90% 2017-11-29 14:14:08 +01:00
Daniel Herrero 03d4e2f470 correccion visual en lista de creditos 2017-11-29 11:41:14 +01:00
Daniel Herrero 261d9408ee credit list terminado 2017-11-29 09:42:59 +01:00
Daniel Herrero d816853b6c column-header posibilidad de columna no ordenable 2017-11-29 09:37:08 +01:00
Daniel Herrero 9638f5b529 ruta acceso greuge y objetos 2017-11-29 07:36:02 +01:00
Daniel Herrero d3e7f3eca2 Crear credito 2017-11-28 13:59:16 +01:00
Daniel Herrero f76a258fce client credit list terminado 2017-11-28 13:21:26 +01:00
Daniel Herrero a44d39f040 identación en listado de credito 2017-11-28 12:58:54 +01:00
Daniel Herrero 9df3d30c40 listado de crédito de cliente 2017-11-28 12:58:05 +01:00
Daniel Herrero 438c573ec1 internacionalizacion menu izquierda client 2017-11-28 12:57:51 +01:00
Daniel Herrero 005c8072b9 Production: al filtrar persiste el orden 2017-11-28 09:24:59 +01:00
Joan Sanchez 09d788faaa Escritos, servicio print 2017-11-27 15:08:18 +01:00
Javi Gallego a16f8b29c2 vnCard con nuevo formato 2017-11-24 07:39:05 +01:00
Daniel Herrero c386b6aaea actualizacion de la material design cuando un elemento está bloquedo por ACL 2017-11-23 14:53:37 +01:00
Daniel Herrero 7cb64edf04 ajustes de etiquetas html y css 2017-11-23 14:09:38 +01:00
Daniel Herrero 00bd4a7696 nuevo comportamiento para dropDown, abrir arriba 2017-11-23 14:07:55 +01:00
Daniel Herrero 5ad2c70400 bug fixed in production and production filters 2017-11-23 08:35:17 +01:00
Daniel Herrero bd5e2a5d91 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-22 13:10:40 +01:00