Commit Graph

11212 Commits

Author SHA1 Message Date
Javi Gallego 4000926c74 Dos filtros nuevos, para monedas y porcentajes 2018-10-16 13:57:14 +02:00
Javi Gallego 67bd3d96d3 comentado test que Joan pone en redmine 2018-10-16 13:55:38 +02:00
Javi Gallego 33b9efc5b7 Tarea #696 2018-10-16 13:32:58 +02:00
Gerard 31fa66e052 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-16 13:18:32 +02:00
Gerard aaa9a0a1be Bug #635 item.data 2018-10-16 13:18:24 +02:00
Joan Sanchez 3826456a5a added bankEntity billing data #704 2018-10-16 13:06:58 +02:00
Bernat f9f1ae8c70 new model claimRatio 2018-10-16 11:17:02 +02:00
Joan Sanchez 54921b4982 fixed summary item descriptor #734 2018-10-16 08:38:31 +02:00
Bernat b6ac4ff900 add new model clientRisk 2018-10-16 08:36:25 +02:00
Gerard a681f6f854 Bug #635 item.data 2018-10-15 13:20:55 +02:00
Gerard a78ffbdaa5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-15 13:20:18 +02:00
Javi Gallego f25a1ecd98 #492 tooltip test 2018-10-15 12:46:56 +02:00
Joan Sanchez 1773af841b hour fix 2018-10-15 11:48:03 +02:00
Joan Sanchez 589be52c6a Order filter & added model getSetValues() #722 2018-10-15 11:43:57 +02:00
Gerard 5729f19a52 Bug #730 test 2018-10-15 11:33:23 +02:00
Gerard f32f63f3c5 Bug #730 test 2018-10-15 11:29:17 +02:00
Gerard 7ed52d455d Bug #730 order.catalog no añade lineas 2018-10-15 10:48:06 +02:00
Carlos Jimenez 3151bca0bd #710 PROCEDURE vn.ticketComponentUpdateSale() unit test 2018-10-14 17:09:05 +02:00
Carlos Jimenez b6ba23282c Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-14 17:07:13 +02:00
Gerard a9d99fc16c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-11 15:01:00 +02:00
Gerard 7f6a2bba79 xcluded test 2018-10-11 15:00:53 +02:00
Bernat f80c9134e1 update acl 2018-10-11 11:01:58 +02:00
Bernat 1607a340d2 new model defaulter 2018-10-11 10:56:28 +02:00
Bernat ba7a703ee7 update fixtures 2018-10-11 09:53:18 +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
Javi Gallego 377edd4f71 merge locale 2018-10-11 09:17:19 +02:00
Javi Gallego bf8ed25c06 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-11 09:15:14 +02:00
Javi Gallego 9beb4885a0 Test #691 los e2e ya no usan developer 2018-10-11 09:14:26 +02:00
Gerard ee1a8a3114 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-11 08:46:16 +02:00
Gerard 29251651a2 highlighted text now in black 2018-10-11 08:46:09 +02:00
Bernat 0d99b6926f update acl 2018-10-11 08:09:30 +02:00
Bernat ac1d9ddfcc update structure db 2018-10-11 07:45:51 +02:00
Gerard a016d4de31 Tarea #723 TESTS 2018-10-10 14:13:53 +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
Bernat d391d86f02 update fixtures table orderRow and rowcomponent, fix test 2018-10-10 11:17:55 +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 8c0e68313b Tarea #719 2018-10-08 14:56:34 +02:00
Javi Gallego 472f08db84 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-08 14:38:27 +02:00
Javi Gallego 7b623cec09 Tarea #684 2018-10-08 14:38:16 +02:00
Gerard a4e72a0476 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-08 14:35:44 +02:00
Gerard 3f7b9bea1c test commented 2018-10-08 14:35:36 +02:00
Carlos Jimenez 6283f31f5a params are now defined for future maintenance 2018-10-08 14:13:18 +02:00
Joan Sanchez 33c4ed73ca updated docker dump order #714 2018-10-08 13:37:57 +02:00
Joan Sanchez f878751ff1 Fixed mail notification bug #587 2018-10-08 13:09:30 +02:00
Gerard dff78922a1 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-08 13:07:22 +02:00