Commit Graph

3389 Commits

Author SHA1 Message Date
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
Gerard 7e2e2c9953 fixed test 2018-10-08 12:02:05 +02:00
Carlos Jimenez 979660dac3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-08 11:12:53 +02:00
Gerard 16902fab8f added getUserConfig test 2018-10-08 11:03:28 +02:00
Gerard 034cf526a6 Bug #701 Refactorizar los métodos de loopback que utilicen Self.update() 2018-10-08 11:02:56 +02:00
Carlos Jimenez fa385cd9d6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-08 11:00:49 +02:00
Carlos Jimenez 7d5c325abe #709 PRECEDURE vn.buyUltimate() unit test 2018-10-08 10:59:19 +02:00
Carlos Jimenez 97c86efb84 #713 PROCEDURE vn.buyUltimateFromInterval() unit test 2018-10-08 10:59:05 +02:00
Joan Sanchez 300c7a3cfe userConfig fix 2018-10-08 08:14:25 +02:00
Bernat ec3a448396 update structure cau 8409 2018-10-08 07:42:05 +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
Bernat 427d702a8e update fixtures userConfig 2018-10-05 14:57:58 +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 c990877bda set userFk null in tests 2018-10-05 13:06:11 +02:00
Gerard ead7397bb3 console logs removed 2018-10-05 13:05:34 +02:00
Gerard d1ea2ddf25 Tarea #614 nueva sección cuenta 2018-10-05 13:04:41 +02:00
Gerard 0481cac14e Tarea #614 nueva sección cuenta 2018-10-05 13:01:46 +02:00
Gerard fda683f59e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-05 12:57:39 +02:00
Gerard 8edbc40da3 unused code removed 2018-10-05 12:57:34 +02:00
Bernat 47a50be560 updatefixtures userConfig 2018-10-05 12:21:52 +02:00