improvement(Employee Standing)

- clean the representation of tabSQL - Capitalize creditoropeningbalance
Third-Culture-Software · Aug 6, 2019 · 01893e9 · 01893e9
1 parent 7268cad
commit 01893e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/server/controllers/finance/creditors.js b/server/controllers/finance/creditors.js
@@ -173,11 +173,10 @@ function getFinancialActivity(creditorUuid, dateFrom, dateTo) {
     ORDER BY trans_date ASC, trans_id;
   `;
 
-  const tabSql = (dateFrom && dateTo)
-    ? [db.exec(sql, [uid, uid]), balance(creditorUuid), openingBalanceCreditor(creditorUuid, dateFrom)]
-    : [db.exec(sql, [uid, uid]), balance(creditorUuid)];
+  const tabSQL = [ db.exec(sql, [uid, uid]), balance(creditorUuid) ];
+  if (dateFrom && dateTo) { tabSQL.push(openingBalanceCreditor(creditorUuid, dateFrom)); }
 
-  return q.all(tabSql)
+  return q.all(tabSQL)
     .spread((transactions, aggs, openingBalance) => {
       if (!aggs.length) {
         aggs.push({ debit : 0, credit : 0, balance : 0 });

diff --git a/server/controllers/finance/reports/financial.employee.handlebars b/server/controllers/finance/reports/financial.employee.handlebars
@@ -47,13 +47,13 @@
           <tr>
             <td colspan="4" class="text-right"><b>{{translate "TABLE.COLUMNS.BALANCE_AT" }} {{date dates.dateFrom }} </b></td>
             <td class="text-right">
-              {{debcred creditoropeningBalance.debit metadata.enterprise.currency_id}}
+              {{debcred creditorOpeningBalance.debit metadata.enterprise.currency_id}}
             </td>
             <td class="text-right">
-              {{debcred creditoropeningBalance.credit metadata.enterprise.currency_id}}
+              {{debcred creditorOpeningBalance.credit metadata.enterprise.currency_id}}
             </td>
             <td class="text-right">
-              <span> {{debcred creditoropeningBalance.balance metadata.enterprise.currency_id}} </span>
+              <span> {{debcred creditorOpeningBalance.balance metadata.enterprise.currency_id}} </span>
             </td>
           </tr>
         {{/if}}

diff --git a/server/controllers/finance/reports/financial.employee.js b/server/controllers/finance/reports/financial.employee.js
@@ -78,7 +78,7 @@ async function build(req, res, next) {
 
     if (creditorOperations.openingBalance) {
       _.extend(data, {
-        creditoropeningBalance : creditorOperations.openingBalance[0],
+        creditorOpeningBalance : creditorOperations.openingBalance[0],
       });
     }