Resolve conflict with Branch Master

client/src/css/documents.css

@@ -88,3 +88,7 @@
   width: 100%;
 }
 /* ========================== End Upload thumbnail ========================== */
+
+@media print {
+  footer {page-break-after: always;}
+}

client/src/i18n/en/depot.json

@@ -18,6 +18,7 @@
       "TITLE" : "Depot Management"
     },
     "JOIN_LOCATION" : "Join location",
+    "MANAGEMENT_PRODUCTS_PACKAGING": "Management of pharmaceutical products by packaging",
     "NO_DEPOT" : "No Depot",
     "NO_DEPOT_ASSIGNED_TO_USER" : "You are not allowed to access any depot or there's no depot registered yet. Please contact the administrator if needed",
     "NOT_ALLOWED_ACTIONS" : "This depot is protected.  You cannot modify its properties.",

client/src/i18n/en/entity.json

@@ -5,6 +5,7 @@
     "ASSIGNED_TO": "Assigned to",
     "EDIT_ENTITY":"Edit Contact",
     "NAME":"Name",
+    "TITLE":"Title",
     "SEX":"Sex",
     "PHONE":"Phone",
     "EMAIL":"Email",

client/src/i18n/en/form.json

@@ -168,6 +168,7 @@
             "CREDIT_NOTE_INVOICE": "Credit Note reversing invoice {{ invoiceReference }} of debtor {{ debtorName }} ({{ debtorIdentifier }}).  {{ description }}",
             "CURRENT": "Current",
             "DANGER_ZONE": "Danger Zone",
+            "DEFINE_PACKAGING": "Define packaging",
             "DELETE_RECORD_SUCCESS": "Successfully deleted the record.",
             "DELETE_SUCCESS": "Successfully deleted a record",
             "DETAILED_REPORT": "Detailed report",
@@ -216,9 +217,12 @@
             "NO_SOURCE": "No source defined",
             "NO_SUPPLIER": "A purchase order must have a supplier before specifying items.",
             "NUM_TRANSACTION": "Number of transactions",
+            "NUMBER_PACKAGE_INFO" : "For products or items that come with packaging, you must enter the total number of packages or boxes, this quantity multiplied by the size of the packaging to obtain the global quantity by the smallest unit.",
             "OF": "of",
             "OPERATION_SUCCESS": "Operation performed successfully",
             "OTHER_ACTIONS": "Other Actions",
+            "PACKAGE_UNIT_COST_INFO": "The unit cost of the package calculates the unit cost for the smallest unit by dividing by the size of the package",
+            "PACK_SIZE_INFO": "Corresponds to the size of the packaging, the number of items contained in the package or box, generally we find B10, B20, B50, B100, B500 or B1000",
             "PATIENTS": "Patients",
             "PATIENT_FOUND": "Patient Found",
             "PATIENT_NOT_FOUND": "Patient Not Found",
@@ -299,6 +303,7 @@
             "AMOUNT": "Amount",
             "AMOUNT_PAID" : "Amount Paid",
             "ARTICLES":"Articles",
+            "PACKAGE_UNIT_COST": "Package unit cost",
             "CASHBOXES": "Cashboxes",
             "NUMBER_OF_TAGS": "Number of tags",
             "SELECT_ALL_LOTS": "Select all lots",
@@ -346,6 +351,7 @@
             "BEGINNING_VIEW_BALANCE" : "Beginning View Balance",
             "BILLING_DATE": "Billing Date",
             "BREAK_EVEN": "Break Even",
+            "BULK_QUANTITY": "Bulk quantity",
             "BY": "by",
             "BY_ID": "By Id",
             "BY_NAME": "By Name",
@@ -625,6 +631,7 @@
             "NOTES": "Note(s)",
             "NR": "No",
             "NUMBER": "Number",
+            "NUMBER_PACKAGES": "Number Package",
             "NUMBER_SUBMISSIONS": "Number of submissions",
             "OFF_DAYS": "Off Days",
             "OF": "Of",
@@ -643,6 +650,8 @@
             "OTHER": "Other",
             "OTHERS": "Others",
             "OTHERS_PROFITS": "Other Profits",
+            "PACK_SIZE": "Pack size",
+            "PACKAGED": "Packaged",
             "PARENT_ACCOUNT": "Parent Account",
             "PARTIAL_DELIVERY": "Partial Delivery",
             "PASSIVE": "Passive",
@@ -956,6 +965,7 @@
             "MAX_CREDIT": "Enter max credit",
             "NAME": "Enter a name",
             "NOTES": "Enter any additional information",
+            "PACKAGING": "Enter count per package",
             "PATIENT_ID": "Enter Patient ID",
             "PATIENT_NAME": "Enter a Patient Name",
             "PHONE": "Enter a Phone number",

client/src/i18n/en/inventory.json

@@ -49,6 +49,7 @@
         "INVENTORY_TYPE_INFO" :       "inventory_type : the type of the inventory such as Article, Service, Assembly or Other",
         "INVENTORY_UNIT_INFO" :       "inventory_unit : the units for the inventory such as such as Piece, Tablet, Box, Bottle, etc",
         "IS_BROKEN" : "is broken",
+        "IS_COUNT_PER_CONTAINER" : "is packaged per package",
         "IS_IT_ASSET": "Is it an asset",
         "LIST": "Inventory Data List",
         "LIST_GROUP": "Inventory Groups",

client/src/i18n/en/purchases.json

@@ -1,30 +1,49 @@
 {
-  "PURCHASES" : {
-    "ORDER" : "Purchase order",
-    "PAGE_TITLE" : "Purchases",
-    "PAYMENT_METHOD" : "Payment Method",
-    "PAYMENT_METHOD_EXPLANATION" : "This field provides the agreed payment conditions of the purchase order.  A purchase can either be paid up front, at delivery, or in some other combination of payments.",
-    "ERRORS" : {
-      "INVALID_ITEMS" : "Some of the purchase order items have errors.  Please correct these mistakes and resubmit the purchase order.",
-      "INVALID_ACCOUNTS" : "Some of the items selected for purchase are missing critical accounts.  Please confirm that all inventory items have a COGS account and a stock account."
+  "PURCHASES": {
+    "ORDER": "Purchase order",
+    "PAGE_TITLE": "Purchases",
+    "PAYMENT_METHOD": "Payment Method",
+    "PAYMENT_METHOD_EXPLANATION": "This field provides the agreed payment conditions of the purchase order.  A purchase can either be paid up front, at delivery, or in some other combination of payments.",
+    "ERRORS": {
+      "INVALID_ITEMS": "Some of the purchase order items have errors.  Please correct these mistakes and resubmit the purchase order.",
+      "INVALID_ACCOUNTS": "Some of the items selected for purchase are missing critical accounts.  Please confirm that all inventory items have a COGS account and a stock account."
     },
-    "RECEIPT" : {
-      "TITLE" : "Purchase Order Receipt",
-      "SUCCESS" : "Purchase Order created."
+    "RECEIPT": {
+      "TITLE": "Purchase Order Receipt",
+      "SUCCESS": "Purchase Order created."
     },
-    "STATUS" : {
-      "CANCELLED" : "Cancelled",
-      "CANCELLED_DESC" : "The purchase order has been cancelled",
-      "CONFIRMED" : "Confirmed",
-      "CONFIRMED_DESC" : "The purchase order has been confirmed by the supplier that it can be delivered",
-      "EXCESSIVE_RECEIVED_QUANTITY" : "The purchase order has been received but with excessive quantity",
-      "NOT_RECEIVED" : "Not Received",
-      "NOT_RECEIVED_DESC" : "The purchase order products are not yet in stock",
-      "PARTIALLY_RECEIVED" : "Partially Received",
-      "RECEIVED" : "Received in Stock",
-      "RECEIVED_DESC" : "The purchase order has been completed and products are in stock",
-      "WAITING_CONFIRMATION" : "Waiting confirmation",
-      "WAITING_CONFIRMATION_DESC" : "The supplier has not confirmed that the purchase order can be delivered"
-  }
+    "STATUS": {
+      "CANCELLED": "Cancelled",
+      "CANCELLED_DESC": "The purchase order has been cancelled",
+      "CONFIRMED": "Confirmed",
+      "CONFIRMED_DESC": "The purchase order has been confirmed by the supplier that it can be delivered",
+      "EXCESSIVE_RECEIVED_QUANTITY": "The purchase order has been received but with excessive quantity",
+      "NOT_RECEIVED": "Not Received",
+      "NOT_RECEIVED_DESC": "The purchase order products are not yet in stock",
+      "PARTIALLY_RECEIVED": "Partially Received",
+      "RECEIVED": "Received in Stock",
+      "RECEIVED_DESC": "The purchase order has been completed and products are in stock",
+      "WAITING_CONFIRMATION": "Waiting confirmation",
+      "WAITING_CONFIRMATION_DESC": "The supplier has not confirmed that the purchase order can be delivered"
+    },
+    "INFO": {
+      "PURCHASE_NUMBER": "Purchase Number",
+      "PRF_NUMBER": "PRF Number",
+      "CONTACT_NAME": "Contact",
+      "CONTACT_PHONE": "Phone",
+      "CONTACT_TITLE": "Title",
+      "DELIVERY_LOCATION": "Delivery Location",
+      "DELIVERY_DATE": "Delivery Date",
+      "DELIVERY_CONDITION": "Delivery Condition",
+      "PAYMENT_CONDITION": "Payment Condition",
+      "SPECIAL_INSTRUCTION": "Special Instruction",
+      "REQUESTED_BY": "Requested by",
+      "APPROVED_BY": "Approved by",
+      "APPROVED_TWO_BY": "Second Approval",
+      "SIGNATURE": "Signature",
+      "DATE": "Date",
+      "TITLE": "Title",
+      "SUPPLIER_OBLIGATION": "The supplier is required to sign and return a copy of this purchase order:"
+    }
   }
-}
+}

client/src/i18n/en/stock.json

@@ -170,6 +170,7 @@
     "MONTHLY_CONSUM"  : "Average Monthly Consumption",
     "MONTH_OF_STOCK"  : "Stock Months - Months until Stock Out",
     "MSD"             : "MSD",
+    "NUMBER_PACKAGES" : "Number Package",
     "RISK"            : "Risk",
     "RISK_QUANTITY"   : "Risk Quantity",
     "RISK_VALUE"      : "Risk Value",
@@ -227,6 +228,8 @@
     "ORIGINS"         : "Lots Origins",
     "ORIGIN_DOCUMENT" : "Origin Document",
     "OUTPUT"          : "Output",
+    "PACK_SIZE"       : "Pack size",
+    "PACKAGING"       : "Packaging",
     "PARTIAL_QUANTITY_RECEIVED" : "Partial Quantity Received",
     "PATIENT_DISTRIBUTION" : "Patient Distribution",
     "PRODUCTS": "Products",
@@ -322,6 +325,8 @@
     "ENABLE_SUPPLIER_CREDIT_ON_STOCK_ENTRY_HELP_TEXT" : "Automatically adds the transactions to credit the supplier for the value of stock received in a depot when entering stock from a purchase order.  This is only triggered if the automatic stock accounting is set as well.",
     "ENABLE_CONSIDERATION_EXPIRED_STOCK_OUT": "Consider expired stocks as stock out (unusable)",
     "ENABLE_CONSIDERATION_EXPIRED_STOCK_OUT_HELP_TEXT": "Activating this option will consider expired stocks as out of stock, and will only consider those that are available and usable.",
+    "ENABLE_PACKAGING_PHARMACEUTICAL_PRODUCTS": "Packaging of pharmaceutical products",
+    "ENABLE_PACKAGING_PHARMACEUTICAL_PRODUCTS_HELP_TEXT": "Enable the management of pharmaceutical products by packaging",
     "ORDER_BY_CREATED_AT" : "Sort lots movements by their true creation date",
     "ORDER_BY_CREATED_AT_HELP_TEXT" : "This option allows you to sort lot movements by their true creation date in the system",
     "ENABLE_STRICT_DEPOT_DISTRIBUTION" : "Activate the restriction of distribution depots",
@@ -370,6 +375,8 @@
     "ASSIGNMENT_DESCRIPTION": "Assignment description",
     "LOT_LABEL":"Lot label",
     "LOT_LABEL_EXPIRES": "{{label}} (expires: {{expdate}})",
+    "MAKE_STOCK_ENTRY_PACKAGING" : "Make the stock entry with another packaging",
+    "MAKE_STOCK_ENTRY_PACKAGING_DESCRIPTION" : "In the event that the supplier has delivered a product with several packaging",
     "INCLUDE_EXHAUSTED_LOTS":"Include exhausted lots",
     "INCLUDE_ONLY_EXHAUSTED_LOTS": "Include only exhausted lots",
     "CLICK_TO_SEE":"Click here to see lots",

client/src/i18n/en/tree.json

@@ -146,6 +146,7 @@
     "PURCHASE_ORDER" : "Purchase Orders",
     "PURCHASE" : "Purchase",
     "PURCHASE_REGISTRY" : "Purchase Registry",
+    "PURCHASE_SETTINGS":"Purchase Settings",
     "PURCHASING" : "Purchasing",
     "REALIZED_PROFIT_REPORT": "Collection on invoices",
     "RECOVERY_CAPACITY_REPORT": "Recovery Capacity",

client/src/i18n/fr/depot.json

@@ -19,6 +19,7 @@
       "TITLE" : "Gestion des dépôts"
     },
     "JOIN_LOCATION" : "Joindre la localisation",
+    "MANAGEMENT_PRODUCTS_PACKAGING": "Gestion des produits pharmaceutiques par conditionnement",
     "NO_DEPOT" : "Aucun dépôt",
     "NO_DEPOT_ASSIGNED_TO_USER" : "Vous n'avez pas la permission d'acceder à un dépôt ou aucun dépôt n'est enregistrer jusque là, veillez contacter l'administrateur en cas de besoin",
     "NOT_ALLOWED_ACTIONS" : "Ce dépôt est protégé, vous ne pouvez effectuer des modifications sur ce dépôt",

client/src/i18n/fr/enterprise.json

@@ -29,7 +29,9 @@
       "ENABLE_REQUIRE_COST_CENTER_FOR_POSTING_HELP_TEXT" : "Exiger les centres de cout pour les comptes d'exploitation (6 et 7) avant de poster les ecritures dans le grand livre",
       "ENABLE_INDEX_PAYMENT_SYSTEM" : "Activer le systeme de payement par indice",
       "HELPDESK_TEXT" : "Coordonnées du service d'assistance",
-      "HELPDESK_TEXT_HELP" : "Si défini, affichez ces informations sur la façon de contacter le service d'assistance en bas de la page de connexion"
+      "HELPDESK_TEXT_HELP" : "Si défini, affichez ces informations sur la façon de contacter le service d'assistance en bas de la page de connexion",
+      "ENABLE_PRF_DETAILS": "Activer les informations supplementaires pour les achats",
+      "ENABLE_PRF_DETAILS_HELP_TEXT": "En activant cette option, les informations des PRF seront ajoutées pour les achats et les conditions générales d'achats"
     }
   }
 }

client/src/i18n/fr/entity.json

@@ -5,6 +5,7 @@
     "ASSIGNED_TO": "Attribué à",
     "EDIT_ENTITY":"Modifier le contact",
     "NAME":"Nom",
+    "TITLE":"Titre",
     "SEX":"Sex",
     "PHONE":"Téléphone",
     "EMAIL":"Email",

client/src/i18n/fr/form.json

@@ -172,6 +172,7 @@
             "CREDIT_NOTE_INVOICE": "Note de credit concernant la facture {{ invoiceReference }} de debiteur {{ debtorName }} ({{ debtorIdentifier }}).  {{ description }}",
             "CURRENT": "Actuel",
             "DANGER_ZONE": "Zone Dangereuse",
+            "DEFINE_PACKAGING": "Définir le Conditionnement",
             "DELETE_RECORD_SUCCESS": "Suppression de la transaction avec succès.",
             "DELETE_SUCCESS": "Suppression avec succès",
             "DISABLED_CURRENCY": "Cette monnaie est inutilisable car il n'y a pas de compte fixée pour elle. Utilisez le module Box Cash Management pour définir un compte pour cette monnaie et caisse.",
@@ -216,9 +217,12 @@
             "NO_SOURCE": "Aucune source définie",
             "NO_SUPPLIER": "Un ordre d'achat doit avoir un fournisseur avant de préciser les éléments.",
             "NUM_TRANSACTION": "Nombres des transactions",
+            "NUMBER_PACKAGE_INFO" : "Pour les produits ou articles qui se présentent avec un conditionnement, il faut renseigner le nombre total des paquets ou boites, cette quantité multipliée par la taille de l'emballage pour obtenir la quantité global par la plus petite unitée",
             "OF": "de",
             "OPERATION_SUCCESS": "Opération effectuée avec succès",
             "OTHER_ACTIONS": "Autres actions",
+            "PACKAGE_UNIT_COST_INFO": "Le coût unitaire du paquet permet de calculer le coût unitaire pour la plus petite unité en divisant par la taille du paquet",
+            "PACK_SIZE_INFO": "Correspond à la taille du conditionnement, le nombre d'article contenu dans le paquet ou la boite, générelament on trouve de B10, B20, B50, B100, B500 ou B1000",
             "PATIENTS": "Patients",
             "PATIENT_FOUND": "Patient Trouvé",
             "PATIENT_NOT_FOUND": "Patient introuvable",
@@ -299,6 +303,7 @@
             "AMOUNT": "Montant",
             "AMOUNT_PAID" : "Montant Payé",
             "ARTICLES":"Articles",
+            "PACKAGE_UNIT_COST": "Coût unitaire du paquet",
             "CASHBOXES": "Caisses",
             "NUMBER_OF_TAGS": "Nombre des étiquettes",
             "SELECT_ALL_LOTS": "Sélectionner tous les lots",
@@ -349,6 +354,7 @@
             "BEGINNING_VIEW_BALANCE" : "Solde Début du Grid",
             "BILLING_DATE": "Date Facturation",
             "BREAK_EVEN": "Seuil de rentabilité",
+            "BULK_QUANTITY": "Quantité en vrac",
             "BY_ID": "Par id",
             "BY_NAME": "Par nom",
             "BY": "Par",
@@ -627,6 +633,7 @@
             "NOTES": "Note(s)",
             "NR": "N°",
             "NUMBER": "Nombre",
+            "NUMBER_PACKAGES": "Nombre de paquet",
             "NUMBER_SUBMISSIONS": "Nombre de soumissions",
             "OF": "De",
             "OFF_DAYS": "jours fériés",
@@ -645,6 +652,8 @@
             "OTHER": "Autre",
             "OTHERS": "Autres",
             "OTHERS_PROFITS": "Autres Profits",
+            "PACK_SIZE": "Taille de l'emballage",
+            "PACKAGED": "Conditionnement",
             "PARENT_ACCOUNT": "Compte parent",
             "PARTIAL_DELIVERY": "Livraison partielle",
             "PASSIVE": "Passive",
@@ -956,6 +965,7 @@
             "NAME": "Entrer le nom",
             "NOTES": "Commentaire",
             "ORIGIN": "Origine",
+            "PACKAGING": "Entrer le Conditionnement du paquet",
             "PASSWORD": "Entrer le mot de passe",
             "PATIENT_ID": "Entrer identifiant patient",
             "PATIENT_NAME": "Entrer nom patient",

client/src/i18n/fr/inventory.json

@@ -49,6 +49,7 @@
         "INVENTORY_TYPE_INFO" : "inventory_type : le type d'inventaire tel que Article, Service, Assemblage ou Autre",
         "INVENTORY_UNIT_INFO" : "inventory_unit : les unités de l'inventaire telles que Piece, Tablet, Box, Bottle, etc",
         "IS_BROKEN" : "est endommagé",
+        "IS_COUNT_PER_CONTAINER" : "est conditionné par paquet",
         "IS_IT_ASSET": "Est ce un actif",
         "LIST": "Liste des données d'inventaire",
         "LIST_GROUP": "Groupes d'inventaires",

client/src/i18n/fr/purchases.json

@@ -25,6 +25,25 @@
       "RECEIVED_DESC" : "La commande a été reçu et se trouve dans le stock",
       "WAITING_CONFIRMATION" : "En Attente de confirmation",
       "WAITING_CONFIRMATION_DESC" : "Le fournisseur n'a pas encore confirmé qu'il saura fournir la commande"
+    },
+    "INFO" : {
+      "PURCHASE_NUMBER" : "Numero commande",
+      "PRF_NUMBER" : "Numero PRF",
+      "CONTACT_NAME" : "Personne de contact",
+      "CONTACT_PHONE" : "Téléphone du contact",
+      "CONTACT_TITLE" : "Titre du contact",
+      "DELIVERY_LOCATION" : "Lieu de livraison",
+      "DELIVERY_DATE" : "Date de livraison",
+      "DELIVERY_CONDITION" : "Condition de livraison",
+      "PAYMENT_CONDITION" : "Condition de paiement",
+      "SPECIAL_INSTRUCTION" : "Instruction speciale",
+      "REQUESTED_BY": "Demandé par (nom en caractères d'imprimerie)",
+      "APPROVED_BY": "Approuvé par (nom en caractères d'imprimerie)",
+      "APPROVED_TWO_BY": "Deuxième approbation (nom en caractères d'imprimerie)",
+      "SIGNATURE": "Signature",
+      "DATE": "Date",
+      "TITLE": "Titre",
+      "SUPPLIER_OBLIGATION": "Le fournisseur est tenu de signer et de renvoyer une copie de ce bon de commande :"
     }
   }
 }