fix(balance report at the server side): Fix the reduce value computed…

… for the balance totals, and fi #1693
IMA-WorldHealth · Jun 7, 2017 · e438788 · e438788
1 parent 9ca7d36
commit e438788
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/client/src/i18n/fr/tree.json b/client/src/i18n/fr/tree.json
@@ -22,7 +22,7 @@
 "FINANCE":"Finances",
 "FISCAL_YEAR":"Année Fiscale",
 "FONCTION":"Gestion Fonctions",
-"GENERAL_LEDGER":"Grande Livre",
+"GENERAL_LEDGER":"Grand Livre",
 "GRADE_EMPLOYERS":"Gestion Grades",
 "HOSPITAL":"Hôpital",
 "INCOME_EXPENSE":"Recettes et dépenses",

diff --git a/client/src/modules/reports/modals/agedCreditors.modal.html b/client/src/modules/reports/modals/agedCreditors.modal.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
   <ol class="headercrumb">
-    <li class="title" translate> ReportConfigCtrl.report.title_key </li>
+    <li class="title" translate> {{ ReportConfigCtrl.report.title_key }} </li>
     <span class="badge badge-success text-uppercase" translate> FORM.LABELS.CREATE</span>
   </ol>
 </div>
@@ -13,7 +13,7 @@
       <input class="form-control" name="label" autocomplete="off" ng-model="ReportConfigCtrl.label" required />
 
       <div class="help-block" ng-messages="ConfigForm.label.$error" ng-show="ConfigForm.$submitted">
-        <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
+        <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
       </div>
     </div>
 

diff --git a/server/controllers/finance/reports/balance/index.js b/server/controllers/finance/reports/balance/index.js
@@ -124,7 +124,7 @@ function processAccounts(balances, a, totals) {
       t.middleCredit += (account.middleCredit || 0);
       t.endDebit += (account.endDebit || 0);
       t.endCredit += (account.endCredit || 0);
-      return totals;
+      return t;
     }, {
       beginDebit   : 0,
       beginCredit  : 0,