From a2096d1ee62c6591855cd764b0f815adcb89df90 Mon Sep 17 00:00:00 2001
From: Jonathan Niles <jonathanwniles@gmail.com>
Date: Fri, 26 Jan 2018 13:04:05 +0100
Subject: [PATCH] feat(General Ledger): use Account Statement Report

This commit removes the old Account Slip report link and replaces it
with the account statement report link from the General Ledger.

Closes #1706.
---
 .../general-ledger-accounts.ctrl.js           | 18 +++++++++++-------
 .../general-ledger/general-ledger.service.js  | 19 +++++++++----------
 .../general-ledger/templates/action.cell.html |  4 ++--
 .../account_report/account_report.config.js   |  8 +-------
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/client/src/modules/general-ledger/general-ledger-accounts.ctrl.js b/client/src/modules/general-ledger/general-ledger-accounts.ctrl.js
index 3f86eff112..b3c2ccf3f8 100644
--- a/client/src/modules/general-ledger/general-ledger-accounts.ctrl.js
+++ b/client/src/modules/general-ledger/general-ledger-accounts.ctrl.js
@@ -254,7 +254,17 @@ function GeneralLedgerAccountsController(
   }
 
   vm.download = GeneralLedger.download;
-  vm.slip = GeneralLedger.slip;
+  vm.openAccountReport = function openAccountReport(accountId) {
+    var opts = {
+      account_id : accountId,
+      dateFrom : vm.year.start_date,
+      dateTo : vm.year.end_date,
+      limit : 1000,
+      renderer : 'pdf',
+    };
+
+    return GeneralLedger.openAccountReport(opts);
+  };
 
   // loads data for the general Ledger
   function load(options) {
@@ -276,12 +286,6 @@ function GeneralLedgerAccountsController(
       fiscal_year_label : vm.year.label,
     };
 
-    vm.filtersSlip = {
-      dateFrom : vm.year.start_date,
-      dateTo : vm.year.end_date,
-      limit : 1000,
-    };
-
     load(vm.filters);
   }
 
diff --git a/client/src/modules/general-ledger/general-ledger.service.js b/client/src/modules/general-ledger/general-ledger.service.js
index ef771d58e8..92733199cf 100644
--- a/client/src/modules/general-ledger/general-ledger.service.js
+++ b/client/src/modules/general-ledger/general-ledger.service.js
@@ -3,19 +3,20 @@ angular.module('bhima.services')
 
 GeneralLedgerService.$inject = [
   'PrototypeApiService', '$httpParamSerializer', 'LanguageService',
+  'SessionService',
 ];
 
 /**
  * General Ledger Service
  * This service is responsible of all process with the General ledger
  */
-function GeneralLedgerService(Api, $httpParamSerializer, Languages) {
+function GeneralLedgerService(Api, $httpParamSerializer, Languages, Session) {
   var service = new Api('/general_ledger/');
 
   service.accounts = new Api('/general_ledger/accounts');
 
   service.download = download;
-  service.slip = slip;
+  service.openAccountReport = openAccountReport;
 
   function download(type, filters) {
     var filterOpts = filters;
@@ -28,19 +29,17 @@ function GeneralLedgerService(Api, $httpParamSerializer, Languages) {
     return $httpParamSerializer(options);
   }
 
-  function slip(type, filters, account) {
-    var filterOpts = filters;
+  function openAccountReport(options) {
     var defaultOpts = {
-      renderer : type,
       lang : Languages.key,
-      account_id : account,
-      source : 3,
+      currency_id : Session.enterprise.currency_id,
     };
 
     // combine options
-    var options = angular.merge(defaultOpts, filterOpts);
-    // return  serialized options
-    return $httpParamSerializer(options);
+    var opts = angular.merge(defaultOpts, options);
+
+    // return serialized options
+    return $httpParamSerializer(opts);
   }
 
   return service;
diff --git a/client/src/modules/general-ledger/templates/action.cell.html b/client/src/modules/general-ledger/templates/action.cell.html
index 5d76a4b6ee..ec45ece505 100644
--- a/client/src/modules/general-ledger/templates/action.cell.html
+++ b/client/src/modules/general-ledger/templates/action.cell.html
@@ -7,8 +7,8 @@
 
     <ul class="dropdown-menu-right" bh-dropdown-menu-auto-dropup uib-dropdown-menu>
       <li>
-        <a ng-href="/reports/finance/account_report/?{{ grid.appScope.slip('pdf', grid.appScope.filtersSlip, row.entity.id) }}" download="{{ GENERAL_LEDGER.ACCOUNT_SLIP | translate }}">
-          <span class="fa fa-file-pdf-o"></span> <span translate>GENERAL_LEDGER.ACCOUNT_SLIP</span>
+        <a ng-href="/reports/finance/account_report/?{{ grid.appScope.openAccountReport(row.entity.id) }}" download="{{ TREE.REPORT_ACCOUNTS | translate }}">
+          <span class="fa fa-file-pdf-o"></span> <span translate>TREE.REPORT_ACCOUNTS</span>
         </a>
       </li>
     </ul>
diff --git a/client/src/modules/reports/generate/account_report/account_report.config.js b/client/src/modules/reports/generate/account_report/account_report.config.js
index 8a02b2f484..8e29c9fa1f 100644
--- a/client/src/modules/reports/generate/account_report/account_report.config.js
+++ b/client/src/modules/reports/generate/account_report/account_report.config.js
@@ -28,16 +28,12 @@ function AccountReportConfigController(
     vm.reportDetails.account_id = account.id;
   };
 
-  vm.selectSource = function selectSource(source) {
-    vm.reportDetails.source = source;
-  };
-
   vm.clearPreview = function clearPreview() {
     vm.previewGenerated = false;
     vm.previewResult = null;
   };
 
-  vm.setCurrency = function (currencyId) {
+  vm.setCurrency = function setCurrency(currencyId) {
     vm.reportDetails.currency_id = currencyId;
   };
 
@@ -68,8 +64,6 @@ function AccountReportConfigController(
     cache.reportDetails = angular.copy(vm.reportDetails);
 
     var sendDetails = sanitiseDateStrings(vm.reportDetails);
-    sendDetails.dateTo = Moment(sendDetails.dateTo).format('YYYY-MM-DD');
-    sendDetails.dateFrom = Moment(sendDetails.dateFrom).format('YYYY-MM-DD');
 
     return SavedReports.requestPreview(reportUrl, reportData.id, sendDetails)
       .then(function (result) {