Merge pull request #561 from mbayopanda/transfert_type

Voucher Registry Module

client/src/css/structure.css

@@ -185,6 +185,7 @@
   border: none;
   max-height : 42px;
   border-bottom : 1px solid #ccc;
+  min-height: 35px;
 }
 
 .bhima-title {

client/src/i18n/en.json

@@ -365,7 +365,9 @@
       "CREATED"                : "Created",
       "DATE"                   : "Date",
       "DATE_CREATED"           : "Date Created",
+      "DATE_FROM"              : "Start",
       "DATE_REGISTRATION"      : "Registration Date",
+      "DATE_TO"                : "End",
       "DEBIT"                  : "Debit",
       "DEBITOR_GROUP"          : "Debtor Group",
       "DEBTOR_GROUP"           : "Form debtor group record",
@@ -500,8 +502,11 @@
       "SUPPLIER"               : "Supplier",
       "TEL"                    : "TEL",
       "TELEPHONE"              : "Telephone",
+      "THIS_MONTH"             : "This Month",
+      "THIS_WEEK"              : "This week",
       "TITLE"                  : "Title",
       "TITLE_ACCOUNT"          : "Title Account",
+      "TODAY"                  : "Today",
       "TOTAL"                  : "Total",
       "TOTAL_BILLED"           : "Total Billed",
       "TOTAL_PAID"             : "Total Paid",
@@ -511,6 +516,7 @@
       "TRANSFER_TYPE"          : "Transfer Type",
       "TYPE"                   : "Type",
       "UNCONFIGURED"           : "Unconfigured",
+      "UNDEFINED"              : "Undefined",
       "UPDATE"                 : "UPDATE",
       "UPDATE_GROUP_DEBTOR"    : "Debtor group assignment updated",
       "UPDATE_PATIENT_GROUP"   : "Patient group membership updated",
@@ -569,6 +575,7 @@
       "SELECT_COUNTRY"            : "Select Country",
       "SELECT_CREDITOR"           : "Select a creditor",
       "SELECT_CREDITOR_GROUP"     : "Select a Creditor Group",
+      "SELECT_DATE_INTERVAL"      : "Select a date interval",
       "SELECT_DEBITOR_GROUP"      : "Select a Debtor Group",
       "SELECT_ENTERPRISE"         : "Select an Enterprise",
       "SELECT_FUNCTION"           : "Select function",
@@ -1175,6 +1182,8 @@
     "TRANSACTIONS_BY_ACCOUNT"    : "Transactions by Account",
     "UPDATE_STOCK"               : "Update stock",
     "USERS"                      : "Users",
+    "VALIDATE_PURCHASE"          : "Validation",
+    "VOUCHER_REGISTRY"           : "Voucher Registry",
     "VALIDATE_PURCHASE"          : "Validate Purchase"
   },
   "VILLAGE": {
@@ -1188,21 +1197,6 @@
     "TITLE"        : "Village Management"
   },
   "VOUCHERS": {
-    "SIMPLE": {
-      "CASH_PAYMENT"       : "Client Payment",
-      "CASH_RETURN"        : "Cash Return (Payback)",
-      "CONVENTION_PAYMENT" : "Convention Payment",
-      "EXPENSE"            : "Expenses",
-      "INCOME"             : "Incomes",
-      "SALARY_PAYMENT"     : "Salary Payment",
-      "GENERIC_EXPENSE"    : "Other Expenses",
-      "GENERIC_INCOME"     : "Other Incomes",
-      "PURCHASES"          : "Purchases",
-      "SUPPORT_INCOME"     : "Support Incomes",
-      "TITLE"              : "Simple Voucher",
-      "TRANSFER"           : "Money Transfer"
-    },
-    "TITLE" : "Voucher",
     "COMPLEX": {
       "ADD_ITEMS"            : "Add item(s)",
       "CASH_PAYMENT"         : "Cash Payment",
@@ -1224,6 +1218,24 @@
       "TITLE"                : "Advanced Journal Vouchers",
       "VALID_TOTALS"         : "Transactions are valid (balanced transaction)",
       "VOUCHER"              : "Voucher"
+    },
+    "GLOBAL" : {
+      "REPORT" : "Voucher Report",
+      "TITLE"  : "Voucher"
+    },
+    "SIMPLE": {
+      "CASH_PAYMENT"       : "Client Payment",
+      "CASH_RETURN"        : "Cash Return (Payback)",
+      "CONVENTION_PAYMENT" : "Convention Payment",
+      "EXPENSE"            : "Expenses",
+      "INCOME"             : "Incomes",
+      "SALARY_PAYMENT"     : "Salary Payment",
+      "GENERIC_EXPENSE"    : "Other Expenses",
+      "GENERIC_INCOME"     : "Other Incomes",
+      "PURCHASES"          : "Purchases",
+      "SUPPORT_INCOME"     : "Support Incomes",
+      "TITLE"              : "Simple Voucher",
+      "TRANSFER"           : "Money Transfer"
     }
   },
   "GRAPHS" : {

client/src/i18n/fr.json

@@ -363,7 +363,9 @@
       "CURRENT_LOCATION"       : "Localisation actuelle",
       "DATE"                   : "Date",
       "DATE_CREATED"           : "Date de création",
+      "DATE_FROM"              : "Debut",
       "DATE_REGISTRATION"      : "Date d'enregistrement",
+      "DATE_TO"                : "Fin",
       "DEBIT"                  : "Débit",
       "DEBITOR_GROUP"          : "Groupe Débiteur",
       "DEBTOR_GROUP"           : "Formulaire d'enregistrement de groupe débiteur",
@@ -442,6 +444,7 @@
       "OTHER"                  : "Autres",
       "OPTIONAL_INFO"          : "Informations optionnelles",
       "ORIGIN_LOCATION"        : "Localisation d'origine",
+      "OTHER"                  : "Autre",
       "PARENT_ACCOUNT"         : "Compte parent",
       "PASSIVE"                : "Passive",
       "PASSWORD"               : "Mot de passe",
@@ -498,8 +501,11 @@
       "SUPPLIER"               : "Fournisseur",
       "TEL"                    : "Tél",
       "TELEPHONE"              : "Téléphone",
+      "THIS_MONTH"             : "Ce Mois",
+      "THIS_WEEK"              : "Cette Semaine",
       "TITLE"                  : "Titre",
       "TITLE_ACCOUNT"          : "Comptes Titre",
+      "TODAY"                  : "Aujourd'hui",
       "TOTAL"                  : "Total",
       "TOTAL_BILLED"           : "Total Facture",
       "TOTAL_PAID"             : "Total paye",
@@ -509,6 +515,7 @@
       "TRANSFER_TYPE"          : "Type de Transfert",
       "TYPE"                   : "Type",
       "UNCONFIGURED"           : "Non configuree",
+      "UNDEFINED"              : "Non defini",
       "UNIT"                   : "Forme galenique",
       "UNIT_WEIGHT"            : "Poids",
       "UNIT_VOLUME"            : "Volume",
@@ -567,6 +574,7 @@
       "SELECT_COUNTRY"            : "Sélectionner pays",
       "SELECT_CREDITOR"           : "Sélectionner un Créditeur",
       "SELECT_CREDITOR_GROUP"     : "Sélectionner Groupe de créditeurs",
+      "SELECT_DATE_INTERVAL"      : "Sélectionner un intervalle de date",
       "SELECT_DEBITOR_GROUP"      : "Sélectionner Groupe de Débiteurs",
       "SELECT_ENTERPRISE"         : "Sélectionner entreprise",
       "SELECT_FUNCTION"           : "Sélectionner une fonction",
@@ -1183,7 +1191,9 @@
     "TRANSACTIONS_BY_ACCOUNT"    : "Transactions par Compte",
     "UPDATE_STOCK"               : "Mettre à Jour les Stocks",
     "USERS"                      : "Utilisateurs",
-    "VALIDATE_PURCHASE"          : "Validation"
+    "VALIDATE_PURCHASE"          : "Validation",
+    "VOUCHER_REGISTRY"           : "Registre des Bordereaux",
+    "VALIDATE_PURCHASE"          : "Validation Achat"
   },
   "VILLAGE": {
     "CONFIG"       : "Configuration de Gestion des Villages",
@@ -1196,21 +1206,6 @@
     "TITLE"        : "Gestion des Villages"
   },
   "VOUCHERS": {
-    "SIMPLE": {
-      "CASH_PAYMENT"       : "Paiement des clients",
-      "CASH_RETURN"        : "Remboursement",
-      "CONVENTION_PAYMENT" : "Paiement des Conventions",
-      "EXPENSE"            : "Dépenses",
-      "INCOME"             : "Récettes",
-      "SALARY_PAYMENT"     : "Paiement des Salaires",
-      "GENERIC_EXPENSE"    : "Autres Depenses",
-      "GENERIC_INCOME"     : "Autres Recettes",
-      "PURCHASES"          : "Achats",
-      "SUPPORT_INCOME"     : "Paiement Prise en charge",
-      "TITLE"              : "Bordereau de transfert",
-      "TRANSFER"           : "Transfert d'argent"
-    },
-    "TITLE" : "Quittance",
     "COMPLEX": {
       "ADD_ITEMS"            : "Ajouter item(s)",
       "CASH_PAYMENT"         : "Paiement Caisse",
@@ -1232,6 +1227,24 @@
       "TITLE"                : "Ajout des transactions",
       "VALID_TOTALS"         : "Les transactions sont valides (Transactions balancées)",
       "VOUCHER"              : "Bordereau de Transfert"
+    },
+    "GLOBAL" : {
+      "REPORT" : "Rapport des Quittances",
+      "TITLE"  : "Quittance"
+    },
+    "SIMPLE": {
+      "CASH_PAYMENT"       : "Paiement des clients",
+      "CASH_RETURN"        : "Remboursement",
+      "CONVENTION_PAYMENT" : "Paiement des Conventions",
+      "EXPENSE"            : "Dépenses",
+      "INCOME"             : "Récettes",
+      "SALARY_PAYMENT"     : "Paiement des Salaires",
+      "GENERIC_EXPENSE"    : "Autres Depenses",
+      "GENERIC_INCOME"     : "Autres Recettes",
+      "PURCHASES"          : "Achats",
+      "SUPPORT_INCOME"     : "Paiement Prise en charge",
+      "TITLE"              : "Bordereau de transfert",
+      "TRANSFER"           : "Transfert d'argent"
     }
   }
 }

client/src/js/app.js

@@ -218,6 +218,11 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
     controller: 'ComplexJournalVoucherController as ComplexVoucherCtrl',
     templateUrl: 'partials/vouchers/complex.html'
   })
+  .state('vouchers', {
+    url : '/vouchers',
+    controller: 'VoucherController as VoucherCtrl',
+    templateUrl: 'partials/vouchers/index.html'
+  })
 
   /* 2.X Journal routes */
   .state('journal', {

client/src/js/components/bhPDFPrint.js

@@ -41,7 +41,7 @@ bhPDFPrintController.$inject = ['$window', '$http', '$sce', '$timeout'];
  *   options="options">
  * </bh-pdf-print>
  */
-function bhPDFPrintController($window, $http, $sce, $timeout) {
+function bhPDFPrintController($window, $http, $sce, $timeout, uuid) {
   var cachedRequest;
   var component = this;
 
@@ -57,7 +57,7 @@ function bhPDFPrintController($window, $http, $sce, $timeout) {
   var loadingIndicatorDelay = 1000;
 
   component.$loading = false;
-  component.embeddedContentId = 'pdfdirect';
+  component.embeddedContentId = 'pdfdirect' + Date.now();
 
   // expose the print method to the view
   component.print = print;

client/src/js/services/ModalService.js

@@ -53,6 +53,9 @@ function ModalService(Modal) {
   // inventory list action : add or edit
   service.openInventoryListActions = openInventoryListActions;
 
+  // date interval modal
+  service.openDateInterval = openDateInterval;
+
   /**
    * Opens a "confirm delete" modal with a button for "Confirm" or "Cancel".
    * The modal is a safe replacement for $window.confirm(), since you cannot
@@ -279,4 +282,23 @@ function ModalService(Modal) {
       return instance.result;
     }
 
+    /** Find by Date interval modal */
+    function openDateInterval(request) {
+
+      var params = angular.extend(modalParameters, {
+        templateUrl  : 'partials/templates/modals/dateInterval.tmpl.html',
+        controller   : 'DateIntervalModalController',
+        controllerAs : '$ctrl',
+        size         : 'xs',
+        backdrop     : 'static',
+        animation    : false,
+        resolve : {
+          data :  function dataProvider() { return request; }
+        }
+      });
+
+      var instance = Modal.open(params);
+      return instance.result;
+    }
+
 }

client/src/js/services/PrototypeApiService.js

@@ -244,17 +244,32 @@ function PrototypeApiService($http, util) {
 
     // append the id to the base url
     var target = this.url.concat('reports/', param);
+    return reportBuilder(param, filetype);
+  }
+
+  /**
+   * Receipt
+   */
+  function receipt(param, filetype) {
+
+    // append the id to the base url
+    var target = this.url.concat('receipts/', param);
+    return reportBuilder(param, filetype);
+  }
+
+  /** report builder */
+  function reportBuilder(param, filetype) {
 
     // filetype setup
     var responseType = filetype === 'pdf' ? 'arraybuffer' : null;
     var params = { renderer: filetype };
 
     // send the GET request
-    return this.$http.get(target, {
+    return $http.get(target, {
       params: params,
       responseType: responseType
     })
-      .then(util.unwrapHttpResponse);
+    .then(util.unwrapHttpResponse);
   }
 
   return Api;

client/src/partials/inventory/list/list.js

@@ -128,20 +128,7 @@ function InventoryListController ($translate, Inventory, Notify, uiGridConstants
 
   /** print inventory list */
   function printList() {
-    var buttonState = JSON.parse(JSON.stringify(vm.bcButtons[2]));
-    vm.bcButtons[2].disabled = true;
-    vm.bcButtons[2].icon = 'fa fa-spinner fa-pulse';
-
-    Inventory.report('pdf')
-    .then(function (result) {
-      vm.report = result;
-      return Modal.openReports({ report: vm.report, renderer: 'pdf' });
-    })
-    .then(function () {
-      vm.bcButtons[2] = JSON.parse(JSON.stringify(buttonState));
-      vm.bcButtons[2].action = printList;
-    })
-    .catch(Notify.errorHandler);
+    Modal.openReports({ url: '/inventory/reports/metadata', renderer: 'pdf' });
   }
 
   /** startup */

client/src/partials/templates/grid/linkFilePDF.tmpl.html

@@ -0,0 +1,8 @@
+<div style="padding: 5px;">
+  <a href=""
+  ng-if="row.entity.uuid"
+  ng-click="grid.appScope.showReceipt(row.entity.uuid)"
+  data-link-receipt="{{ row.entity.uuid }}">
+  <i class="fa fa-file-pdf-o"></i> {{ "TABLE.COLUMNS.RECEIPT" | translate }}
+  </a>
+</div>

client/src/partials/templates/grid/voucherType.tmpl.html

@@ -0,0 +1,7 @@
+<div style="padding: 5px;">
+  <span ng-class="{'label label-success': grid.appScope.getType(row.entity.type_id).incomeExpense == 'income', 'label label-warning': grid.appScope.getType(row.entity.type_id).incomeExpense == 'expense'}" href="">
+  {{ grid.appScope.getType(row.entity.type_id).text | translate }}
+  <span ng-if="row.groupHeader">{{ COL_FIELD }}</span>
+  </span>
+  <a ng-if="grid.appScope.isDefined(row.entity)" class="label label-default">{{ "FORM.LABELS.UNDEFINED" | translate }}</a>
+</div>