fix: resolve conflict in merging

IMA-WorldHealth · Jul 17, 2017 · af968af · af968af
1 parent c1dff39
commit af968af
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 27 deletions.
diff --git a/client/src/i18n/en/table.json b/client/src/i18n/en/table.json
@@ -43,6 +43,20 @@
 "NOVEMBER":"November",
 "DECEMBER":"December"
 },
+"DATE_MONTH_MIN":{
+"JANUARY":"Jan",
+"FEBRUARY":"Feb",
+"MARCH":"Mar",
+"APRIL":"Apr",
+"MAY":"May",
+"JUNE":"Jun",
+"JULY":"Jul",
+"AUGUST":"Aug",
+"SEPTEMBER":"Sep",
+"OCTOBER":"Oct",
+"NOVEMBER":"Nov",
+"DECEMBER":"Dec"
+},
 "DATE_REGISTERED":"Date Registered",
 "DEBIT":"Debit",
 "DEBIT_SOURCE":"Debit (Source)",
@@ -96,6 +110,7 @@
 "NO_PAYMENTS":"No payments made against this invoice.",
 "NUM":"Number",
 "OF":"of",
+"OPENING_BALANCE":"Balance d'ouverure",
 "PASSIVE":"Passive",
 "PATIENT":"Patient",
 "PATIENT_ID":"ID Patient",

diff --git a/client/src/i18n/fr/form.json b/client/src/i18n/fr/form.json
@@ -356,10 +356,10 @@
 "PAYMENT":"Paiement",
 "PAYMENT_DETAILS":"Details Paiement",
 "PAYMENT_METHOD":"Mode de paiement",
-"PERIODS":"Périodes",
-"PERIOD_FROM" : "Periode Debut",
-"PERIOD_TO" : "Periode Fin",
-"PERIOD_TOTAL" : "Periode Total",
+"PERIODES":"Périodes",
+"PERIOD_FROM" : "Periode du Début",
+"PERIOD_TO" : "Periode de la Fin",
+"PERIOD_TOTAL":"Total de la période",
 "PHONE":"Téléphone",
 "PHONE_NO":"Numéro de Téléphone",
 "POSITION":"Position",

diff --git a/client/src/i18n/fr/table.json b/client/src/i18n/fr/table.json
@@ -42,6 +42,20 @@
 "NOVEMBER":"Novembre",
 "DECEMBER":"Décembre"
 },
+"DATE_MONTH_MIN":{
+"JANUARY":"Jan",
+"FEBRUARY":"Fév",
+"MARCH":"Mar",
+"APRIL":"Avr",
+"MAY":"Mai",
+"JUNE":"Juin",
+"JULY":"Juil",
+"AUGUST":"Août",
+"SEPTEMBER":"Sept",
+"OCTOBER":"Oct",
+"NOVEMBER":"Nov",
+"DECEMBER":"Déc"
+},
 "DATE_REGISTERED":"Date d'enregistrement",
 "DATA_SOURCE":"Source de données",
 "DEBIT":"Débit",
@@ -96,6 +110,7 @@
 "NO_PAYMENTS":"Aucun paiement n'a été effectué sur cette facture.",
 "NUM":"Numéro",
 "OF":"sur",
+"OPENING_BALANCE":"Balance d'ouverure",
 "PASSIVE":"Passive",
 "PATIENT":"Patient",
 "PATIENT_ID":"Patient Id",

diff --git a/client/src/modules/fiscal/fiscal.list.html b/client/src/modules/fiscal/fiscal.list.html
@@ -36,7 +36,7 @@ <h4 style="margin-top : 0px;">
             <div class="row">
               <span class="fa fa-calendar"></span>
               {{ fiscal.start_date | date }} - {{ fiscal.end_date | date }} ({{ fiscal.number_of_months }}
-              {{ "FORM.LABELS.PERIODS" | translate }})
+              {{ "FORM.LABELS.PERIODES" | translate }})
             </div>
 
             <div class="row text-lowercase">

diff --git a/client/src/modules/general-ledger/general-ledger-accounts.ctrl.js b/client/src/modules/general-ledger/general-ledger-accounts.ctrl.js
@@ -45,7 +45,14 @@ function GeneralLedgerAccountsController(GeneralLedger, Session, Notify,
       headerCellFilter : 'translate',
       headerCellClass  : 'text-center',
       cellTemplate     : '/modules/general-ledger/templates/balance.cell.html' },
-
+
+    { field            : 'balance0',
+      displayName      : 'TABLE.COLUMNS.OPENING_BALANCE',
+      enableFiltering  : false,
+      headerCellFilter : 'translate',
+      headerCellClass  : 'text-center',
+      cellTemplate     : getCellTemplate('balance0')},
+
     { field            : 'balance1',
       displayName      : 'TABLE.COLUMNS.DATE_MONTH.JANUARY',
       enableFiltering  : false,
@@ -150,6 +157,7 @@ function GeneralLedgerAccountsController(GeneralLedger, Session, Notify,
     flatEntityAccess  : true,
     enableColumnMenus : false,
     appScopeProvider  : vm,
+    onRegisterApi     : onRegisterApi,
   };
 
   var columnConfig = new Columns(vm.gridOptions, cacheKey);
@@ -170,6 +178,11 @@ function GeneralLedgerAccountsController(GeneralLedger, Session, Notify,
     vm.loading = !vm.loading;
   }
 
+  // API register function
+  function onRegisterApi(gridApi) {
+    vm.gridApi = gridApi;
+  }
+
   function openColumnConfiguration() {
     columnConfig.openConfigurationModal();
   }

diff --git a/server/controllers/finance/reports/generalLedger/report.handlebars b/server/controllers/finance/reports/generalLedger/report.handlebars
@@ -9,32 +9,30 @@
     <div class="col-xs-12">
 
       <!-- page title  -->
-      <h1 class="text-center text-capitalize">
-        {{translate 'TREE.GENERAL_LEDGER'}}
-      </h1>
-      <h2 class="text-center text-capitalize">
-        {{ fiscal_year_label}}
-      </h2>
+      <h3 class="text-center text-uppercase"><strong>{{translate 'TREE.GENERAL_LEDGER'}}</strong></h3>
+
+      <h4 class="text-center"><strong>{{ fiscal_year_label}}</strong></h4>
 
       <!-- invoices listed  -->
-      <table class="table table-condensed table-striped table-bordered">
+      <table class="table table-condensed table-striped table-report table-bordered">
         <thead>
-          <tr>
+          <tr class="text-capitalize text-center" style="background-color: #ddd;">
             <th>{{translate 'TABLE.COLUMNS.ACCOUNT'}}</th>
             <th>{{translate 'TABLE.COLUMNS.LABEL'}}</th>
             <th>{{translate 'TABLE.COLUMNS.BALANCE'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.JANUARY'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.FEBRUARY'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.MARCH'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.APRIL'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.MAY'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.JUNE'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.JULY'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.AUGUST'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.SEPTEMBER'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.OCTOBER'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.NOVEMBER'}}</th>
-            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH.DECEMBER'}}</th>                                                            
+            <th>{{translate 'TABLE.COLUMNS.OPENING_BALANCE'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.JANUARY'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.FEBRUARY'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.MARCH'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.APRIL'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.MAY'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.JUNE'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.JULY'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.AUGUST'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.SEPTEMBER'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.OCTOBER'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.NOVEMBER'}}</th>
+            <th>{{translate 'TABLE.COLUMNS.DATE_MONTH_MIN.DECEMBER'}}</th>                                                            
           </tr>
         </thead>
         <tbody>
@@ -43,11 +41,16 @@
               <td>{{number}}</td>
               <td>{{label}}</td>
               <td class="text-right">{{currency balance ../metadata.enterprise.currency_id}}</td>
+              <td class="text-right">
+                {{#if balance0}}
+                  {{currency balance0 ../metadata.enterprise.currency_id}}
+                {{/if}}
+              </td>                                
               <td class="text-right">
                 {{#if balance1}}
                   {{currency balance1 ../metadata.enterprise.currency_id}}
                 {{/if}}
-              </td>                
+              </td>          
               <td class="text-right">
                 {{#if balance2}}
                   {{currency balance2 ../metadata.enterprise.currency_id}}