fix mergin conflict

.env.development

@@ -11,7 +11,7 @@ DB_NAME='bhima_test'
 # session variables
 SESS_SECRET='XopEn BlowFISH'
 
-DEBUG=app,errors
+DEBUG=app,errors,ReportManager
 
 UPLOAD_DIR='client/upload'
 

.travis.yml

@@ -12,24 +12,45 @@ env:
     - CHROME_REVISION=706915
     - CHROMEDRIVER_VERSION="79.0.3945.36"
 
+matrix:
+  include:
+    - env: TEST_TYPE=e2e
+      services:
+        - mysql
+        - redis
+    - env: TEST_TYPE=e2e
+      services:
+        - redis
+      addons:
+        mariadb: '10.5'
+    - env:
+        TEST_TYPE=installation
+      services:
+        - mysql
+        - redis
+    - env:
+        TEST_TYPE=installation
+      addons:
+        mariadb: '10.5'
+      services:
+        - redis
+
 before_install:
   - ./sh/setup-ci-env.sh
-  - ./sh/travis.sh
-
-services:
-  - mysql
-  - redis
+  - sudo ./sh/travis.sh
 
 language: node_js
 node_js:
   - lts/erbium
 
 before_script:
-  - yarn build
-  - yarn webdriver-manager update --versions.chrome=$CHROMEDRIVER_VERSION --gecko false
+  - sh -c "if [ '$TEST_TYPE' = 'e2e' ]; then yarn build; fi"
+  - sh -c "if [ '$TEST_TYPE' = 'e2e' ]; then yarn webdriver-manager update --versions.chrome=$CHROMEDRIVER_VERSION --gecko false; fi"
 
 script:
-  - yarn test:ends
+  - sh -c "if [ '$TEST_TYPE' = 'e2e' ]; then yarn test:ends; fi"
+  - sh -c "if [ '$TEST_TYPE' = 'installation' ]; then ./sh/install-tests.sh; fi"
+
 
 git:
   depth: 3

client/src/i18n/en/employee.json

@@ -9,6 +9,7 @@
   "REGISTER" : "Register Employee",
   "REGISTRATION_FORM" : "Registration Form",
   "TITLE":"Employee Management",
-  "NO_GRADE":"No grade assigned"
+  "NO_GRADE":"No grade assigned",
+  "VIEW_EMPLOYEE" : "View Employee"
  }
 }

client/src/i18n/en/form.json

@@ -230,6 +230,7 @@
             "SHOWING": "Showing",
             "SUPPORT_COST": " is paid by:",
             "THE_NECESSARY_CONFIG_MISSING": "The necessary configurations are missing",
+            "THIS_INVOICE_NO_STOCK": "This invoice does not concern any item in stock",
             "TRANSACTIONS": "Transactions",
             "TRANSACTION_REVER_SUCCESS": "This transaction was reversed with success",
             "UNAUTHORIZED": "Unauthorized",

client/src/i18n/en/report.json

@@ -63,6 +63,11 @@
       "HIDE_LOCKED_CLIENTS_HELP_TEXT" : "Selecting yes will filter out all locked clients from the report.  By default, the value is no."
     },
     "CLOSING_BALANCE": "Closing Balance",
+    "COMPARE_INVOICED_RECEIVED": {
+      "DESCRIPTION": "This report makes it possible to attach the items billed to a patient on the articulated items consumed or distributed to the Patient",
+      "NO_INVOICE_ATTRIBUTION": "No invoice attribution",
+      "TITLE": "Compare invoiced items to received stock"
+    },
     "CONFIGURABLE_ANALYSIS_REPORT" : {
       "HIDE_ACCOUNT_DETAILS": "Hide account details",
       "HIDE_DETAILS_TYPES": "Hide details of types",

client/src/i18n/en/table.json

@@ -54,6 +54,8 @@
             "COST": "Cost",
             "COST_CENTER": "Cost Center",
             "COST_CENTER_OPERATIONS": "Cost Center Operations",
+            "COST_DIFFERENCE": "Cost Difference",
+            "COST_DISTRIBUTED": "Cost Distributed",
             "COUNTRY": "Country",
             "CREDIT": "Credit",
             "CREDIT_SOURCE": "Credit (Source)",
@@ -80,6 +82,7 @@
             "DAYS": "Days",
             "DAILY_RATE": "Daily Rate",
             "DAY_WORKED": "Day Worked",
+            "DIFFERENCE": "Difference",
             "DISTRIBUTION_COST": "Distribution by cost center",
             "DISTRIBUTION_PROFIT": "Distribution by profit center",
             "DEBIT": "Debit",
@@ -131,6 +134,7 @@
             "IS_BRUT_LINK": "Is brut link?",
             "IS_CONVENTION": "Is Convention",
             "IS_WAREHOUSE": "Is Warehouse?",
+            "ITEM": "Item",
             "LABEL": "Label",
             "LAST_BILL": "Latest Bill",
             "LAST_NAME": "Last Name",
@@ -173,6 +177,7 @@
             "POSITION": "Position",
             "PO_BOX": "Post Office Box",
             "PRICE": "Price",
+            "PRICE_INVOICED": "Price Invoiced",
             "PRICE_LIST": "Price List",
             "PRINCIPAL_CENTER": "Principal Center",
             "PRINCIPAL_CENTERS": "Principal Centers",
@@ -184,6 +189,10 @@
             "PROJECT": "Project",
             "PROVINCE": "Province",
             "PURCHASE_PRICE" : "Purchase Price",
+            "QUANTITY": "Quantity",
+            "QUANTITY_DIFFERENCE": "Quantity Difference",
+            "QUANTITY_DISTRIBUTED": "Quantity Distributed",
+            "QUANTITY_INVOICED": "Quantity Invoiced",
             "QUARTER_FOUR": "Previous Exercises",
             "QUARTER_ONE": "Less than 3 months",
             "QUARTER_THREE": "More than 6 months",
@@ -232,7 +241,9 @@
             "TOTAL_COST": "Total Cost",
             "TOTAL_DEBT": "Total Debt",
             "TOTAL_DISTRIBUTE": "Total Distributions",
+            "TOTAL_DISTRIBUTION_COST": "Total distribution cost",
             "TOTAL_GENERAL": "Total General",
+            "TOTAL_INVOICE": "Total invoice",
             "TOTAL_MEDICAL_CARE_EMPLOYEE": "Total medical care provided to the employee",
             "TOTAL_UNICORPORATED_CHARGE": "Total unincorporated cost",
             "TOTAL_UNICORPORARED_PRODUCT": "Total unincorporated product",
@@ -247,8 +258,7 @@
             "USER": "User",
             "VALUE": "Value",
             "VARIABLE_CHARGES": "Variable Costs",
-            "VILLAGE": "Village/Township",
-            "QUANTITY": "Quantity"
+            "VILLAGE": "Village/Township"
         },
         "AGGREGATES": {
             "NUMBER_OF_DAYS": "Number of Days",

client/src/i18n/en/tree.json

@@ -24,6 +24,7 @@
     "CASH_PAYMENT_REGISTRY" : "Cash Payment Registry",
     "CASH_WINDOW" : "Cash Window",
     "CHOICES_LIST_MANAGEMENT" : "Choices List Management",
+    "COMPARE_INVOICED_RECEIVED": "[Stock] Compare invoiced items to received stock",
     "COMPLEX_JOURNAL_VOUCHER" : "Journal Vouchers",
     "CONFIGURABLE_ANALYSIS_REPORT" : "Configurable analysis report",
     "CONFIGURATION_ANALYSIS_TOOLS" : "Configuration Analysis Tools",

client/src/i18n/fr/employee.json

@@ -9,6 +9,7 @@
         "REGISTER" : "Nouveau employé",
         "REGISTRATION_FORM" : "Formulaire d'enregistrement",
         "TITLE" : "Gestion des employés",
-        "NO_GRADE":"Aucun grade enregistré"
+        "NO_GRADE":"Aucun grade enregistré",
+        "VIEW_EMPLOYEE" : "Voir Employé"
     }
-}
+}

client/src/i18n/fr/form.json

@@ -230,6 +230,7 @@
             "SHOWING": "Aperçue",
             "SUPPORT_COST": " est prise en charge par",
             "THE_NECESSARY_CONFIG_MISSING": "Les configurations nécessaires manquent",
+            "THIS_INVOICE_NO_STOCK": "Cette facture ne concerne aucun article en stock",
             "TRANSACTIONS": "Transactions",
             "TRANSACTION_REVER_SUCCESS": "Cette transaction a été Annulée avec succès",
             "UNAUTHORIZED": "Non autorisée",

client/src/i18n/fr/report.json

@@ -57,6 +57,11 @@
     "CASH_INCOME" : "Recettes",
     "CHART_OF_ACCOUNTS" : "Plan Comptable",
     "CLOSING_BALANCE" : "Balance à la cloture",
+    "COMPARE_INVOICED_RECEIVED": {
+      "DESCRIPTION": "Ce rapport permet de joindre les articles facturés à un patient sur les articlés consomés ou distribués au Patient",
+      "NO_INVOICE_ATTRIBUTION": "Aucune attribution de facture",
+      "TITLE": "Comparaison des articles facturés sur les reçus"
+    },
     "CONFIGURABLE_ANALYSIS_REPORT" : {
       "HIDE_ACCOUNT_DETAILS": "Cacher les détailles des comptes",
       "HIDE_DETAILS_TYPES": "Cacher les détailles des types",

client/src/i18n/fr/table.json

@@ -54,6 +54,8 @@
             "COST": "Coût",
             "COST_CENTER": "Centre de coût",
             "COST_CENTER_OPERATIONS": "Exploitation par centre de coûts",
+            "COST_DIFFERENCE": "Différence de coût",
+            "COST_DISTRIBUTED": "Coût de la distribution",
             "COUNTRY": "Pays",
             "CREATED_BY": "Crée par",
             "CREDIT": "Crédit",
@@ -89,6 +91,7 @@
             "DEDUCTIONS" : "Retenues",
             "DESCRIPTION": "Description",
             "DETAIL": "Détail",
+            "DIFFERENCE": "Différence",
             "DISTRIBUTION_COST": "Répartition par centre de coûts",
             "DISTRIBUTION_PROFIT": "Répartition par centre de profits",
             "DIVERSE_PRODUCTS": "Produits divers",
@@ -131,6 +134,7 @@
             "IS_BRUT_LINK": "Est un brut ?",
             "IS_CONVENTION": "Convention",
             "IS_WAREHOUSE": "Entrepôt ?",
+            "ITEM": "Article",
             "LABEL": "Label",
             "LAST_BILL": "Dernière Facture",
             "LAST_NAME": "Nom",
@@ -173,6 +177,7 @@
             "POSITION": "Position",
             "PO_BOX": "Boîte postale",
             "PRICE": "Prix",
+            "PRICE_INVOICED": "Prix facturé",
             "PRICE_LIST": "Liste de prix",
             "PRINCIPAL_CENTER": "Centre Principal",
             "PRINCIPAL_CENTERS": "Centres Principaux",
@@ -185,6 +190,9 @@
             "PROVINCE": "Province",
             "PURCHASE_PRICE" : "Prix d'achat",
             "QUANTITY": "Quantité",
+            "QUANTITY_DIFFERENCE": "Quantity Difference",
+            "QUANTITY_DISTRIBUTED": "Quantité distribuée",
+            "QUANTITY_INVOICED": "Quantité facturée",
             "QUARTER_FOUR": "Exercices precedantes",
             "QUARTER_ONE": "Moins de 3 mois",
             "QUARTER_THREE": "Plus de 6 mois",
@@ -234,6 +242,8 @@
             "TOTAL_DEBT": "Total des Dettes",
             "TOTAL_GENERAL": "Total général",
             "TOTAL_DISTRIBUTE": "Total de répartition",
+            "TOTAL_DISTRIBUTION_COST": "Total du coût de la distribution",
+            "TOTAL_INVOICE": "Total de la facture",
             "TOTAL_MEDICAL_CARE_EMPLOYEE": "Total des soins médicaux accordés à l'employé",
             "TOTAL_UNICORPORATED_CHARGE": "Total charge non incorporé",
             "TOTAL_UNICORPORARED_PRODUCT": "Total produit non incorporé",            

client/src/i18n/fr/tree.json

@@ -24,6 +24,7 @@
     "CASH_PAYMENT_REGISTRY":"Registre des paiements",
     "CASH_WINDOW":"Paiements",
     "CHOICES_LIST_MANAGEMENT" : "Gestion des listes de choix",
+    "COMPARE_INVOICED_RECEIVED": "[Stock] Comparaison des articles facturés sur les reçus",
     "COMPLEX_JOURNAL_VOUCHER":"Ajout de transactions",
     "CONFIGURABLE_ANALYSIS_REPORT" : "Rapport d'analyse configurable",
     "CONFIGURATION_ANALYSIS_TOOLS" : "Configuration d'outils d'analyse",

client/src/js/components/bhDepotSelect/bhDepotSelect.js

@@ -8,6 +8,7 @@ angular.module('bhima.components')
       onSelectCallback : '&',
       label            : '@?',
       required         : '<?',
+      exception        : '<?', // uuid string or an array of uuids
     },
   });
 
@@ -40,6 +41,7 @@ function DepotSelectController(Depots, Notify) {
   $ctrl.searchByName = text => {
     const options = {
       text : (text || '').toLowerCase(),
+      exception : $ctrl.exception,
     };
 
     return Depots.searchByName(options);

client/src/js/services/StockService.js

@@ -15,6 +15,8 @@ function StockService(Api, StockFilterer) {
   // API for stock lots movements
   const movements = new Api('/stock/lots/movements');
 
+  const status = new Api('/stock/status');
+
   // API for stock inventory in depots
   const inventories = new Api('/stock/inventories/depots');
 
@@ -150,5 +152,6 @@ function StockService(Api, StockFilterer) {
     processLotsFromStore,
     statusLabelMap,
     downloadTemplate,
+    status,
   };
 }

client/src/modules/depots/templates/action.tmpl.html

@@ -5,11 +5,25 @@
   </a>
 
   <ul class="dropdown-menu-right" uib-dropdown-menu data-row-menu="{{ row.entity.text }}">
+
+    <li class="dropdown-header">{{row.entity.text}}</li>
+
     <li>
       <a data-method="edit-record" ng-click="grid.appScope.editDepot(row.entity)" href>
         <i class="fa fa-edit"></i> <span translate>FORM.BUTTONS.EDIT</span>
       </a>
     </li>
+    <li>
+      <a href
+        data-method="stock-inventory"
+        ui-sref="stockInventories({ filters : [
+          { key : 'depot_uuid', value : row.entity.uuid, displayValue : row.entity.text, cacheable: false },
+          { key : 'limit', value : 1000, cacheable: false }
+        ]})" href>
+        <i class="fa fa-th-list"></i> <span translate>INVENTORY.VIEW_ARTICLES_IN_STOCK</span>
+      </a>
+    </li>
+
     <li class="divider"></li>
     <li>
       <a data-method="delete-record" ng-click="grid.appScope.deleteDepot(row.entity)" href>