Merge branch 'hotfix20180306transdownload'

# Conflicts:
#	src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html

src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html

@@ -129,7 +129,7 @@
                                     <a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)" title="Detail">
                                         <i class="fa fa-list-alt"></i>
                                     </a>
-                                    <a ng-href="/client/clean_logs/{{currentUser.client.client_id}}/settlement_logs/{{log.clear_detail_id}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" href="/client/clean_logs/{{currentUser.client.client_id}}/{{log.clearing_time|limitTo:10}}/export" title="Download">
+                                    <a ng-href="/client/clean_logs/{{currentUser.client.client_id}}/settlement_logs/{{log.clear_detail_id}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" title="Download">
                                         <i class="fa fa-download"></i>
                                     </a>
                                 </td>