Commit Graph

1539 Commits

Author SHA1 Message Date
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
Daniel Herrero 27c2444fa4 bugs fixed in autoComplete 2017-11-22 13:10:33 +01:00
Javi Gallego bfd584487f limpieza de models auth obsoleto, ahora vn 2017-11-22 12:43:12 +01:00
Javi Gallego b3e8b4542a model client con la nueva nomenclatura 2017-11-22 08:59:21 +01:00
Javi Gallego 583e7c34bc Añadir activo a datos fiscal-data 2017-11-22 08:35:09 +01:00
Javi Gallego af5a4d65a9 cambio de fuente de raleway a roboto 2017-11-22 07:56:31 +01:00
Daniel Herrero e7d19da8f5 added sales person property into create new client 2017-11-21 14:53:09 +01:00
Daniel Herrero cf4c208eea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-21 14:52:13 +01:00
Daniel Herrero 8af0959d08 error corregido con tag acl repetido 2017-11-21 14:52:06 +01:00
Javi Gallego 26920bb124 adaptacion de border radius y notes con nuevo diseño 2017-11-21 14:22:59 +01:00
Javi Gallego a71d0ed8bc border radius en scss 2017-11-21 14:22:30 +01:00
Javi Gallego 52cbd1a870 eliminacion del style vn-empty, ahora se llama vn-auto 2017-11-21 12:44:28 +01:00
Javi Gallego 78eda1c70e errores de traduccion 2017-11-21 12:07:37 +01:00
Daniel Herrero 13c15bb5b3 production with searchbar 2017-11-21 11:12:52 +01:00
Daniel Herrero c615df2c1e test comentados pendientes revision con Carlos 2017-11-21 07:52:29 +01:00
Daniel Herrero 96f1db5cb7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-16 15:06:04 +01:00
Daniel Herrero ea35c1feda new searchBar 2017-11-16 15:05:45 +01:00
Juan Ferrer Toribio 719168565c Errores en el login no se mostraban 2017-11-16 14:30:17 +01:00
Juan Ferrer Toribio e03d257930 Errores en spinner 2017-11-16 13:47:18 +01:00
Daniel Herrero 11da1dad8d locator, production and route modules only to developer acl 2017-11-15 13:16:40 +01:00
Daniel Herrero e071fbb926 changes acls to merge with test 2017-11-15 13:13:51 +01:00
Daniel Herrero dd14ddb8bd production only acl to developers 2017-11-15 13:11:04 +01:00
Daniel Herrero d5d8145fee bugs fixed 2017-11-15 13:05:11 +01:00
Daniel Herrero 44dde2b705 searchbar clean filters 2017-11-15 12:53:32 +01:00
Daniel Herrero d4a0cf205d bug fixed in edit addresses 2017-11-15 12:11:35 +01:00
Daniel Herrero bb4c43c2bd cambios en formularios de client 2017-11-15 09:38:39 +01:00
Daniel Herrero 78fd0d4d16 recargo y vies movidos de vista 2017-11-15 08:41:54 +01:00
Daniel Herrero dce3ae7520 created storage services 2017-11-15 07:12:52 +01:00
Carlos 2bb87dc195 unit test for autocomplete - tested filterSearch functionality 2017-11-14 11:05:40 +01:00
Daniel Herrero 83965b20ee Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-14 08:56:28 +01:00
Daniel Herrero a84fc8c1b6 new autoComplete option to custom filter 2017-11-14 08:45:56 +01:00
Carlos 29149b1b58 corrected some eslint errors and small refactor 2017-11-13 22:15:44 +01:00
Carlos ed64c3b50a vn icon css changes for main menu 2017-11-13 14:17:09 +01:00
Carlos 154c06e7f4 added hasToInvoiceByAddress checkbox to client > billingData 2017-11-13 11:47:41 +01:00
Carlos f1eba5d27c translation refactor for fiscal data 2017-11-09 13:29:51 +01:00
Daniel Herrero 563c49b785 disable all module routes if not permission 2017-11-09 12:51:46 +01:00
Daniel Herrero c74bafae7e acl in routes 2017-11-09 11:39:41 +01:00
Daniel Herrero 865d106d4f bug fixed in autocomplete 2017-11-09 10:11:59 +01:00
Carlos f6d9f44df4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  refact list production
  docker
  production filtering in temporary table
  docker compose
  docker
2017-11-08 15:46:51 +01:00
Carlos 60a478e5c6 selectors.js refactor plus e2e tests 2017-11-08 15:43:34 +01:00
Daniel Herrero f71dfa53ef refact list production 2017-11-08 14:59:46 +01:00
Daniel Herrero 061ae64c50 production filtering in temporary table 2017-11-08 13:42:33 +01:00
Daniel Herrero ec0eb7f1d1 test fixed 2017-11-07 11:43:18 +01:00
Daniel Herrero 5a1aca198b localizador rutas maquetacion 90% 2017-11-07 11:22:33 +01:00
Daniel Herrero ed3ee81292 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-07 10:00:32 +01:00
Daniel Herrero 7f3df756c8 continuacion con la maquetacion del localizador de rutas 2017-11-07 09:59:49 +01:00
Vicente Falco 8bb43edcfc route: delete gesdoc 2017-11-07 08:47:12 +01:00
Vicente Falco fd1c174453 merge 2017-11-03 07:05:05 +01:00
Vicente Falco 9c1086bd4c merge 2017-11-03 07:04:38 +01:00
Daniel Herrero ae2ecb6d73 tabla localizador de rutas maquetada 2017-11-02 14:57:36 +01:00
Daniel Herrero f0b4e1ff71 structure module locator 2017-11-02 14:10:28 +01:00
Daniel Herrero 4f840c71e3 new icon-menu 2017-11-02 13:27:35 +01:00
Vicente Falco 74e2b2b04d merge 2017-11-02 13:09:59 +01:00
Daniel Herrero 93661fe8e3 new module locator 2017-11-02 11:13:20 +01:00
Daniel Herrero 3d9c46f08e enlaces pp en modulos cliente y rutas 2017-11-02 09:58:28 +01:00
Daniel Herrero 1d1f377a18 error con checkboxes y su anchura 2017-11-02 08:46:09 +01:00
Daniel Herrero 83d63547ff sprint3 pantallas de rutas 2017-11-02 08:18:37 +01:00
Daniel Herrero 76b5903770 refactor dataPicker 2017-10-31 10:40:12 +01:00
Daniel Herrero ee7c4e214f bug fixed in dataPicker 2017-10-31 09:44:24 +01:00
Vicente Falco e04cda0f35 service Production: bugs 2017-10-31 09:26:11 +01:00
Daniel Herrero bec05a1925 route basic data structure 2017-10-31 08:42:43 +01:00
Carlos 2be39c0deb setting up spec files for the next directive to test 2017-10-24 08:34:50 +02:00
Carlos 0a8a682376 finished client side unit test for directive id 2017-10-24 08:08:58 +02:00
Carlos f6c1f5f137 lient side unit test for id directive 2017-10-24 07:57:25 +02:00
Carlos c88023182a client side unit test for vnFocus directive tests 2017-10-23 16:25:47 +02:00
Carlos 4e1d2db3cb unit test for dialog directive plus small refactors 2017-10-23 10:47:56 +02:00
Carlos abb59189ff aclService mock removed as dependencies were corrected on previous commit: 3badf2a 2017-10-20 11:18:44 +02:00
Carlos 8bb2536f90 multi-check unit test repairs 2017-10-20 10:42:55 +02:00
Carlos 3badf2a48a refactor to move aclService from salix to Core 2017-10-20 08:39:30 +02:00
Carlos a530c67336 client side unit test for acl directive plus small refactor 2017-10-19 19:11:49 +02:00
Carlos e8473d56fb correction of expect at acl directive unit test 2017-10-19 15:41:58 +02:00
Carlos 94bfe50818 client side unit test for acl directive, comment added about directive behavior. 2017-10-19 15:40:00 +02:00
Daniel Herrero 82b75d3b70 bugFixed multiCheck onBlur action 2017-10-19 14:13:28 +02:00
Daniel Herrero d72904a69e Bug fixed in multiCheck 2017-10-19 12:31:55 +02:00
Daniel Herrero 83d262ec32 agencyService changes to agencyMode 2017-10-19 09:21:34 +02:00
Carlos b5d90dfbc6 micro refactor and deletion of unused file. 2017-10-18 14:33:34 +02:00
Dani Herrero 3d52031dc2 cambios en validacion de credito de cliente 2017-10-18 12:51:33 +02:00
Carlos 85ec628ae6 refactor to load controller on the beforeEach in all spec files for client side unit tests 2017-10-17 14:24:40 +02:00
Carlos 4cfc6f23d9 small test added to the watcher 2017-10-17 12:33:37 +02:00
Carlos 5073527c93 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  facke active drivers rest created
  parse vars in filer routes
  Respuesta json en peticiones, auth, escrito impresoras
2017-10-17 12:29:59 +02:00
Carlos 56182fb4b1 finished client side unit test for watcher 2017-10-17 12:27:32 +02:00
Dani Herrero a366ef1fc1 facke active drivers rest created 2017-10-17 12:22:19 +02:00
Carlos 5e1be3bc53 client side unit test for vnWatcher until submit[controller.save] plus small refactor for other files plus deletion of unused file 2017-10-16 15:20:40 +02:00
Carlos 496fd22b60 Client side unit test for watcher until $onDestroy 2017-10-13 18:26:38 +02:00
Carlos d7668c278d Client side unit tests for spinner 2017-10-13 17:35:47 +02:00
Juan Ferrer Toribio bcec5326f2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-13 16:54:12 +02:00
Carlos c1ea17a377 client side unit test for multi-check 2017-10-13 16:43:11 +02:00
Carlos 91b9c0bcf9 client side unit test for multi check until switchChecks() 2017-10-13 16:26:47 +02:00
Juan Ferrer Toribio 8fc14348d7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-13 16:23:08 +02:00
Juan Ferrer Toribio 4267b5fe0a Eliminando código redundante v2 2017-10-13 16:22:45 +02:00
Carlos 7cf57d05f1 Client side unit test for grid-header 2017-10-13 10:45:06 +02:00
Carlos 311d80d902 Client side unit test for drop-down 2017-10-13 10:23:28 +02:00
dherrero f24e16b81d moved model agency 2017-10-11 15:00:18 +02:00
dherrero 80bbd9e5d4 bug fixed in datePicker 2017-10-11 14:21:32 +02:00
dherrero e52b31ceb3 service validations moved into generic folder 2017-10-11 14:10:51 +02:00
dherrero 4563ee1b58 removed console.log 2017-10-11 13:25:03 +02:00
Carlos a62285ff9e Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  zone model and rest api
  module routes: front dev 80%
  filtro de rutas con paginación
  routes change model and first look
  Login sin url de redirección
2017-10-11 12:57:26 +02:00
Carlos 3e44e927e8 client side unit test for dropdown until setScrollPosition 2017-10-11 12:57:13 +02:00
dherrero 4dae59aa09 zone model and rest api 2017-10-11 12:47:02 +02:00
dherrero cf36d7d6be module routes: front dev 80% 2017-10-11 12:09:22 +02:00
dherrero 911fbb2f8b filtro de rutas con paginación 2017-10-11 09:18:26 +02:00
dherrero eeda5b45fd routes change model and first look 2017-10-10 15:01:10 +02:00
dherrero 1bc3a0bdd7 autocomplete bug fixed in loadMore button 2017-10-10 12:56:03 +02:00
dherrero bf903d8b1e textfield: icons position changed 2017-10-10 12:37:52 +02:00
dherrero 96235a6752 route service models 2017-10-10 11:14:35 +02:00
Carlos c341009489 CLient side unit test for dialog onKeypress() 2017-10-09 14:30:23 +02:00
Carlos aec32f5e4a client side unit test for dialog onBackgroundMouseDown() 2017-10-06 16:30:51 +02:00
Carlos 022450000e micro-refactor on spec file 2017-10-06 15:36:25 +02:00
Carlos e6acc57fae client side unit test for dialog onButtonClick() 2017-10-06 15:33:21 +02:00
Carlos 1301fefe68 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  new micro-service route: need reinstall all dependencies
  estructure for new module route
  bug fixed autocomplete and width dropdown
2017-10-05 14:29:11 +02:00
Carlos de9d9e53e2 client side unit test for dialog 2017-10-05 14:28:57 +02:00
dherrero 4d487e7980 estructure for new module route 2017-10-05 12:38:28 +02:00
dherrero 0c84722755 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-05 11:04:30 +02:00
dherrero 562ffed388 bug fixed autocomplete and width dropdown 2017-10-05 11:04:22 +02:00
Carlos 231bd9f813 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  watcher: removed unnecessary injection
  removed unnecessary function in equals.js
  watcher renamed properties
  refactor watcher
2017-10-05 09:58:28 +02:00
Carlos 28909da94e client side unit test for column-header 2017-10-05 09:58:15 +02:00
dherrero 5b100e502c watcher: removed unnecessary injection 2017-10-05 09:53:40 +02:00
dherrero c4d6fd91db removed unnecessary function in equals.js 2017-10-05 09:51:27 +02:00
dherrero e2312d954d watcher renamed properties 2017-10-05 09:31:28 +02:00
dherrero 8df67ad95e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-05 09:21:24 +02:00
dherrero 601cf6db25 refactor watcher 2017-10-05 09:20:40 +02:00
Carlos 485ef528b7 correct eslint errors in the commited files 2017-10-05 08:59:16 +02:00
Carlos 1b47d85828 client side unit test for textfield 2017-10-04 16:02:53 +02:00
Dani Herrero dd004fdc89 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-04 13:32:44 +02:00
Dani Herrero 0925451364 spread equivalent tax in all addresses 2017-10-04 13:32:26 +02:00
Carlos 2402469f39 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  bug fixed modified data object
2017-10-04 13:28:02 +02:00
Carlos 92e1754571 client unit test for paging plus rly small refactors 2017-10-04 13:27:39 +02:00
Dani Herrero 245112438e bug fixed modified data object 2017-10-04 10:54:29 +02:00
Carlos 9f7170f773 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  validation client credit - refact
  validate client credit
  AutoLoad items with "scroll" (1st version)
2017-10-04 08:47:28 +02:00
Carlos 946d7f8824 Autocomplete spec updated, icon-menu spec completed and small refactors in dialog, drop-down and icon-menu 2017-10-04 08:47:16 +02:00
Dani Herrero 2aed5d088c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-04 08:18:49 +02:00
Carlos c39b29128c client side unit test for datePicker 2017-10-03 14:41:35 +02:00
Dani Herrero 2db36a56bb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-03 12:10:43 +02:00
Dani Herrero bc8d319714 AutoLoad items with "scroll" (1st version) 2017-10-03 12:10:30 +02:00
Carlos 73964ac387 removed unsed files and commented code for deprecated date-picker.js 2017-10-03 11:54:09 +02:00
Carlos d121517569 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  dropdown: new style in -no more results-
2017-10-03 11:33:54 +02:00
Carlos 57b03790a3 Autocomplete client side unit tests finished 2017-10-03 11:32:25 +02:00
Dani Herrero 5ef97c209d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-03 09:25:41 +02:00
Dani Herrero 1f5f0a0fda dropdown: new style in -no more results- 2017-10-03 09:25:25 +02:00
Carlos 7d1bc60112 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  bug fixed on LoadMore action in autocomplete
2017-10-03 09:19:02 +02:00
Carlos 106d7d8364 autocomplete client side unit test for findItems() with multiple 2017-10-03 09:18:12 +02:00
Dani Herrero 4e309b67f0 bug fixed on LoadMore action in autocomplete 2017-10-03 09:16:02 +02:00
Dani Herrero ff6801c8e8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-10-03 07:10:52 +02:00
Dani Herrero 9afb992225 autocomplete changes on initialData 2017-10-03 07:10:37 +02:00
Joan Sanchez aef9659798 Mailer: Autentificación token por ruta. Fix creditClassification 2017-10-02 11:19:55 +02:00
Javi Gallego 19e7e0d76b cambio de enabled y default por isEnabled y isDefaultAddress 2017-09-29 14:41:30 +02:00
Dani Herrero 1662c9d241 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-28 14:34:40 +02:00
Dani Herrero ecf88f6b66 new address list 2017-09-28 14:34:18 +02:00
Carlos 0742a4e098 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  get address return province data
  sales person formated
  getRoleCustomer return object not array of object
  Token authenticate, solunion notification
2017-09-28 12:38:05 +02:00
Carlos 86fdb010ae Autocomplete client side unit test for findItems 2017-09-28 12:37:45 +02:00
Dani Herrero 70e4b22e8a get address return province data 2017-09-28 11:29:01 +02:00
Dani Herrero 1d47bf58f1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-28 09:14:31 +02:00
Dani Herrero 62cc0c3c9e sales person formated 2017-09-28 09:13:42 +02:00
Vicente Falco 895b3435c4 getRoleCustomer return object not array of object 2017-09-28 08:41:45 +02:00
Carlos 720cf89204 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  moved textfield styles
  textfield: clear icon dinamic display
2017-09-27 14:10:42 +02:00
Carlos 66c80fd5bd small refactor in autocomplete.js and some more client side unit test for field() > multiField() and displayValue() 2017-09-27 14:10:03 +02:00
Dani Herrero 35454c5c53 moved textfield styles 2017-09-27 12:44:33 +02:00
Dani Herrero 9d41a70416 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-27 12:27:38 +02:00
Dani Herrero 6aed24a02c textfield: clear icon dinamic display 2017-09-27 12:27:18 +02:00
Carlos 5dc0608f86 error corrected 2017-09-27 11:58:35 +02:00
Carlos ef7ee12373 client side unit test for autocomplete field() query functionality 2017-09-27 11:51:25 +02:00
Carlos 7b391ef9a1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  [finish] active salesPerson service
2017-09-27 09:44:16 +02:00
Carlos 9ae7898c19 client side unit test for autocomplete field() > setValue() 2017-09-27 09:42:59 +02:00
Dani Herrero bc20725c6c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-09-27 09:25:39 +02:00
Dani Herrero fbd5fea126 [finish] active salesPerson service 2017-09-27 09:25:33 +02:00
Carlos 959f09d272 more tests 2017-09-27 08:09:10 +02:00
Carlos 0a17a59f2d client unit tests for autocomplete field() 2017-09-26 18:21:11 +02:00
Carlos 3a666ef764 client unit test for autocomplete displayValue(), some functionality remains wild i.e. item.checked = false; 2017-09-26 14:10:55 +02:00
Carlos b41f5a3996 unit tests for autocompelete showDropDown plus small correction in other two files. 2017-09-26 10:26:21 +02:00
Javi Gallego 9b76d3d004 validaciones custom se bajan al cliente solo si son isExportable 2017-09-25 17:39:51 +02:00
Dani Herrero 235cc2d8f6 refactoring autocomplete: input readonly and autofucos on search input 2017-09-21 13:10:30 +02:00
Dani Herrero 490ff51fa6 bug fixed in address edit with watcher 2017-09-21 12:24:14 +02:00
Carlos ec4adc7552 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  billing data with acls
2017-09-21 10:27:10 +02:00
Carlos f716721836 info tag for emails updated and html and es.json files addapted. 2017-09-21 10:26:46 +02:00
Dani Herrero 922ae5c848 billing data with acls 2017-09-21 10:23:51 +02:00
Dani Herrero a222a7a8d1 tooltip translate refactor 2017-09-21 09:33:02 +02:00
Dani Herrero 32d816ba60 translate in info tag 2017-09-21 09:06:51 +02:00
Carlos 1e494ec08b refactor plus front-end unit repairs 2017-09-21 08:48:25 +02:00
Dani Herrero aa4bfb4f51 change password permission 2017-09-21 07:53:23 +02:00
Dani Herrero f6399596ce autocomplete-v2 renamed 2017-09-20 14:25:43 +02:00
Dani Herrero 4b1e88cc1c removed autocomplete folder 2017-09-20 14:23:53 +02:00
Dani Herrero d8ba5ecdcb Merge branch 'autocomplete-v2' into dev 2017-09-20 14:10:16 +02:00
Carlos 9ed9e13b54 jasmine ESLint plugging added to dev dependencies and refactor on all specs according to eslint rules. 2017-09-20 14:01:33 +02:00
Dani Herrero 07f8309d36 quitado autocomplete anterior 2017-09-20 13:56:47 +02:00
Dani Herrero 1dad2147ca autocomplete con seleccion multiple 2017-09-20 13:52:53 +02:00
Dani Herrero d81d36217a transclude funcionando 2017-09-20 11:50:53 +02:00
Carlos e76f1d74f9 corrected small typo at datePicker.js 2017-09-19 15:03:39 +02:00
Carlos e8d24a52ef basic-data.html info tag added, plus refactor on backend create.js and filter.js, plus spec commented until db docker implementation 2017-09-19 14:34:59 +02:00
Dani Herrero e525f1da30 Merge branch 'dev' into autocomplete-v2 2017-09-19 07:17:56 +02:00
Carlos 2721b87e57 client path e2e tests refactor 2017-09-15 12:24:37 +02:00
Dani Herrero 6651f70e07 autocomplete recatoring 80% 2017-09-14 13:40:55 +02:00
Carlos bd20f76274 test for autocomplete client side 2017-09-14 09:22:49 +02:00
Dani Herrero f9b3657440 refactoring 30% 2017-09-13 14:59:58 +02:00
Dani Herrero 99155e09fb vn-title bug fixed 2017-09-13 13:34:57 +02:00
Dani Herrero e177b3698d deleted unnecessary files 2017-09-13 11:43:00 +02:00
Dani Herrero a200fb8143 textfield with info 2017-09-13 10:59:34 +02:00
Dani Herrero 2fd58af254 refactoring textfield finished 2017-09-13 09:45:42 +02:00
Dani Herrero cccc0ade2b refactoring textfield, validations pending 2017-09-12 15:02:14 +02:00
Dani Herrero c90be5bd04 bug fixed: login 2017-09-12 12:45:29 +02:00
Carlos 22f2d3e7f3 texfield refactor 2017-09-12 11:44:56 +02:00
Carlos 8cad612a59 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
* 'dev' of https://git.verdnatura.es/salix:
  textfield canvia las cadenas vacias a null
2017-09-08 09:53:56 +02:00
Carlos 12270f21f9 changed tittes to english and small refactor on address-create spec 2017-09-08 09:53:37 +02:00
Javi Gallego 207addf2c3 textfield canvia las cadenas vacias a null 2017-09-07 19:35:17 +02:00
Carlos 5570ec1c33 translation changes 2017-09-06 15:37:42 +02:00
Carlos eb1a844930 translation changes 2017-09-06 14:23:06 +02:00
Carlos fb41fbd963 refactor en fical-data.html 2017-09-06 12:49:36 +02:00
Carlos a9763e728c refactor for backend create.js transaction and it's html error notification for account implemented 2017-09-06 09:56:36 +02:00
Carlos e2d1103607 tarea Añadir email y user al formulario de creación de clientes 2017-09-05 16:15:11 +02:00
Carlos e43e3211d0 descriptor unit test 2017-09-04 17:15:07 +02:00
Carlos 352e68ed58 refactor in all client specs to next describes accordingly 2017-09-04 15:06:43 +02:00
Carlos 6c13fce8a9 front client specs ES6 refactor 2017-09-04 14:39:58 +02:00
Carlos 62c15fbafa create client onSubmit callback tested 2017-09-04 12:46:19 +02:00
Carlos fa64931cc2 search-panel spec plus small refactor on it's js and html template. 2017-09-04 09:47:25 +02:00
Carlos a732d796e8 unit test for notes and index plus small refactor on notes.js 2017-09-01 13:03:02 +02:00
Carlos fd39993794 note-create unit test 2017-09-01 09:20:22 +02:00
Carlos abe576078e removed unused httpBackend code 2017-09-01 08:49:22 +02:00
Carlos b63b92f5ef refactor on various specs and commented malfuctioning code for future fixing. 2017-09-01 08:47:28 +02:00
Carlos 3fd0a4f49d create.js OnSubmit() unit test 2017-08-31 19:40:22 +02:00
Carlos c2e0a081e2 unit test for billing-data create and index 2017-08-31 19:15:17 +02:00
Carlos 60c46b5fb7 small refactor on address-edit.spec.js 2017-08-31 08:55:17 +02:00
Carlos f813d052aa unit test for address-create.js and address-edit.js 2017-08-31 08:53:17 +02:00
Carlos 0461b3a429 vnClientCard unit test 2017-08-30 16:05:34 +02:00
Carlos aeaa417a4e refactor at app.js to remove troublesome console.log() 2017-08-30 15:39:48 +02:00
Carlos 1721509ce4 returnDialog() unit test 2017-08-30 15:30:49 +02:00
Carlos 20d82cde50 checkPaymentChanges unit test 2017-08-30 12:30:48 +02:00
Carlos 5e8f95dd65 Billing data copyData and submit unit tests plus small refactor at billing-data.js 2017-08-30 08:38:41 +02:00
Carlos d3600858ee billing data copyData test 2017-08-29 15:14:18 +02:00
Carlos 5bf59f4c25 commented failing spec and injected vnCore dependencies to cliente module. 2017-08-29 13:27:43 +02:00
Carlos 1eb0c594be unit test for web-access and bug fixes at watcher.js 2017-08-29 12:33:48 +02:00
Vicente Falco 46a69f3842 Merge remote-tracking branch 'origin/unit-tests' into dev 2017-08-25 11:49:26 +02:00
Carlos 29dd3ef67c removed unused code 2017-08-25 09:03:43 +02:00
Eist fbb10cc2c0 unit testing environment 2017-08-25 08:42:53 +02:00
Javi Gallego 1743db2174 isEqualizated en Address 2017-08-22 14:27:09 +02:00
Dani Herrero 41182abb6e cambio en watcher sustitucion de la función copy de Angular, para que ignore en las copias los campos vacios 2017-07-13 14:55:07 +02:00
Dani Herrero 45849e4daa corregido CAU 2594 cambios en datos de facturación 2017-07-13 13:49:45 +02:00
Dani Herrero 1fc059273f corregido error al destruir popover en searchBar 2017-07-13 13:32:23 +02:00
Dani Herrero 9fa608b11f bug fixed filter in clients 2017-07-13 13:12:09 +02:00
Dani Herrero 7dfed60e7d bug fixed in new datepicker and material design label effect 2017-07-13 11:03:22 +02:00
Dani Herrero a06ac62b91 datepicker with timezone 2017-07-13 08:58:48 +02:00
Dani Herrero 3cf33fe48b datepicker regex data with timezone 2017-07-13 08:55:39 +02:00
Dani Herrero cd2560c8c6 bug fixed datepicker 2017-07-12 14:57:40 +02:00
Dani Herrero f2c0dd3ab7 pruebas con date-picker y material 2017-07-12 14:32:15 +02:00
Dani Herrero da3fddd9d2 estilos date-picker 2017-07-12 13:32:42 +02:00
Dani Herrero 17186c4035 nuevo date-picker 2017-07-12 13:32:25 +02:00
Dani Herrero 22829aa218 nuevos iconos de módulos 2017-07-11 14:28:53 +02:00
Dani Herrero e22e9c7f13 refresh filter when clear model 2017-07-11 10:59:09 +02:00
Dani Herrero b93c3f50e3 cambiando searchBar 2017-07-11 10:35:23 +02:00
Dani Herrero 2f6047d241 merge 2017-07-11 10:00:29 +02:00
Dani Herrero 81726e0a09 columnHeader change icon, style 2017-07-11 08:59:12 +02:00
Dani Herrero 2b7abef98f corregido filtro principal 2017-07-06 14:46:22 +02:00
Dani Herrero 142cc920de bug de multi seleccion corregido, cambio estilos 2017-07-06 14:21:55 +02:00
Juan Ferrer Toribio 5929b8be32 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-07-06 13:04:51 +02:00
Dani Herrero 25ac346b2b filtro principal y ajustes css 2017-07-06 12:58:50 +02:00
Juan Ferrer Toribio 6f581e033a Merge 2017-07-06 12:43:37 +02:00
Dani Herrero 0339fdaef1 cambio de hora funcionando 2017-07-06 11:05:26 +02:00
Dani Herrero 3c1847134b Front acoplado al endpoint RouteFk 2017-07-06 09:02:27 +02:00
Dani Herrero 51ac5f5262 correccion ortográfica 2017-07-05 14:59:40 +02:00
Dani Herrero 81749e906d refactorizacion popover 2017-07-05 14:41:10 +02:00
Dani Herrero 53af148def corregido error popover 2017-07-05 14:01:03 +02:00
Dani Herrero e4e01c4970 añadida id ruta en tabla, internacionalizacion y mejora de popover 2017-07-05 13:02:49 +02:00
Dani Herrero ffe21e6947 corrección para popover anidados 2017-07-05 09:47:24 +02:00
Dani Herrero 76d9546355 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-07-03 14:50:52 +02:00
Dani Herrero f670c0f4fd Localizador: restablecer filtros, datePicker con formato 'es' 2017-07-03 14:50:48 +02:00
nelo d5d5c3079a corrección errores brocal 2017-07-03 14:23:53 +02:00
Vicente Falco ba2d803f28 merge 2017-07-03 14:20:06 +02:00
Vicente Falco 9e6bd8522e vies 2017-07-03 14:19:47 +02:00
Dani Herrero 06537bcf8d filtro de trabajadores y llamada a validaciones opcional 2017-07-03 08:38:45 +02:00
Dani Herrero 461fc3c9a6 internacionalización por subir 2017-06-30 09:09:48 +02:00
Dani Herrero 3bb1eef43d bug fixed in dropDown 2017-06-29 14:28:22 +02:00
Dani Herrero 6365a06cbb Servicio mensaje de alerta modificado 2017-06-29 14:13:01 +02:00
nelo 8e177fcb2d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-29 14:09:11 +02:00
Dani Herrero 372cfe718b Localizador: warehouseFk por defecto 2017-06-29 14:09:04 +02:00
nelo c5363155c4 send message 2017-06-29 14:08:57 +02:00
Dani Herrero d8f4e0489e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-29 13:56:56 +02:00
Dani Herrero 491ea3b796 dropDown with search and columHeader preview icon 2017-06-29 13:56:52 +02:00
nelo 2e7a225249 rawsql with promises 2017-06-29 11:48:57 +02:00
nelo e9c0fa5cc9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
# Conflicts:
#	client/production/src/index/index.js
2017-06-29 09:52:45 +02:00
nelo ddcec00c4f change time 2017-06-29 09:48:00 +02:00
Dani Herrero df614b4943 bugs fixed 2017-06-29 08:13:30 +02:00
Dani Herrero 5e2be42247 bugs fixed 2017-06-28 14:59:54 +02:00
Dani Herrero 5b5523e6b6 refactorización vnProductionTable 2017-06-28 14:53:26 +02:00
Dani Herrero bfdd8ecd8e Localizador: acciones separadas a nuevo componente vnProductionActions 2017-06-28 14:48:07 +02:00
Dani Herrero 6815ab2b3c Localizador: paginación y ordenación desde front, selector actua sobre todos los elementos (no solo sobre los que se muestran) 2017-06-28 13:12:01 +02:00
nelo 7b38d2f188 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-28 08:57:37 +02:00
nelo 80121de6c3 change state
message send
change time
2017-06-28 08:57:33 +02:00
Dani Herrero c2b351a777 Cambio de hora y refactorizacion del vnMultiCheck 2017-06-28 08:55:01 +02:00
Dani Herrero b9704a2b91 corregido fallo en vnMultiCheck 2017-06-26 14:52:43 +02:00
Dani Herrero 4480431a08 estilos en vnMultiCheck 2017-06-26 14:41:08 +02:00
Dani Herrero 8b6e7fdc40 nuevo componente vnMultiCheck 2017-06-26 13:53:52 +02:00
Dani Herrero fabe0cde7c front: send message action 2017-06-26 10:52:22 +02:00
Dani Herrero fcfef2c8b7 cambio en accion envio de mensaje 2017-06-26 09:39:21 +02:00
Dani Herrero a96e3a57b6 corregido id ticket por ticketFk 2017-06-26 09:22:28 +02:00
Dani Herrero 6fd77dda74 cambio en filtros 2017-06-26 09:07:40 +02:00
Dani Herrero 17994a2cc5 internacionalizacion 2017-06-26 08:35:31 +02:00
dhan82 c69ada432d internacionalizacion (reverted from commit f419946766) 2017-06-26 08:32:57 +02:00
dhan82 f419946766 internacionalizacion 2017-06-26 08:28:16 +02:00
Dani Herrero 09e805fd3a Ordenación en campos correcto, autocomplete con clear 2017-06-22 15:04:02 +02:00
Dani Herrero 2bdbda6192 Localizador, cambio estlios, añadido paginador, order by 2017-06-22 12:03:01 +02:00
Dani Herrero 05b6c81a1b dropDown con filtro 2017-06-21 13:16:37 +02:00
Dani Herrero 3796741371 primera versión del componente vnGridHeader para ordenación de tablas 2017-06-21 09:46:31 +02:00
Dani Herrero d444980ab1 [En progreso] nuevo componente vnGridHeader para ordenación de tablas 2017-06-20 15:00:27 +02:00
Dani Herrero ca19369093 Production: modal para mensajes, filtros búsqueda en front 100% 2017-06-20 09:27:49 +02:00
Dani Herrero bcdc31d8d9 arreglo en autocomplete para admitir valores por defecto 2017-06-15 15:00:43 +02:00
Dani Herrero 1ca5e20494 añadido callBack cambio estados 2017-06-15 12:00:51 +02:00
Dani Herrero 5f2aa345ba iconMenu arreglo de posicion del DropDown interno 2017-06-15 11:22:47 +02:00
Dani Herrero f346e5e83c arreglos en drop-down 2017-06-15 08:26:03 +02:00
Dani Herrero 9072b100f9 tooltip admite plantilla html, icon-menu forzado de posicion en dropDown 2017-06-15 07:45:01 +02:00
Dani Herrero afff93cce6 Tooltip: admite html, Localizador: añadido icono con información adicional 2017-06-14 09:54:00 +02:00
Dani Herrero 7713d0bd6f cambio estilos dropdown 2017-06-13 14:57:09 +02:00
Dani Herrero e09f60a53a Nuevos componentes: drop-down, icon-menu. Refactorización de icon e icon-button (pasados a componentes sin template manager) 2017-06-13 13:08:06 +02:00
Dani Herrero f274335997 interfaz gráfica y correcciones varias 2017-06-08 14:57:23 +02:00
Dani Herrero 491241398a localizador y tooltip arreglo estilos 2017-06-08 10:05:11 +02:00
Dani Herrero 3806e9e591 nueva directiva vn-tooltip 2017-06-08 09:29:03 +02:00
Joan Sanchez 984dc1e908 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-07 15:29:11 +02:00
Joan Sanchez 73c5f5581f Cambios en servicio mailer 2017-06-07 15:28:42 +02:00
Dani Herrero 6123278945 en progreso: interfaz gráfica 2017-06-07 15:03:12 +02:00
Dani Herrero 51a700b6ce date-picker v1 2017-06-07 13:27:57 +02:00
Juan Ferrer Toribio 5d789b0e71 Locales 2017-06-07 08:39:40 +02:00
Dani Herrero 9eaae2269b client: localizador al 6% 2017-06-06 15:02:03 +02:00
Dani Herrero 9fcdb28d14 cambio en routes e interfaz localizador al 5% 2017-06-06 13:06:47 +02:00
Juan Ferrer Toribio 609c984426 Loopback 3, errores solucionados, codigo reorganizado 2017-06-05 09:01:21 +02:00
Juan Ferrer Toribio b427361156 Loopback 3, Errores solucionados 2017-06-03 13:01:47 +02:00
Juan Ferrer Toribio 8cd312e145 Errores solucionados 2017-06-02 15:39:16 +02:00
Juan Ferrer Toribio f9842000d3 Codigo gulp reorganizado, errores redirección solucionados 2017-06-02 15:23:19 +02:00
Juan Ferrer Toribio 481a2219ce Ruta desarrollo http://localhost:5000, producción 80 2017-06-02 09:29:14 +02:00
Dani Herrero bb91c026da corregido error aviso cambio de método pago 2017-06-01 14:50:55 +02:00
nelo b18c2c4966 Administración solo recargo equivalencia
Razón social único
Si no hay comercial, modificar los datos
2017-06-01 14:39:22 +02:00
Dani Herrero a3dda662ae ACLs, json configuracion y script SQL 2017-06-01 09:31:57 +02:00
Dani Herrero 67de66d6c5 mensajes de notificación enviada / error 2017-05-31 13:47:40 +02:00
Dani Herrero 981b763cd8 corrección errata ortográfica 2017-05-31 13:01:15 +02:00
Dani Herrero 96dd6de8a6 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-31 12:56:42 +02:00
Dani Herrero b8287efdc2 kanban: asociar envío escrito con cambio de valor 2017-05-31 12:56:37 +02:00
nelo c8424f98f4 paginación en clientes
arreglado problema de búsqueda
2017-05-31 10:58:48 +02:00
Dani Herrero 39bb122ee1 renombrado de archivos parte 2 2017-05-31 10:28:39 +02:00
Dani Herrero 11c3b2de2d renombrado de archivos parte 1 2017-05-31 09:46:05 +02:00
Dani Herrero 74a0eedb47 Añadidos ACLs del servicio client 2017-05-30 14:17:01 +02:00
Dani Herrero 87c38a0d89 creada factoria q retorna los modulos disponibles para el usuario, ACL 2017-05-30 09:54:35 +02:00
Dani Herrero 9ce12b2e53 nuevo home con acceso directo a los módulos 2017-05-30 09:06:11 +02:00
Vicente Falco 034bd93c99 Errores 2017-05-29 13:38:44 +02:00
Juan Ferrer Toribio 025bd4224e Errores en validación solucionados 2017-05-26 17:05:33 +02:00
Juan Ferrer Toribio 0f4ac0edbb Console.log eliminado 2017-05-26 14:42:01 +02:00
Juan Ferrer Toribio 3d71f454a0 Errores en validación IBAN solucionados 2017-05-26 14:39:36 +02:00
Juan Ferrer Toribio d3ef7dde86 Error en validación length solucionado 2017-05-26 13:26:12 +02:00
Juan Ferrer Toribio a73b2eba0d Errores solucionados 2017-05-26 13:14:47 +02:00
Dani Herrero f6888af74a Inicio de vn-home 2017-05-25 14:50:35 +02:00
Dani Herrero 571692f4ca Añadidos estilos a elementos desabilitados, mejora de directiva vnAcl 2017-05-25 14:23:19 +02:00
Juan Ferrer Toribio 041be5ec93 Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-25 12:52:49 +02:00
Juan Ferrer Toribio 1482b842bd Errores solucionados 2017-05-25 12:52:38 +02:00
Joan Sanchez 6f4e51cee6 Dependencia con uirouter actualizada 2017-05-25 12:34:03 +02:00
Dani Herrero f12c66027b Eliminada prueba de directiva vnAcl en último commit 2017-05-25 11:56:34 +02:00
Dani Herrero fd3dd56542 Separado aclService en fichero propio 2017-05-25 11:52:53 +02:00
Dani Herrero 81f9de098d ACLs , permisos a nivel de rutas, menu y componentes 2017-05-25 11:48:10 +02:00
Juan Ferrer Toribio 345f2e55a5 vnAutocomplete: Acepta plantillas 2017-05-24 13:24:32 +02:00
Juan Ferrer Toribio bcd4cedbcd Merge branch 'dev' of ssh://git.verdnatura.es:/var/lib/git/salix into dev 2017-05-23 16:12:47 +02:00
Dani Herrero 27073fe9d7 leftMenu : estado activo, Routes.json: nueva jerarquía de rutas 2017-05-23 14:36:54 +02:00
Juan Ferrer Toribio 5b9fcf868a 401 redirecciona a login, vnAutocomplete: campos seleccionados 2017-05-23 14:05:26 +02:00
Dani Herrero 434002b308 separda la facturación en 2 modulos 2017-05-23 10:58:17 +02:00
Dani Herrero bda48488fc Client card, uso de mgCrud. Routes: añadido estado abstract 2017-05-23 09:20:21 +02:00
dherrero c1acd51d96 eliminado overflow hidden en vnTopbar 2017-05-22 13:31:24 +02:00
Juan Ferrer Toribio 0b490f4105 Merge 2017-05-22 12:06:33 +02:00