Commit Graph

5431 Commits

Author SHA1 Message Date
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
Carlos Jimenez 38bda09767 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-22 08:14:54 +01:00
Joan 0cf9ae035d css fix 2018-11-22 08:01:54 +01:00
Joan 9f19528bab Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-22 07:50:26 +01:00
Joan 0e7aee21f7 home icon max height 2018-11-22 07:50:20 +01:00
Carlos Jimenez 635a80104b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-21 16:59:16 +01:00
Carlos Jimenez 53333df3a7 #781 Extensiones nightmare 1st steps 2018-11-21 16:59:09 +01:00
Gerard add94d233b #842 add salesPerson field to the client.index search panel 2018-11-21 14:56:33 +01:00
Joan 59c67290ca Modules index do not load data automatically 2018-11-21 14:30:32 +01:00
Carlos Jimenez a3be9a1b6d #833 e2e ticket.request 2018-11-21 14:09:22 +01:00
Gerard c0a3a66e6f #844 Claim add item descriptors 2018-11-21 13:29:46 +01:00
Gerard 30a6d71578 bug fixed 2018-11-21 12:41:08 +01:00
Gerard cc542eccbe fixed ticket id in state.go 2018-11-21 12:17:11 +01:00
Gerard 665f324db9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-21 11:53:35 +01:00
Gerard 134def6d65 #821 Back da errores de forma incorrecta en Pay Method 2018-11-21 11:53:18 +01:00
Carlos Jimenez 8b89c64dd2 refactor to parametrizedSql 2018-11-21 11:50:30 +01:00
Carlos Jimenez ea6d1811cc Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-21 11:48:17 +01:00
Carlos Jimenez 3620b864b7 #712 PROCEDURE cache.last_buy_refresh() unit test 2018-11-21 11:48:04 +01:00
Gerard cfae360c28 log disabled 2018-11-21 10:09:50 +01:00
Gerard baacc351fd #841 claim relation added 2018-11-21 10:09:36 +01:00
Gerard bad8e63f95 changed icon reference 2018-11-21 09:59:47 +01:00
Bernat 61bc40dfd5 merge 2018-11-21 09:28:52 +01:00
Bernat 3f98deff49 update ACL and structure db 2018-11-21 09:19:20 +01:00
Gerard 3c0e0b3d49 added missing locale 2018-11-21 09:16:09 +01:00
Gerard ead97cb142 #832 added missing watcher function 2018-11-21 09:13:40 +01:00
Gerard 27e13fdf3d #832 missing where 2018-11-21 09:08:14 +01:00
Gerard 45f1f37243 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-21 08:58:40 +01:00
Gerard 4283012b2b #832 refactor ticket.request 2018-11-21 08:58:34 +01:00
Joan ee17e3f642 updated fonts 2018-11-21 08:47:31 +01:00
Joan a856bc11bf hide catalog model results 2018-11-21 07:27:49 +01:00
Gerard 8119761792 #840 dropdown no deberia de tener timeout cuando data esté definido 2018-11-20 16:36:37 +01:00