Commit Graph

4115 Commits

Author SHA1 Message Date
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
Gerard 30aab282d6 added missing locale 2018-11-20 16:33:43 +01:00
Gerard b006da08e3 #839 el autocomplete de ticket.weekly no se puede abrir 2018-11-20 16:33:09 +01:00
Carlos Jimenez 8f307b28b6 e2e refactor 2018-11-20 14:22:00 +01:00
Carlos Jimenez f90bad0719 #822 E2E client.fiscal-data 2018-11-20 14:21:24 +01:00
Carlos Jimenez ccc8fae1b1 minor refactor 2018-11-20 11:54:00 +01:00
Gerard fc3f547a17 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-20 11:48:19 +01:00
Gerard 9ce502551f it should throw the error before it deletes the ticket 2018-11-20 11:48:12 +01:00
Javi Gallego ae3d8f93a1 Tarea #782 client validacion back recargo 2018-11-20 11:02:57 +01:00
Gerard cb86e63e71 #803 nueva comprobacion para eliminar un ticket 2018-11-20 10:34:29 +01:00
Gerard 272ad9fe50 #803 nueva comprobacion para eliminar un ticket 2018-11-20 10:32:54 +01:00
Gerard 118ec97106 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-20 10:21:53 +01:00
Gerard 80dad93672 #275 deprecar installMethod.js 2018-11-20 10:21:48 +01:00
Carlos Jimenez e467a517fe removed fdescribe + refactor 2018-11-20 10:15:40 +01:00
Carlos Jimenez 56ab95ee73 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-19 14:33:25 +01:00
Carlos Jimenez b667c07d12 #828 E2E client.risk 2018-11-19 14:33:18 +01:00
Gerard 03e4332210 #830 test currency filter 2018-11-19 13:37:55 +01:00