Commit Graph

11212 Commits

Author SHA1 Message Date
Gerard 7976ca130e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-27 13:23:58 +01:00
Gerard 11c5240834 tests fixed 2018-11-27 13:23:51 +01:00
Bernat 731284ab9b update acl 2018-11-27 12:53:24 +01:00
Gerard 78ac80ad72 #837 now it filters with name and firstname 2018-11-27 09:46:44 +01:00
Gerard 72536571f5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-27 09:10:33 +01:00
Gerard 9bd6248632 #837 crear refactor de activeSalesPerson, activeBuyer en uno solo 2018-11-27 09:10:30 +01:00
Joan 853c562164 claim summary header padding 2018-11-27 09:10:15 +01:00
Gerard 0e17a090eb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-27 08:50:33 +01:00
Gerard 0b74df5dcb #837 crear refactor de activeSalesPerson, activeBuyer en uno solo 2018-11-27 08:50:13 +01:00
Joan 8459957dea fixed vn-table autoload 2018-11-27 08:48:01 +01:00
Gerard 23d8d43fbe reverted change 2018-11-26 13:44:58 +01:00
Gerard c3d0ee45b6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-26 13:13:10 +01:00
Gerard 16bd2141c8 #869 refactor componente log 2018-11-26 13:12:59 +01:00
Joan f3c0e3ae74 Item list was repeating item id. Added order by id 2018-11-26 12:42:37 +01:00
Gerard 20be455774 #869 refactor componente log 2018-11-26 12:11:36 +01:00
Gerard 2566feb551 #869 refactor componente log 2018-11-26 11:41:11 +01:00
Gerard b56e548656 currency filter now has a default fraction size 2018-11-26 11:22:22 +01:00
Carlos Jimenez f9a05238e6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-26 10:24:58 +01:00
Gerard e8b9e509b1 console.log deleted 2018-11-26 10:05:06 +01:00
Gerard 5f4dfe6d75 #865 hacer que los eventos de guardado funcionen correctamente 2018-11-26 09:53:34 +01:00
Joan e60d485111 fixed infinite claim detail save #866 2018-11-23 14:30:01 +01:00
Carlos Jimenez ea97454fd2 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-23 09:32:23 +01:00
Gerard 874b1880cf Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-23 08:56:58 +01:00
Gerard 0f4b6b85c1 test fixed 2018-11-23 08:56:53 +01:00
Joan afdb75f203 Merge branch 'test' into dev 2018-11-23 08:46:00 +01:00
Joan 8e65d437ee disable bic field for spanish iban 2018-11-23 08:44:19 +01:00
Javi Gallego 04325f1b0f bug de la fecha en Web Payment 2018-11-23 08:40:39 +01:00
Gerard 77d6da3a7f #393 validador del iban en client solo tiene que validar iban de España 2018-11-23 08:21:21 +01:00
Carlos Jimenez c132297304 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-23 08:06:04 +01:00
Carlos Jimenez 2bcfb0532e #781 Extensiones nightmare loginAndModule extenstion 2018-11-23 08:05:57 +01:00
Gerard 7d9070ff29 #848 added link in client.descriptor to order new 2018-11-23 07:59:51 +01:00
Gerard 44a2ee24bc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-22 16:10:44 +01:00
Gerard a9f3b50394 web payment not showing amount fixed 2018-11-22 16:09:30 +01:00
Javi Gallego 0f7816b32e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-22 15:44:55 +01:00
Carlos Jimenez 00d0342d50 #781 Extensiones nightmare correct usage of extensions 2018-11-22 15:44:33 +01:00
Joan 4e1d7e2822 fixed billing data swift validations 2018-11-22 15:17:35 +01:00
Javi Gallego 48a98d2b29 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-22 14:12:55 +01:00
Javi Gallego a096490d1c #855 consignatario validacion back recargo 2018-11-22 14:12:52 +01:00
Gerard 29bea28dd3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-22 13:56:41 +01:00
Gerard 7ada4b7f14 #853 order.new debería rellenar el consignatario por defecto del cliente 2018-11-22 13:56:35 +01:00
Carlos Jimenez d571bdbbb3 error corrected 2018-11-22 12:53:11 +01:00
Carlos Jimenez b0d531756e #781 implemented waittoGetProperty and nightmare extensions registration 2018-11-22 12:34:20 +01:00
Joan 45920f9673 Swift field was not filled when iban was changed 2018-11-22 12:10:43 +01:00
Joan 98429a95f7 Merge branch 'master' into dev 2018-11-22 10:59:52 +01:00
Javi Gallego 80bdc402db claim bug slider 2018-11-22 09:59:04 +01:00
Joan 19605bb403 install dev dependencies 2018-11-22 09:18:37 +01:00
Gerard b2732216d0 rollback icon change 2018-11-22 08:48:40 +01:00
Carlos Jimenez b4aef4a0de Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-22 08:42:31 +01:00
Joan 019dbd93f6 fontello fonts reverted no previous version 2018-11-22 08:36:59 +01:00
Joan 1a93dc0ceb home icons max height 2018-11-22 08:18:55 +01:00