verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
3,489 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

1598 Commits

Author SHA1 Message Date
Gerard a2db6201aa Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-30 15:04:04 +01:00
Gerard 74d72fddfb #760 ticket.ticketWeekly 2018-10-30 14:57:22 +01:00
Juan 260f548019 #599 Advanced ticket search, eslint rules fixed, e2e ticket_04 refactor 2018-10-30 13:58:02 +01:00
Joan Sanchez 12fc0941b7 autocomplete translate-fields property fixed 2018-10-30 10:52:40 +01:00
Gerard 6ae781cc98 test fixed 2018-10-30 08:03:26 +01:00
Gerard c9c2f139d5 css fixed 2018-10-29 15:59:52 +01:00
Gerard 3a0aa9da8e #769 fixed user filter 2018-10-29 12:48:25 +01:00
Gerard 20de81a3c8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-29 11:57:02 +01:00
Gerard 5ef3820912 #769 crear sección log en item y ticket 2018-10-29 11:56:55 +01:00
Carlos Jimenez 5423744489 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-29 10:42:52 +01:00
Carlos Jimenez a8355ff455 #756 ticket.sale-tracking scss fixes 2018-10-29 10:42:43 +01:00
Gerard 36f048e4ef Bug #772 Ticket expeditions ha dejado de funcionar 2018-10-29 09:39:37 +01:00
Carlos Jimenez 53fe9b6103 #756 ticket.sale-tracking checking state functionality 2018-10-29 08:33:53 +01:00
Carlos Jimenez 2a9dd98e6a #756 ticket.sale-tracking 2018-10-28 12:36:41 +01:00
Gerard ad8f3f9b9d #761 no se actualizan los cuando se abren varios summary-popover 2018-10-25 13:45:29 +02:00
Gerard 47a9ec6101 #758 no se muestran Base, Margen y Total en ticket components 2018-10-25 10:54:16 +02:00
Gerard 3851e4a889 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 14:21:39 +02:00
Gerard e491b2e4ba fixed local bank being null on init 2018-10-24 14:21:35 +02:00
Javi Gallego 3b2466e121 Tarea #703 client.risk.new 2018-10-24 14:10:48 +02:00
Gerard c77f77132c fixed typos and tests 2018-10-24 13:03:44 +02:00
Gerard 5b78457129 bugs tying to set local company null solved 2018-10-24 12:28:33 +02:00
Gerard af508b664c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 09:31:11 +02:00
Gerard 1e9bd88830 #748 el popover de congifuracion de usuario debe setear unas propedades por defecto 2018-10-24 09:31:08 +02:00
Joan Sanchez 0fa8608d47 hide empty left-menu, swift validation error 2018-10-23 14:56:38 +02:00
Gerard 0b112b3d59 #744 fix edit sale bug 2018-10-23 14:33:07 +02:00
Gerard 410c38c420 item diary visual refesh 2018-10-23 14:29:34 +02:00
Gerard 82bdea09ae added dataUpdate event 2018-10-23 13:50:31 +02:00
Gerard 47242d9b53 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-23 12:39:44 +02:00
Gerard 6b03ead37d #744 fix edit sale bug, boton MAS descuento 2018-10-23 12:39:25 +02:00
Juan 48c41aa35f JsDoc improved for model/pagination 2018-10-23 12:14:47 +02:00
Gerard 86f6253ed7 #707 Loggable 2018-10-23 11:34:07 +02:00
Joan Sanchez f2d5e6afee Field ACL part one #689 (vn-model) beforeRemote() wrapper 2018-10-23 11:25:51 +02:00
Juan 4d97f4b43e EventEmitter fixes 2018-10-22 17:54:04 +02:00
Gerard 6ef769f209 test refactor 2018-10-22 14:36:32 +02:00
Gerard 409c78ec94 fixed bug on load 2018-10-22 14:36:07 +02:00
Gerard 1a116df136 #636 item.index 2018-10-22 14:32:05 +02:00
Juan 0034991251 Events on elements now are emitted after component linking 2018-10-22 13:29:52 +02:00
Juan a190100cae EventEmitter doc 2018-10-22 11:04:17 +02:00
Juan 93ed02e901 Merge 2018-10-22 08:24:16 +02:00
Juan e5b404cc2c Models bugs fixed, tests fixed 2018-10-22 08:23:10 +02:00
Carlos Jimenez 65f39bfa8c Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-21 14:10:08 +02:00
Javi Gallego fcb3e88acb route sin risk Create 2018-10-21 12:36:51 +02:00
Carlos Jimenez 4347b0059f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-20 12:08:08 +02:00
Juan 181272086e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-19 19:54:50 +02:00
Juan 4607bce91e E2E fixes, model bug fixes, Nightmare getProperty extensions 2018-10-19 19:54:46 +02:00
Gerard 1b504febb8 fixed ACLS 2018-10-19 14:50:15 +02:00
Juan 74e234a099 vnTooltip test code improved 2018-10-19 09:33:12 +02:00
Javi Gallego c6c40de2fc # 702 Client.risk 2018-10-19 08:40:32 +02:00
Juan 2e0d5f2bde Unit test code improvements 2018-10-18 21:04:46 +02:00
Juan c4b3296959 Unit tests fixed 2018-10-18 20:48:21 +02:00
Carlos Jimenez 7093660800 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-18 11:42:56 +02:00
Carlos Jimenez 2bdfa6ff60 #633 El descriptor-popover + test 2018-10-18 11:41:25 +02:00
Juan ecee07530a Merge 2018-10-18 09:26:05 +02:00
Juan ee73068e9e #659 - Unify model beta 2018-10-18 09:24:20 +02:00
Joan Sanchez d681d61c83 Add new bank entity #736 2018-10-17 12:49:18 +02:00
Carlos Jimenez 0601bb662c #738 Petición de guardado al hacer click sobre un botón + test adaptados 2018-10-17 09:28:38 +02:00
Javi Gallego 4000926c74 Dos filtros nuevos, para monedas y porcentajes 2018-10-16 13:57:14 +02:00
Javi Gallego 33b9efc5b7 Tarea #696 2018-10-16 13:32:58 +02:00
Joan Sanchez 3826456a5a added bankEntity billing data #704 2018-10-16 13:06:58 +02:00
Joan Sanchez 54921b4982 fixed summary item descriptor #734 2018-10-16 08:38:31 +02:00
Gerard a681f6f854 Bug #635 item.data 2018-10-15 13:20:55 +02:00
Javi Gallego f25a1ecd98 #492 tooltip test 2018-10-15 12:46:56 +02:00
Joan Sanchez 589be52c6a Order filter & added model getSetValues() #722 2018-10-15 11:43:57 +02:00
Gerard 7ed52d455d Bug #730 order.catalog no añade lineas 2018-10-15 10:48:06 +02:00
Joan Sanchez e41817d29b enabled order for employee 2018-10-11 09:51:36 +02:00
Joan Sanchez 693a68ea26 vn-icon-button hide required acl buttons #708 2018-10-11 09:41:30 +02:00
Gerard 29251651a2 highlighted text now in black 2018-10-11 08:46:09 +02:00
Gerard 04f0f6d9f5 #723 order.summary 2018-10-10 14:03:56 +02:00
Gerard e91b1ef805 #723 redirect to summary 2018-10-10 12:58:27 +02:00
Gerard 060ab04084 #723 order.summary 2018-10-10 12:55:04 +02:00
Gerard 5dabb5625c merge 2018-10-10 11:50:30 +02:00
Joan Sanchez 31d655b130 Create ticket with transaction 2018-10-10 09:59:42 +02:00
Gerard 274e44368e #723 Added getTaxes to get the total taxes of an order 2018-10-08 15:21:06 +02:00
Javi Gallego 7b623cec09 Tarea #684 2018-10-08 14:38:16 +02:00
Joan Sanchez f878751ff1 Fixed mail notification bug #587 2018-10-08 13:09:30 +02:00
Gerard 7e2e2c9953 fixed test 2018-10-08 12:02:05 +02:00
Joan Sanchez 300c7a3cfe userConfig fix 2018-10-08 08:14:25 +02:00
Joan Sanchez f7e042320d regularize claim #656 2018-10-08 07:31:55 +02:00
Gerard b649ee71d9 Tarea #646 test 2018-10-05 16:13:30 +02:00
Gerard aeb774571e Tarea #646 Mejoras Historico 2018-10-05 15:53:31 +02:00
Gerard 20e76fb28d Tarea #646 item descriptor now passes the ticket id 2018-10-05 14:03:59 +02:00
Gerard 796b901378 Translations added 2018-10-05 13:06:29 +02:00
Gerard 0481cac14e Tarea #614 nueva sección cuenta 2018-10-05 13:01:46 +02:00
Gerard 8edbc40da3 unused code removed 2018-10-05 12:57:34 +02:00
Gerard bb46980f3f focus deleted 2018-10-03 11:28:50 +02:00
Gerard a607ac9efb Tarea #600 History section in client 2018-10-03 11:27:05 +02:00
Joan Sanchez 374d845d4b Descriptor/card/quicklinks fix #656 2018-10-03 08:00:19 +02:00
Gerard 1ea93211dc typo with acl fixed 2018-10-02 14:16:37 +02:00
Joan Sanchez 99d2ebb332 acl fix 2018-10-02 12:03:39 +02:00
Joan Sanchez b8d09bddb4 Import ticket sales #693 to claim actions 2018-10-02 09:52:38 +02:00
Joan Sanchez 1e604d92b4 Sale tracking get state from saleTracking instead of ticket. #695 2018-10-01 08:17:36 +02:00
Joan Sanchez 12824b1564 Added client web payment #673 2018-09-28 15:00:12 +02:00
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