Commit Graph

1276 Commits

Author SHA1 Message Date
gerard 67d689443a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-09 09:48:11 +02:00
gerard 790dcad11e Tarea #354 seccion ticket.line menu de mover lineas 2018-07-09 09:48:00 +02:00
Joan Sanchez 5608b1bd26 itemDiary alertLevel replaced by state name #384 2018-07-09 09:37:38 +02:00
gerard 3f1d2494f2 Bug #389 ADD TURN HACIA NUEVO TICKET ACCESS DENIED 2018-07-09 09:16:01 +02:00
gerard efc588180f Bug #388 no se actualiza el simulador 2018-07-09 09:09:08 +02:00
Juan 96d755cd21 Code linting, code clean 2018-07-06 16:32:23 +02:00
gerard 354c2a8369 test fixed 2018-07-06 16:29:31 +02:00
gerard 0c7676d3e5 fixed test 2018-07-06 16:27:34 +02:00
Joan Sanchez 059aa3462f Payment method email translation to FR. 2018-07-05 07:34:46 +02:00
gerard 66a7cbb998 refactor textfield CR JUAN 2018-07-04 16:36:37 +02:00
gerard 2ac0c34085 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-04 14:44:02 +02:00
gerard 78bab7c5a8 352 ticket.lines Modificar descuento haciendo click en campo descuento 2018-07-04 14:42:02 +02:00
gerard 36a3d04216 Tarea #330 Añadir a ticket.line el indicador de problemas 2018-07-04 14:41:01 +02:00
Juan 1e54b9e228 Merge 2018-07-04 12:25:24 +02:00
Joan Sanchez dd1e1123bf Worker translation 2018-07-04 11:28:29 +02:00
Joan Sanchez 86a8ae0322 itemDiary, filter, grid and new directive repeat-last #346 2018-07-04 08:50:34 +02:00
Juan b49bd3d903 Filters optimized for numeric values 2018-07-03 17:41:41 +02:00
gerard 7918484156 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-03 15:24:08 +02:00
gerard 5a6baa646f Bug #378 test 2018-07-03 15:23:10 +02:00
Joan Sanchez 28a2c45c46 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-03 15:01:19 +02:00
Joan Sanchez 7dc1d5c811 Added saleTracking section #351. CR: Juan + Javi 2018-07-03 15:00:33 +02:00
gerard 8a655a7003 Bug #378 Refactorizar marcar como reservado para que no utilice el crud 2018-07-03 15:00:16 +02:00
Joan Sanchez d461e8e2fa responsive fetched-tags 2018-07-03 14:58:38 +02:00
Joan Sanchez 64eef322e9 Fixed vnTable trying to apply filter an it's not defined. 2018-07-03 14:57:08 +02:00
Juan 3208cc7851 vnTextfield style fixes 2018-07-03 14:33:31 +02:00
Juan 98001b364e vnAutoPaging renamed to vnPagination plus bugs fixed 2018-07-03 13:45:25 +02:00
Juan cfce618844 Popover horizontal alignment fixes 2018-07-03 13:36:35 +02:00
Juan 2b03f656c8 Popover overflow bugs fixed 2018-07-03 13:24:42 +02:00
Javi Gallego f417dba3ba #367 addressesPropagateRe desmarcar campo hasToInvoiceByAddress cr JOAN 2018-07-03 11:13:33 +02:00
gerard fb31004c08 Bug #377 Eliminar lineas no ofrece un dialog de confirmacion 2018-07-02 14:14:16 +02:00
gerard a9b095a3bd Bug #376 2018-07-02 13:18:22 +02:00
gerard 48e44bd610 Bug #376 dropdown "more" en ticket.sale no actualiza sus datos 2018-07-02 13:17:01 +02:00
gerard cb34b11b99 Solverd bug related to Bug #312 2018-07-02 13:14:14 +02:00
gerard df8d3078d9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-02 13:13:42 +02:00
gerard 3bca15708f Bug #312 Autocomplete intenta mostrar el valor antes de tener los datos 2018-07-02 13:13:26 +02:00
Joan Sanchez 9982b9df11 onDataChange() binding crud-model 2018-07-02 11:52:50 +02:00
Juan 6f07ae3c5c Watchers from vnLabelValue removed 2018-06-29 09:46:14 +02:00
Joan Sanchez c123207ac2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-29 08:42:45 +02:00
Joan Sanchez 6450aa8f34 vnTable toggle order only on active field 2018-06-29 08:41:53 +02:00
gerard a01fa0e9ad Bug #136 Refactorización DropDown 2018-06-28 15:56:09 +02:00
gerard 2594f170cf Bug #137 Refactorización Textfield 2018-06-28 15:54:54 +02:00
gerard 526929cd56 fdescribe deleted 2018-06-28 15:47:14 +02:00
gerard da69165fb3 Tarea #352 ticket.lines Modificar descuento 2018-06-28 15:30:48 +02:00
gerard 5cfb11641c Tarea #373, Tarea #352 focus on first input popover 2018-06-28 15:30:11 +02:00
gerard accd66f63a Tarea #352 ticket.lines Modificar descuento 2018-06-28 15:21:04 +02:00
gerard 54ee27dcef Tarea #355, Tarea #354, Tarea #352 SALE 2018-06-28 15:17:50 +02:00
Joan Sanchez 45b3a5ce02 New grid component vnTable. #139. CR: Juan & Javi 2018-06-28 14:43:59 +02:00
Joan Sanchez dfa1d1edb2 Added new section client contacts #365 - CR: Javi 2018-06-26 09:41:27 +02:00
gerard 38914a060f Bug #348 arreglar traducciones de ticket.line 2018-06-25 18:01:45 +02:00
gerard ddb04a5d87 Bug #348 arreglar traducciones de ticket.line 2018-06-25 16:55:19 +02:00
Joan Sanchez dafd0a2f1a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-21 09:22:08 +02:00
gerard 40a9833e3e Revert texfield changes Bug #137 2018-06-21 09:17:39 +02:00
gerard 7ceda630d4 Revert Texfield 2018-06-21 09:12:35 +02:00
Joan Sanchez 57afcdf55e Intrastat code on item summary #363 2018-06-21 09:11:25 +02:00
Joan Sanchez 00018ffda4 karma test fix locale 2018-06-21 09:07:05 +02:00
Joan Sanchez afe051883e label-value component Enable/disable ellipsize #364 2018-06-21 08:46:30 +02:00
Joan Sanchez 101d8875a9 Fix textfield non-empty class with value zero 2018-06-20 14:53:24 +02:00
gerard b22e41c983 Bug #137 Refactorización Textfield 2018-06-20 14:15:14 +02:00
gerard 37e52b54b0 Tarea #333 Ultimas Entradas 2018-06-20 12:30:59 +02:00
gerard b8ff2dbb0a Tarea #333 Ultimas Entradas 2018-06-20 12:29:30 +02:00
gerard 42eacd4905 Tarea #333 Ultimas Entradas 2018-06-20 11:39:29 +02:00
Joan Sanchez 9037636de5 one-binding changed to two-way binding on finished date. 2018-06-20 09:16:15 +02:00
gerard 97c994b3e0 Bug #137 Refactorización Textfield 2018-06-20 08:41:59 +02:00
Joan Sanchez 0ab7d09a41 Hour translation 2018-06-19 14:37:56 +02:00
Joan Sanchez 8f6a88f9b6 Display sale taxes #342 2018-06-19 12:10:38 +02:00
Joan Sanchez db5457420d Mark/Unmark sale as reserved #349 2018-06-19 09:09:49 +02:00
gerard 8448d76ebe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-19 09:06:22 +02:00
gerard f2596af6b8 Dropdown ahora acepta traducciones CR Juan 2018-06-19 09:06:04 +02:00
Joan Sanchez 8cd0a5a9e2 stackable snackbar. Updated E2E #357 2018-06-19 08:12:36 +02:00
gerard 532d20cd7f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-18 12:04:10 +02:00
gerard 5c92dc4216 Bug solved 2018-06-18 12:03:39 +02:00
Javi Gallego af925de00c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-18 07:26:12 +02:00
Juan 0aa4b8bba3 Merge branch 'test' into dev 2018-06-12 17:17:59 +02:00
Juan 3174f37e3e Routes fixed to use HTTPS 2018-06-12 17:17:40 +02:00
Javi Gallego 64da648a2f Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 08:01:43 +02:00
Javi Gallego 1b4c97fa6a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-09 11:56:29 +02:00
Javi Gallego 9e0e97db66 traduccion order 2018-06-09 11:56:05 +02:00
Juan 240f080de3 Icons updated, test fixed, paging rows adjusted 2018-06-08 13:26:06 +02:00
Juan 2951a737a7 Merge 2018-06-07 23:56:16 +02:00
Juan 9fa12d4baf Automatic pagination with vnPagination, improved vnSearchbar 2018-06-07 23:47:19 +02:00
Javi Gallego e891d7f3e6 traducciones 2018-06-07 13:31:52 +02:00
gerard 8c34dba79e Tarea #296 seccion ticket.line menu de mover lineas 2018-06-06 16:54:40 +02:00
gerard 5e28d0485c removed duplicated model 2018-06-04 12:00:47 +02:00
gerard 689a04e21e Bug #319 Arreglar colores segun nuevas directivas de paco 2018-06-04 11:57:27 +02:00
gerard 89c9af878f Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 10:02:17 +02:00
gerard c0c3925470 Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 09:48:32 +02:00
Juan a015b790b5 Language fixes 2018-06-01 09:04:49 +02:00
Juan 27dc90ac3d Style fixes 2018-05-31 16:51:33 +02:00
Juan f9c0d0d911 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-31 16:27:21 +02:00
Juan 55ccc74402 Snackbar fixes 2018-05-31 16:27:06 +02:00
Joan Sanchez d316b17899 Merge branch 'dev' into test 2018-05-31 14:58:51 +02:00
Joan Sanchez 4173180fde fixed eslint rules 2018-05-31 14:48:10 +02:00
Juan 97c840ece7 Style fixes 2018-05-31 14:40:42 +02:00
Joan Sanchez 20897a287e Order index route 2018-05-31 14:34:15 +02:00
Juan 2a6dedfc91 Style fixes 2018-05-31 13:57:48 +02:00
Juan 0d2693d8e1 Style fixes 2018-05-31 13:45:51 +02:00
Juan e78d2e5ede Style fixes 2018-05-31 13:34:48 +02:00
Juan 3c9d8f32bb Merge 2018-05-31 11:56:52 +02:00
Juan a78bb24e09 Tests fixed, bugs solved, vnCrudModel, vnRestModel, UserError 2018-05-31 11:52:39 +02:00
Joan Sanchez 804218cdae Iconos en descriptor de ticket #329 2018-05-31 08:57:25 +02:00
Joan Sanchez c0167edc3e Credit insurance refactor #328 2018-05-31 07:59:42 +02:00
Joan Sanchez d6f0be2209 Remove ticket from route. Added warehouse to procedure. #326 2018-05-30 10:55:54 +02:00
gerard fc67fdd6af Tarea #315 dialog refactor needed CR JUAN 2018-05-30 08:45:02 +02:00
gerard c6a8b4cea9 Tarea #315 Card refactor needed CR JUAN 2018-05-30 08:44:01 +02:00
Juan 3833339cc6 Merge 2018-05-29 17:46:10 +02:00
Joan Sanchez 8878593bbe Show item descriptor on itemFk click 2018-05-29 14:33:29 +02:00
Joan Sanchez 34ff655617 responsive fetched-tags component #323 CR: Juan 2018-05-29 13:51:39 +02:00
Joan Sanchez a1a0f2e0b7 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-29 13:36:55 +02:00
Joan Sanchez 4dd5019ae0 Show isEqualizated on addresses list #302. CR: Javi 2018-05-29 13:36:41 +02:00
Javi Gallego 5745bfa8da permisos de imagen para marketing y compradores 2018-05-29 11:53:34 +02:00
Joan Sanchez e14ab33b9c FIlter item by name #299 2018-05-29 09:37:24 +02:00
Joan Sanchez 125c6dea37 Address state fix #325 2018-05-28 13:44:41 +02:00
Joan Sanchez ca0524f24b Navigate to address list fix. #325 2018-05-28 13:38:13 +02:00
Joan Sanchez 5199ca62f4 Send notification on payment method change. #257 2018-05-28 12:22:35 +02:00
Javi Gallego f4423e3fb5 fix ticket-volume 2018-05-28 09:30:00 +02:00
Javi Gallego 8b03ba420f #309 seccion ticket.volume con m3 y sumatorio CR juan 2018-05-28 09:16:06 +02:00
Joan Sanchez 74410d4045 getVolume route should return only data #324 CR: Juan 2018-05-28 08:52:18 +02:00
Juan 30aea3d086 Tests fixed, watcher refactor, global error handling, angular 1.7 2018-05-25 17:25:35 +02:00
Joan Sanchez 7a5d8bdd03 Added warehouse & isDeleted on ticket basic data #322 2018-05-25 11:40:04 +02:00
Joan Sanchez 2aee807915 Item,ticket services refactor and TicketComponent test fix #261 2018-05-25 10:03:45 +02:00
gerard 3b4cde9b46 Tarea #320 Hacer que el datepicker añada el dia con la hora local 2018-05-25 08:54:47 +02:00
gerard 255a33f104 fixed error in watcher post 2018-05-24 16:09:32 +02:00
gerard 58553309ff fixed typo 2018-05-24 16:04:09 +02:00
gerard fe27f0e44f fixed bugs in recovery 2018-05-24 16:02:54 +02:00
gerard c512faf45c fixed bugs on greuge 2018-05-24 15:47:04 +02:00
gerard 9b8ee8b787 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-24 15:46:09 +02:00
Joan Sanchez 09c98368b8 Tests fix && renamed .list to .index states 2018-05-24 15:02:38 +02:00
gerard b3ce2a8630 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-24 13:44:59 +02:00
Joan Sanchez d20faedd64 Convert date to JSON #317. CR Juan 2018-05-24 11:21:44 +02:00
Joan Sanchez e7f258061c Snackbar fix message color #204. CR: Juan 2018-05-24 09:19:23 +02:00
gerard b00c6888c2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-23 14:27:54 +02:00
Joan Sanchez 3bb1c92cf5 Client routes refactor #261 2018-05-23 14:26:51 +02:00
gerard 7440909a48 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-22 15:07:39 +02:00
gerard 1e4cafa73d arreglado bug no mostraba las facturas 2018-05-22 15:03:31 +02:00
Juan 518a82bf26 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-22 11:44:33 +02:00
Juan 2f1e5b4fb4 #82 Non-generated files removed from generated directory, vnTooltip refactor 2018-05-22 11:44:24 +02:00
gerard d21b57e536 Refactor step-one unit test 2018-05-22 08:14:16 +02:00
gerard 73104c4465 Bug #313 Modified tests 2018-05-21 12:03:36 +02:00
gerard 6f45a8fa5b Bug #313 Cuando cancelas vn-confirm guarda los datos igualmente 2018-05-21 11:59:23 +02:00
gerard 7f54bcb019 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-21 11:48:50 +02:00
Joan Sanchez 88cf75e088 Active client debt icon when has debt greather than zero. 2018-05-21 07:31:38 +02:00
Daniel Herrero f612cab8c0 autoPaging bug fixed 2018-05-20 19:18:05 +02:00
gerard e118798c69 Refactor multicheck para que acepte la propiedad disabled 2018-05-18 14:59:56 +02:00
Joan Sanchez 026a5b7dea Change address when client is selected on ticket basic data 2018-05-17 08:44:34 +02:00
Javi Gallego 7aa2d04d00 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-16 13:28:59 +02:00
Javi Gallego 5779e47197 buy de item.tax no se mostraba al rol buyer 2018-05-16 13:28:54 +02:00
Joan Sanchez fe60481b1f Disabled unused services 2018-05-16 13:26:36 +02:00
Joan Sanchez f0e8b90316 Added description field on item basic data #303 2018-05-16 13:02:19 +02:00
Joan Sanchez 11b7c133a4 Added package & dropdown replaced search regexp with like 2018-05-16 13:01:14 +02:00
gerard 0fdb4a4785 Bug #306 Modificar TicketTracking para tener en cuenta los nuevos ACL 2018-05-16 12:56:46 +02:00
Joan Sanchez 3557a08d2c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-16 08:19:06 +02:00
Joan Sanchez 8f9f7c1fe6 Ticket basic data and date-picker refactor 2018-05-16 08:13:39 +02:00
Javi Gallego d5c21c046e traduccion Order 2018-05-16 08:10:43 +02:00
Joan Sanchez 5e2e898151 Shipped with datetime 2018-05-15 09:43:45 +02:00
gerard b5cfbf1246 Bug #253 Actualizar los estilos para que concuerden con la paleta 2018-05-14 12:54:17 +02:00
Joan Sanchez 325aae7ebd Changed ticket summary service path 2018-05-14 10:07:22 +02:00
Joan Sanchez f1de516a78 Edit address agencyMode combobox fix 2018-05-11 11:44:47 +02:00
gerard 7a60211023 Unhandled errors fixed CR JUAN 2018-05-11 11:20:37 +02:00
gerard 85aa3b0156 Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta""
This reverts commit d9862b8922.
2018-05-11 11:16:16 +02:00
gerard d9862b8922 Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"
This reverts commit 9b07cd444c.
2018-05-11 11:10:15 +02:00
gerard 9b07cd444c Tarea #289 Cuando se modifica el crédito mostrar alerta 2018-05-11 11:09:07 +02:00
gerard b0d5e2958e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-11 09:04:09 +02:00
Joan Sanchez bd069a1f39 Rolling back to old pagination 2018-05-11 08:35:28 +02:00
gerard aa7dbaeccb Initial work Handle unhandled exceptions CR JUAN 2018-05-10 13:48:48 +02:00
gerard 1af698acc3 Bug #290 Componentes de ticket muestra todos los componentes existentes. 2018-05-10 13:36:26 +02:00
gerard 503e1a7163 Tarea #283 Modificar encabezado el client.summary 2018-05-09 13:58:53 +02:00
Javi Gallego d6be8f8f93 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-08 13:40:53 +02:00
gerard 4893de6808 test para el refactor de multicheck Tarea #284 2018-05-08 11:45:22 +02:00
gerard 2a259b27dc Revert "test para el refactor de culticheck Tarea #284"
This reverts commit 58f903b294.
2018-05-08 11:43:28 +02:00
Javi Gallego 1ce622d1e5 bug traduccion 2018-05-08 11:07:34 +02:00
gerard 58f903b294 test para el refactor de culticheck Tarea #284 2018-05-08 11:01:30 +02:00
gerard 99adbf6a86 aññadido estilo para Tarea #265 CR JUAN 2018-05-08 10:04:15 +02:00
gerard 66daec4487 eliminadas propiedades innecesarias de icon button 2018-05-08 09:59:49 +02:00
gerard b569247e91 Refactor autocomplete CR JUAN para Tarea #265 2018-05-08 09:58:49 +02:00
gerard 23c6ab7c39 Traducciones para Tarea #284 2018-05-08 09:57:47 +02:00
gerard 8cdf41d9ad Refactor multi-check para Tarea #284 CR: JUAN 2018-05-08 09:55:45 +02:00
gerard 6544d0161c Tarea #284 Seccion ticket.lineas icono papelera para eliminar lineas 2018-05-08 09:54:14 +02:00
gerard a9ade07aa0 Cambiado ticketTracking por tracking CR JUAN 2018-05-08 09:40:37 +02:00
gerard 1460887ca2 Añadido metodo en ticket card para que se actualicen datos del ticket 2018-05-08 09:30:55 +02:00
gerard c7f07d0548 Refactorizacion de icon-menu para Tarea #265 y #279 CR: JUAN 2018-05-08 09:28:25 +02:00
gerard bf87c3d2ac Refactorizacion de buton en componente para Tarea #265 CR: JUAN 2018-05-08 09:26:17 +02:00
gerard 024a248797 #265 Añadir boton ok y estado CR: JUAN 2018-05-08 09:25:15 +02:00
Joan Sanchez e1bc434f34 Added front-end & back-end "order" service #267 2018-05-07 09:08:46 +02:00
Joan Sanchez 3c0fe7a4bc Added new pagination & module index search fixed #268 2018-05-07 08:33:45 +02:00
Joan Sanchez 22250984ae CSS class ellipsize with max-width 20em 2018-05-04 14:27:45 +02:00
Joan Sanchez 681731e886 back-end refactor & item search fix. #260 2018-05-04 11:46:03 +02:00
Daniel Herrero c838d98010 autoPaging bug fixed onScroll 2018-05-03 20:46:08 +02:00
Javi Gallego eaf4bbbdbb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-03 19:31:40 +02:00
Joan Sanchez 850f033b63 Recovery list added new pagination component 2018-05-03 13:28:46 +02:00
Javi Gallego b3405a3164 Bug #252 CR Juan 2018-05-02 11:54:13 +02:00
Javi Gallego 80a3f0a914 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-02 08:57:19 +02:00
Daniel Herrero 33f7b2d45a renamed action 2018-04-30 14:00:09 +02:00
Daniel Herrero 628dd5a99b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-30 13:57:14 +02:00
Daniel Herrero a7e5f1a623 new component for infinite scroll vnAutoPaging 2018-04-30 13:57:10 +02:00
Bernat c31d1ed888 update fixtures and dumpedfixtures with table vn.state 2018-04-30 12:48:29 +02:00
Daniel Herrero 50011bff8e getWatchers function 2018-04-30 12:30:56 +02:00
Javi Gallego 118638a38b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-30 08:33:36 +02:00
Javi Gallego b7c310bd50 nueva fuente fontello 2018-04-27 10:01:29 +02:00
Juan 64cf636f90 Merge 2018-04-27 09:57:15 +02:00
Juan 0c99ca6f17 Jenkins test 2018-04-27 09:55:58 +02:00