verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 Releases Wiki Activity
3,596 Commits 264 Branches 0 Tags 124 MiB
Commit Graph

1656 Commits

Author SHA1 Message Date
Carlos Jimenez 504096d702 amends for #655 claim action 2018-09-27 09:50:31 +02:00
Joan Sanchez 07d5226169 Disabled route module 2018-09-27 08:55:59 +02:00
gerard a5e74335a9 Tarea #658 dialogo de añadir cantidad 2018-09-27 08:42:36 +02:00
Joan Sanchez 0277130077 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-26 14:15:09 +02:00
Joan Sanchez 80cf804714 tooltip front test #492 2018-09-26 14:15:00 +02:00
Carlos Jimenez 0c9678ada8 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-26 11:19:40 +02:00
Joan Sanchez 65edae7f83 fix route 2018-09-25 15:02:33 +02:00
Carlos Jimenez e1131c2c93 #655 [FALTA PLANIFICACION] claim.action añadir acciones Front Part 2018-09-25 14:37:35 +02:00
Joan Sanchez 0777eddf54 added zone summary #675 2018-09-25 09:28:55 +02:00
Joan Sanchez 4388a6dbff added Agency module 2018-09-25 08:53:57 +02:00
Joan Sanchez cba9c2ca47 Removed default order #591 2018-09-24 15:04:13 +02:00
Joan Sanchez bde7f64cea drop drown like 'value%' 2018-09-24 15:03:17 +02:00
Joan Sanchez 5a5640143d zone delivery days #668 2018-09-24 14:51:27 +02:00
gerard abaab3e34a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-24 12:13:11 +02:00
gerard 04a452bd82 action test updated 2018-09-24 12:12:36 +02:00
Joan Sanchez 0b5a0754fd searchbar with icons #371 2018-09-24 11:10:03 +02:00
Joan Sanchez 564370180c zone basic data 2018-09-24 10:43:54 +02:00
Joan Sanchez fec2134b8f added zone descriptor #669 2018-09-21 12:35:54 +02:00
Joan Sanchez d5ca385ccd added zone index & zone create 2018-09-19 15:05:07 +02:00
Javi Gallego 87447661b2 merge 2018-09-19 07:42:53 +02:00
Javi Gallego 68e075c496 #654 Permisos en claim.basicData 2018-09-19 07:41:07 +02:00
gerard 834d779154 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-18 14:37:15 +02:00
gerard fa9c3f4759 Tarea #602 Investigar hook 2018-09-18 14:36:41 +02:00
Joan Sanchez 469e6f8076 fixed itemDiary warehouseFk select #671 2018-09-18 13:34:11 +02:00
Joan Sanchez 9aff95904d Added model rewriteDbError() method & fixed tag bug #597 & #662 2018-09-18 10:11:51 +02:00
gerard 5c6ab8efc3 skipped tests fixed 2018-09-18 09:52:50 +02:00
gerard babadbb4f3 Bug #660 el catalogo deberia de estar deshabilitado 2018-09-18 09:37:54 +02:00
gerard 6b155c6485 reverted "Bur restoring old value" 2018-09-17 14:55:13 +02:00
gerard 97f45e7475 focus added to all vn-searcbar in modules index 2018-09-17 14:54:38 +02:00
gerard c3e9d0af95 bug restoring old value solved 2018-09-17 14:31:43 +02:00
gerard 4fb31f9522 Tarea #658 dialogo de añadir cantidad 2018-09-17 14:30:39 +02:00
Joan Sanchez f8c014b330 Merge branches 'dev' and 'dev' of https://git.verdnatura.es/salix into dev 2018-09-14 14:25:32 +02:00
gerard 569cd60d7b Tarea #601 dialogo de añadir cantidad 2018-09-14 14:20:58 +02:00
Joan Sanchez e0628786b4 added catalog front & back unit test #598 2018-09-14 14:18:39 +02:00
gerard 899f9b3fe5 Tarea #653 Crear shortcuts 2018-09-14 13:51:28 +02:00
Carlos Jimenez e90af6b851 #593 Refactor card/descriptor/descriptor-popover 2018-09-14 13:43:51 +02:00
Joan Sanchez d66383dced fixed front-end unit test textfield 2018-09-14 11:01:56 +02:00
Joan Sanchez 8feba9f5eb catalogFilter back test 2018-09-14 09:37:54 +02:00
Joan Sanchez fa31010069 catalog filters #598 2018-09-14 09:10:30 +02:00
gerard 8d1aa30287 Bug #437 Boton cancelar 2018-09-14 08:14:52 +02:00
gerard 0f14bf9d27 added translations 2018-09-13 17:00:01 +02:00
Juan fad2b78cc3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-13 15:22:42 +02:00
Juan 270f16d0db Pagination: maxLoads 2018-09-13 15:19:50 +02:00
gerard a6b63d4113 Bug #652 El componente textarea muestra mal el label 2018-09-13 14:01:26 +02:00
gerard 1e3b3b0ffa Tarea #644 Crear componente Input Number 2018-09-13 12:46:32 +02:00
gerard 094a6eda68 Bug #644 Crear componente Input Number 2018-09-13 11:27:38 +02:00
gerard 8234780252 updated fonts 2018-09-13 11:06:48 +02:00
gerard 7e309e5f62 Bug #650 En la seccion claim detail no aparecen las sales reclamables 2018-09-13 10:05:39 +02:00
Carlos Jimenez 88a4ed7fb3 #604 acl for claims 2018-09-12 15:21:20 +02:00
gerard 49b96c5cc3 test fixed 2018-09-12 11:08:48 +02:00
gerard bc4b6826fe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-12 11:06:47 +02:00
gerard e03241fcc6 Tarea #480 /icon-menu/icon-menu.js Front unit test 2018-09-12 11:06:28 +02:00
Carlos Jimenez c2f8f236fb #647 Si se hace control click en ticket.index abrir una nueva pestaña 2018-09-12 10:08:19 +02:00
Carlos Jimenez ed3c775c04 #608 order-create now redirects correctly yo the catalog 2018-09-12 08:24:19 +02:00
Javi Gallego 2e94ab28de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-11 13:56:45 +02:00
gerard f105ffa2d6 watchers reduced 2018-09-11 13:48:05 +02:00
Javi Gallego b6cc8c2fe0 merge 2018-09-11 13:44:49 +02:00
Javi Gallego c9ec4aee7e #612 añadir reclamacion 2018-09-11 12:49:31 +02:00
Carlos Jimenez a3d63825d9 indentation fix 2018-09-10 13:00:01 +02:00
Joan Sanchez 366b00a8de added chip component #624 2018-09-07 12:20:57 +02:00
Joan Sanchez a4c730cf65 enabled routes module #616 2018-09-07 09:40:45 +02:00
gerard a86120c055 Tarea #615 test multicheck 2018-09-06 16:38:49 +02:00
Joan Sanchez ca97d76adf itemDiary warehouseFk url param #622 2018-09-06 15:08:02 +02:00
Joan Sanchez dff0c561bc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-06 12:47:27 +02:00
Joan Sanchez cee940f4fa order client descriptor #609 2018-09-06 12:47:25 +02:00
gerard c33e741c14 fixed typo 2018-09-06 12:33:37 +02:00
Joan Sanchez 660310693f ticket sale translation fix 2018-09-06 12:22:12 +02:00
Javi Gallego 588308cf1e merge 2018-09-06 11:15:53 +02:00
Joan Sanchez f330c77cc6 added span to descriptor-popover links #637 2018-09-06 08:04:43 +02:00
gerard 6f3140059f claim icons added 2018-09-05 16:15:12 +02:00
gerard b2d0832daa Added missing success mesage 2018-09-05 16:14:13 +02:00
gerard 5d7c6ef250 fixed typo 2018-09-05 16:13:30 +02:00
gerard d3ce915b5d refactor to add disable 2018-09-05 13:56:07 +02:00
gerard f23ea2d821 fixed typo 2018-09-05 13:48:18 +02:00
gerard 1bfd6a8ec0 updated acl 2018-09-05 13:47:53 +02:00
gerard c04616d6dc updated acl 2018-09-05 13:47:35 +02:00
gerard c424e845d1 Tarea #606 claim.summary 2018-09-05 13:47:15 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
gerard b5448aaa5a Tarea #446 claim.development 2018-09-05 11:48:38 +02:00
gerard 0333ba96b0 Tarea #445 claim.detail 2018-09-05 11:45:33 +02:00
gerard 732c100096 Tarea #447 claim.action 2018-09-05 11:34:23 +02:00
Joan Sanchez 6e9bc4645c translation fix 2018-09-05 07:54:45 +02:00
gerard d991731f98 bug with clear function solved 2018-09-04 16:51:29 +02:00
Joan Sanchez d3406fecde claim search-panel & connector-mysql fix date 2018-09-04 15:08:36 +02:00
Joan Sanchez fa631e5ac2 descriptor quicklings fixed #593 2018-09-04 13:01:53 +02:00
gerard 98aae36087 claim hidden again 2018-09-04 13:01:53 +02:00
Javi Gallego 955a7f0aae merge 2018-09-04 12:01:44 +02:00
Javi Gallego dda12c4b62 #460 expedition 2018-09-04 11:57:41 +02:00
Joan Sanchez 9da95f637e descriptor quicklings fixed #593 2018-09-04 11:49:00 +02:00
gerard e8d7fbbf96 Tarea #489 /components/textarea/textarea.js Front unit test 2018-09-04 10:11:01 +02:00
gerard 6967480398 Tarea #627 Refactorizar la directiva Textarea 2018-09-04 10:10:29 +02:00
gerard 570bf3133d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-04 08:09:23 +02:00
Joan Sanchez 6c682875a0 mailer css removed justify text. Fixed chrome image content-type. 2018-09-03 13:54:18 +02:00
gerard b46bc7d296 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-03 11:03:10 +02:00
Joan Sanchez d5e0d3beef updated itemDiary front unit test 2018-09-03 10:55:04 +02:00
Joan Sanchez 14b85b874b th component front unit test #491 2018-09-03 09:54:31 +02:00
Joan Sanchez c39db598ac Item diary select correct position #619 2018-09-03 08:09:56 +02:00
gerard 065d236abb claim module teporally shown 2018-08-31 14:49:16 +02:00
gerard f81c97dee9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-31 14:35:30 +02:00
gerard 2d21f84f8b Tarea #443 claim list 2018-08-31 14:35:20 +02:00
Carlos Jimenez f412d3c486 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 13:07:05 +02:00
Carlos Jimenez 25ac0db1cb #497 module-loader.js Front unit test 2018-08-31 13:06:39 +02:00
Joan Sanchez 8879005854 fixed ticket list pagination 2018-08-31 12:39:57 +02:00
Carlos Jimenez bc2554e6f9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-31 11:25:30 +02:00
Joan Sanchez f3fc211dfa removed unused routes, filter and crud routes #409 2018-08-31 07:53:38 +02:00
Carlos Jimenez 58042027cf small refactors 2018-08-30 16:15:30 +02:00
Carlos Jimenez c0c4961717 #487 step-control.js front unit test 2018-08-30 16:15:10 +02:00
Javi Gallego c4e0fc74a3 Bug #452 quitamos servicio production 2018-08-30 11:02:50 +02:00
gerard 61b9b0c7bc Tarea #445 claim.detail 2018-08-30 09:19:09 +02:00
Joan Sanchez e698d84a4f crud-model refactor. crud-model fixes #409 2018-08-30 08:50:03 +02:00
Carlos Jimenez a1b87e473e removed unused code 2018-08-30 08:17:05 +02:00
Carlos Jimenez 8d79298d92 #478 dialog Front unit test 2018-08-30 08:16:50 +02:00
Joan Sanchez bd38d07af4 front-end unit test fixed 2018-08-30 07:15:04 +02:00
Joan Sanchez 3c954f13f3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-30 07:09:09 +02:00
Joan Sanchez 3594d5df4c back-end test fix 2018-08-30 07:09:06 +02:00
gerard 3c675b99a0 bug with clear solved CR JOAN 2018-08-29 13:55:47 +02:00
Carlos Jimenez 08ef7dee96 #444 style amends 2018-08-29 11:43:25 +02:00
Carlos Jimenez aff9f57833 #444 claim basic data 2018-08-29 09:45:37 +02:00
Carlos Jimenez 1b51ab7e6d refactor CR Joan 2018-08-29 08:15:49 +02:00
Carlos Jimenez 5d6a8f773c refactor CR Gerard 2018-08-29 08:15:23 +02:00
Carlos Jimenez 072581a0fe refactor CR Joan 2018-08-29 08:14:18 +02:00
Carlos Jimenez cad4f1617a lint errors corrected 2018-08-29 08:13:54 +02:00
Joan Sanchez 2e8f8109e7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 15:12:04 +02:00
Joan Sanchez 1d14ca1a3f updated contacts 2018-08-27 15:11:57 +02:00
gerard 740cc9f626 Bug #590 estructura basica de claim 2018-08-27 11:48:37 +02:00
gerard 5c60ba1336 Bug #590 estructura basica de claim 2018-08-27 11:41:25 +02:00
gerard 0566dd5328 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-27 11:40:14 +02:00
Joan Sanchez 26d2054be1 removed focus 2018-08-27 11:27:32 +02:00
Joan Sanchez 1c17adcd25 refactor client contact 2018-08-27 11:22:59 +02:00
gerard e92ae60792 Bug #590 estructura basica de claim 2018-08-24 13:16:11 +02:00
Joan Sanchez 8f45888a6b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 14:11:00 +02:00
Joan Sanchez de4d9c5bab input-range 2018-08-23 14:10:54 +02:00
Carlos Jimenez c2f89e7089 #482 popover.js Front unit test 2018-08-23 13:53:29 +02:00
Joan Sanchez c7ff42b409 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-23 10:08:15 +02:00
Joan Sanchez be6b2aa247 updated ticket filter #461 2018-08-23 10:08:06 +02:00
gerard c803a754d5 watcher deleted because it was causing bugs in this section 2018-08-23 08:58:28 +02:00
Carlos Jimenez 7d488217b5 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 13:30:07 +02:00
Carlos Jimenez 7db3a96adc #504 client/item/src/search-panel/index.js Front unit test 2018-08-22 13:29:54 +02:00
Joan Sanchez 544ed62153 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-22 13:28:10 +02:00
Joan Sanchez 997c4c52f9 added backend summary test #520 2018-08-22 13:28:01 +02:00
Carlos Jimenez c91163f7d1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:49 +02:00
Carlos Jimenez b20ecc307b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-22 12:55:23 +02:00
Carlos Jimenez 7abeebeecb #503 client/item/src/index/index.js Front unit test 2018-08-22 12:55:15 +02:00
gerard 901c0f609b bugs with date definition solved 2018-08-22 12:55:13 +02:00
gerard 05ea1dcbf1 Tarea #494 /directives/bind.js Front unit test 2018-08-22 12:41:00 +02:00
gerard dd3f13942f Tarea #468 /address/edit/index.js Front unit test 2018-08-21 14:13:11 +02:00
Joan Sanchez 300b2c2a07 catalog filter #581 2018-08-21 13:38:16 +02:00
gerard fc95597a96 Tarea #505 /summary/index.js Front unit test 2018-08-21 13:14:18 +02:00
gerard 86805769fe Tarea #505 /summary/index.js Front unit test 2018-08-21 13:13:51 +02:00
Joan Sanchez 10350ac97e css & eslint fix 2018-08-21 10:54:01 +02:00
Carlos Jimenez 2b4959ce36 #512 /main-menu/main-menu.js Front unit test 2018-08-21 09:03:51 +02:00
gerard ca523e634c Bug #589 cambiar el estado desde ticket.sales no guarda el historico 2018-08-21 07:39:01 +02:00
gerard 2d6932fe49 Little refactor 2018-08-20 14:52:37 +02:00
gerard 2bbbdcb55e Added missing file 2018-08-20 14:48:21 +02:00
gerard 83bf54569c Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-20 13:01:36 +02:00
gerard fd313a3134 Tarea #429 order.catalog click en boton + abrir añadir cantidad 2018-08-20 09:01:38 +02:00
Joan Sanchez a60720d1ed Ticket packaging refactor + front test updated 2018-08-17 14:53:25 +02:00
Joan Sanchez 4b7c87e6d0 left menu front test #511 2018-08-17 11:05:09 +02:00
Joan Sanchez 1786602187 Change landed on shipped change #458 2018-08-16 13:12:18 +02:00
Carlos Jimenez b4321816be #515 descriptor client unit test 2018-08-16 07:40:25 +02:00
Carlos Jimenez c14fe295d7 #474 descriptor-popover Front unit test and refactor of other test 2018-08-14 09:12:28 +02:00
Carlos Jimenez 8fa84c5074 #517 ticket index unit tests 2018-08-13 09:32:33 +02:00
Carlos Jimenez 90fdb5db84 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-12 10:55:27 +02:00
Carlos Jimenez 5b81308cd9 #514 ticket step 3 clientside unit tests 2018-08-12 10:55:16 +02:00
gerard 439adaf409 Tarea #471 credit/create/index.js Front unit test 2018-08-10 17:13:25 +02:00
gerard 5d503e9c19 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-10 13:21:00 +02:00
Joan Sanchez a3d15965ab packaging & component back tests 2018-08-10 11:40:48 +02:00
Joan Sanchez 3c79f3cc7b ticket summary unit test 2018-08-10 07:43:39 +02:00
gerard a58e534a6d item descriptor front test 2018-08-09 16:12:28 +02:00
gerard f0df298138 Tarea #509 /create/card.js Front unit test 2018-08-09 15:42:21 +02:00
gerard e3cfe9472f Tarea #509 /create/card.js Front unit test 2018-08-09 15:40:37 +02:00
Joan Sanchez e587aebc70 client summary front test 2018-08-09 15:10:45 +02:00
Joan Sanchez 337b4114f0 address & ticket card front unit tests 2018-08-09 14:42:02 +02:00
gerard 37c24ba3dd problem solved 2018-08-09 14:18:15 +02:00
Carlos Jimenez b85ae15b54 removed unexpected focus describe 2018-08-09 13:21:15 +02:00
Carlos Jimenez e7d45274d9 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-09 13:14:05 +02:00
Carlos Jimenez 8f46a455d6 #507 unitarios front tax plus refactor 2018-08-09 13:13:50 +02:00
Joan Sanchez f15d8c3087 front & back tests 2018-08-09 12:54:29 +02:00
gerard 3478d50b43 test fixed 2018-08-09 12:47:22 +02:00
gerard 83359cbf63 Tarea #508 /src/card/index.js Front unit test 2018-08-09 12:46:50 +02:00
Joan Sanchez 2fc7c0a807 Fixed translations 2018-08-09 08:57:16 +02:00
gerard 505ad27217 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-08 14:45:39 +02:00
gerard b2d3451360 Bug #422 refactorizar el summary y el card de item y añadir el visible y el available 2018-08-08 14:45:29 +02:00
Joan Sanchez 262835041f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-08 14:43:24 +02:00
gerard 7625f7806b Bug #422 refactorizar el card de item y añadir el visible y el available 2018-08-08 14:40:01 +02:00
gerard 1468c60a3a Tarea #502 /descriptor-popover/index.js Front unit test 2018-08-08 14:38:50 +02:00
Joan Sanchez 671c6bd3ff Ticket list refactor. Ticket problems, ticket total #245 & #461 2018-08-08 14:26:54 +02:00
Carlos Jimenez 5e0342c9b9 #501 unitarios getTags karma 2018-08-08 10:57:36 +02:00
Carlos Jimenez 68a3a47894 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-08 09:07:39 +02:00
Carlos Jimenez 34f0f4c853 #476 web-access/index.js Front unit test 2018-08-08 09:05:31 +02:00
Joan Sanchez a1d3a1594e Moved snackbar to center. Reduced snackbar timeout by 3sec. #573 2018-08-08 08:53:19 +02:00
gerard e71a90d422 Tarea #510 /volume/index.js Front unit test 2018-08-07 17:07:41 +02:00
gerard 6cd143428d Tarea #438 order.line 2018-08-07 16:08:42 +02:00
gerard f170f7b621 sale now rolls back to olda data when it cant update the price 2018-08-07 16:06:44 +02:00
gerard 65ffade0a3 Tarea #438 order.line 2018-08-07 16:04:42 +02:00
Joan Sanchez 6b47787de8 dev modules only for developer role 2018-08-07 13:41:57 +02:00
Joan Sanchez a06f7fb01f added claim list #443 2018-08-07 12:48:55 +02:00
Joan Sanchez 72766d0759 Added module claim #442 2018-08-07 11:57:11 +02:00
Joan Sanchez 8228f49eed Fixed ticket basic data message type 2018-08-06 14:25:11 +02:00
gerard b2d12b709b Tarea #583 Refactorizar textfield y front unit test 2018-08-06 14:09:55 +02:00
gerard 7367792d91 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-06 11:58:08 +02:00
Bernat c177bc7ab9 fix test and fixtures for itemTags updated 2018-08-03 08:29:38 +02:00
gerard a758cad2de focus deleted 2018-08-03 08:25:13 +02:00
Joan Sanchez 901398cfa7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-03 07:52:44 +02:00
Joan Sanchez 8ce1e5ebf7 Added ticket pictures section #430 2018-08-03 07:52:37 +02:00
gerard 2fa91ef59d getVAT now doesn't make a call when it can't 2018-08-02 15:39:32 +02:00
gerard 17b70192af Bug #576 Cambiar los bindings del textfield 2018-08-02 15:34:48 +02:00
gerard 16dfaf8943 added pointer to link class 2018-08-02 15:33:50 +02:00
gerard 84462be55a revert Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-02 15:33:24 +02:00
gerard dd22309e7c Bug #576 Cambiar los bindings del textfield 2018-08-02 15:31:01 +02:00
Joan Sanchez 781fc1b70b summary checkbox line spacing 2018-08-02 14:55:17 +02:00
gerard 2105ccb92b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-02 11:35:00 +02:00
gerard ee3627be16 Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-02 11:34:50 +02:00
Joan Sanchez 9ac6b2cb56 fixed client quicklink 2018-08-02 11:21:49 +02:00
gerard 71a559783c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-02 10:54:08 +02:00
gerard 49ea108771 Bug #571 usuario con privilegios cambia el estado de un ticket bloqueado 2018-08-02 10:54:03 +02:00
Joan Sanchez 25187b955f Fixed descriptor quicklinks 2018-08-02 10:06:11 +02:00
Joan Sanchez ff0f0436af Fixed locales: client & back-end validations, back-end UserError. #464 2018-08-02 09:49:00 +02:00
gerard 9014e8cee1 new style for visible avaible 2018-08-02 07:47:41 +02:00
gerard 82a1aa13ad Added link class 2018-08-01 16:24:53 +02:00
gerard c461f16ce7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-01 16:09:10 +02:00
Joan Sanchez d83665a0c5 show itemDiary icon on ticket descriptor popover. #441 - CR Javi 2018-08-01 12:15:09 +02:00
Carlos Jimenez b5356eb07d spec files renamed accordingly, plus linter or indentation corrections 2018-08-01 09:47:34 +02:00
Joan Sanchez c5269fedfa updated fontello fonts 2018-07-31 14:41:42 +02:00
gerard 9ce117325c when you create an order now redirects to order.card.catalogue 2018-07-31 14:08:41 +02:00
Carlos Jimenez 5aae572566 renamed spec files plus fixtures update for ticket basicdata #462 e2e 2018-07-31 13:49:54 +02:00
Carlos Jimenez d2314b8a1b renamed karma spec files acordantly and removed unused ones on client client 2018-07-31 12:38:31 +02:00
Carlos Jimenez 6684642f31 removed unused spec file 2018-07-31 12:15:31 +02:00
Carlos Jimenez 0fe58f78b4 added a describe to help further implementation 2018-07-31 12:00:44 +02:00
Carlos Jimenez 6f78bc61db added separation between describes 2018-07-31 11:54:54 +02:00
Carlos Jimenez 1858cea710 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-07-31 11:51:35 +02:00
Carlos Jimenez 1136afa484 order refactor 2018-07-31 11:51:24 +02:00
gerard 21ab8a5573 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-31 11:27:01 +02:00
gerard 2355ecc66a translations added 2018-07-31 11:26:57 +02:00
Joan Sanchez 4103f7fcf6 Added sample create #440 2018-07-31 11:08:22 +02:00
gerard 564d4f63b8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-30 14:46:09 +02:00
gerard 2d9edcef52 fixed wrong calls to functions 2018-07-30 14:46:04 +02:00
Carlos Jimenez d866e0c982 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-07-30 14:05:40 +02:00
Carlos Jimenez 7b7a0cc1e9 refactor para que funcione data bind en lineas de pedido 2018-07-30 14:05:27 +02:00
Joan Sanchez 182599f663 Fixed scroll on itemDIary to line with alertLevel 1 #433 2018-07-30 12:12:41 +02:00
Joan Sanchez 66a1f8fcfa updated fonts 2018-07-27 14:50:28 +02:00
gerard ddc6b9d77e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-27 12:20:14 +02:00
gerard 38ba6bae7a Bug #453 Fallo al cambiar el estaddo de un ticket desde sale 2018-07-27 12:20:10 +02:00
Joan Sanchez bf5a48f126 added field longName to item summary and basic data #449 2018-07-27 12:15:25 +02:00
gerard f87ccee0b2 fixed bugs of client descriptor popover 2018-07-27 09:44:25 +02:00
gerard d2359af6ba added client descriptor popover to ticket descriptor 2018-07-26 14:02:23 +02:00
gerard fa9494fe03 added styles 2018-07-26 13:49:01 +02:00
gerard c3846eaaea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-26 13:43:43 +02:00
gerard 333193f2e8 fixed descriptor size 2018-07-26 13:43:32 +02:00
Joan Sanchez 2042acac75 fixed translations 2018-07-26 12:25:25 +02:00