Merge #6223

6223: fix: report names with brackets r=jniles a=jniles

This commit goes through the tree and unit files to fix report names with brackets.

Closes #6124

Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>

client/src/i18n/en/patient_invoice.json

@@ -15,7 +15,7 @@
         "DESCRIPTION": "Invoice to {{ patientName }} ({{ patientReference }}) for {{ numItems }} items from service {{ serviceName }}. {{ description }}",
         "INVALID_DETAILS": "This invoice contains invalid details",
         "INVALID_ITEMS": "This invoice contains invalid items",
-        "PREPAYMENT_LINK_DESCRIPTION" : "[Prepayment] Allocation of previous payments against debtor's invoice.",
+        "PREPAYMENT_LINK_DESCRIPTION" : "Allocation of previous payments against debtor's invoice.",
         "PAGE_TITLE": "Patient Invoice",
         "STAT_TOTAL_INVOICE": "Total Invoices",
         "LABEL_PAID": "Invoice has been paid in full",

client/src/i18n/en/tree.json

@@ -26,11 +26,11 @@
     "CASH_REPORT" : "Cash Report",
     "CASH_WINDOW" : "Cash Window",
     "CHOICES_LIST_MANAGEMENT" : "Choices List Management",
-    "CLIENT_DEBTS_REPORT": "[Clients] Debts Report",
-    "CLIENT_SUPPORT_REPORT": "[Clients] Support Report",
-    "COMPARE_INVOICED_RECEIVED": "[Stock] Compare invoiced items to received stock",
+    "CLIENT_DEBTS_REPORT": "Client Debts Report",
+    "CLIENT_SUPPORT_REPORT": "Client Support Report",
+    "COMPARE_INVOICED_RECEIVED": "Compare invoiced items to distributed stock",
     "COMPLEX_JOURNAL_VOUCHER" : "Journal Vouchers",
-    "CONFIGURABLE_ANALYSIS_REPORT" : "Configurable analysis report",
+    "CONFIGURABLE_ANALYSIS_REPORT" : "Configurable Analysis Report",
     "CONFIGURATION_ANALYSIS_TOOLS" : "Configuration Analysis Tools",
     "COST_CENTER": "Cost Centers",
     "COST_CENTER_MANAGEMENT": "Cost Center Management",
@@ -103,15 +103,15 @@
     "LOCATION" : "Location Management",
     "LOST_STOCK_REPORT" : "Lost Stock Report",
     "MONTHLY_BALANCE": "Monthly Balance",
-    "MONTHLY_CONSUMPTION" : "[Stock] Monthly consumption",
+    "MONTHLY_CONSUMPTION" : "Monthly Stock Consumption",
     "MULTI_PAYROLL_INDICE" : "Multiple Payroll (index-based)",
     "MULTI_PAYROLL" : "Multiple Payroll",
     "OFFDAYS_MANAGEMENT" : "Offdays Management",
-    "OHADA_BALANCE_SHEET":"[OHADA] Balance Sheet",
-    "OHADA_BILAN":"[OHADA] Bilan",
-    "OHADA_INCOME":"[OHADA] Income Report",
-    "OHADA_PROFIT_LOSS" : "[OHADA] Profit and Loss",
-    "OHADA_RESULT_ACCOUNT":"[OHADA] Account Status",
+    "OHADA_BALANCE_SHEET":"OHADA Balance Sheet",
+    "OHADA_BILAN": "OHADA General Ledger",
+    "OHADA_INCOME": "OHADA Income Statement",
+    "OHADA_PROFIT_LOSS" : "OHADA Profit and Loss Statement",
+    "OHADA_RESULT_ACCOUNT":"OHADA Account Status",
     "OPERATING_ACCOUNT" : "Operating Account",
     "PATIENT_DOCUMENT" : "Patient Documents",
     "PATIENT_GRP_ASSIGNMENT" : "Patient Group Assignment",
@@ -134,7 +134,7 @@
     "PRICE_LIST" : "Price List",
     "PROFESSION" : "Job Titles Management",
     "PROJECT" : "Projects",
-    "PURCHASE_ORDER_ANALYSIS": "[Stock] Purchase Order Analysis",
+    "PURCHASE_ORDER_ANALYSIS": "Purchase Order Analysis",
     "PURCHASE_ORDER" : "Purchase Orders",
     "PURCHASE" : "Purchase",
     "PURCHASE_REGISTRY" : "Purchase Registry",
@@ -156,27 +156,27 @@
     "STAFFING_INDICES_MANAGEMENT" : "Staffing Indices Management",
     "STOCK_CONSUMPTION_GRAPH_REPORT": "Stock Consumption's graph report",
     "STOCK_DASHBOARD": "Dashboard",
-    "STOCK_ENTRY_REPORT":"[Stock] Entries Report",
-    "STOCK_EXIT_REPORT" : "[Stock] Exit Report",
-    "STOCK_EXPIRATION_REPORT": "[Stock] Expiration Report",
+    "STOCK_ENTRY_REPORT":"Stock Entries Report",
+    "STOCK_EXIT_REPORT" : "Stock Exits Report",
+    "STOCK_EXPIRATION_REPORT": "Stock Expiration Report",
     "STOCK_INLINE_MOVEMENTS":"Movements Registry",
     "STOCK_INVENTORY" : "Articles in Stock",
-    "STOCK_INVENTORY_REPORT" : "[Stock] Stock Sheet",
+    "STOCK_INVENTORY_REPORT" : "Stock Sheet",
     "STOCK_LOTS" : "Stock Lots",
-    "STOCK_MOVEMENT_REPORT": "[Stock] Graphical Movements Report",
+    "STOCK_MOVEMENT_REPORT": "Graphical Stock Movements Report",
     "STOCK_MOVEMENTS" : "Stock Movements",
-    "STOCK_REPORT" : "[Stock] Inventories",
+    "STOCK_REPORT" : "Stock Inventories",
     "STOCK_REQUISITION":"Requisition",
     "STOCK_SETTINGS": "Stock Settings",
     "STOCK" : "Stock",
-    "STOCK_VALUE" : "[Stock] Stock value Report",
+    "STOCK_VALUE" : "Stock Value Report",
     "SUBSIDY" : "Subsidy Management",
     "TAGS" : "Tags Management",
     "TRANSACTION_TYPE" : "Transaction Type Management",
     "UPDATE_DISTRIBUTION": "Update Distribution of Cost Centers",
     "USERS" : "User Management",
     "VISITS_REGISTRY": "Visits Registry",
-    "VISITS_REPORT": "[Visits] Admission by Services",
+    "VISITS_REPORT": "Admissions by Services",
     "VOUCHER_REGISTRY" : "Voucher Registry",
     "WARD_CONFIGURATION" : "Settings",
     "WARD" : "Ward Management",

client/src/i18n/fr/patient_invoice.json

@@ -15,7 +15,7 @@
         "DESCRIPTION": "Facture de {{ patientName }} ({{ patientReference }}) pour {{ numItems }} items dans le service {{ serviceName }}. {{ description }}",
         "INVALID_DETAILS": "Cette facture contient des détails invalides",
         "INVALID_ITEMS": "Cette facture contient des articles invalides",
-        "PREPAYMENT_LINK_DESCRIPTION" : "[Caution] Affectation des cautions à la facture du débiteur.",
+        "PREPAYMENT_LINK_DESCRIPTION" : "Affectation des cautions à la facture du débiteur.",
         "LABEL_PAID": "Cette facture a été payé.",
         "PAGE_TITLE": "Facture des patients",
         "STAT_TOTAL_INVOICE": "Total factures",

client/src/i18n/fr/tree.json

@@ -26,9 +26,9 @@
     "CASH_REPORT" : "Rapport de Caisse",
     "CASH_WINDOW":"Paiements",
     "CHOICES_LIST_MANAGEMENT" : "Gestion des listes de choix",
-    "CLIENT_DEBTS_REPORT": "[Clients] Dettes",
-    "CLIENT_SUPPORT_REPORT": "[Clients] Prises en charges",
-    "COMPARE_INVOICED_RECEIVED": "[Stock] Comparaison des articles facturés sur les reçus",
+    "CLIENT_DEBTS_REPORT": "Dettes de clients",
+    "CLIENT_SUPPORT_REPORT": "Prises en charges par clients",
+    "COMPARE_INVOICED_RECEIVED": "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",
@@ -102,15 +102,15 @@
     "LOCATION":"Localisations",
     "LOST_STOCK_REPORT": "Rapport sur les stocks perdus",
     "MONTHLY_BALANCE": "Analyse mensuel de la Balance",
-    "MONTHLY_CONSUMPTION" : "[Stock] Consommations mensuelles",
+    "MONTHLY_CONSUMPTION" : "Consommations mensuelles de stock",
     "MULTI_PAYROLL" : "Payroll Multiple",
     "MULTI_PAYROLL_INDICE" : "Payroll Multiple(indice)",
     "OFFDAYS_MANAGEMENT" : "Gestion des jours fériés",
-    "OHADA_BALANCE_SHEET":"[OHADA] Bilan",
-    "OHADA_BILAN":"[OHADA] Bilan",
-    "OHADA_INCOME":"[OHADA] Compte de resultat",
-    "OHADA_PROFIT_LOSS" : "[OHADA] Profit et Perte",
-    "OHADA_RESULT_ACCOUNT":"[OHADA] Compte de Résultat",
+    "OHADA_BALANCE_SHEET":"OHADA Bilan",
+    "OHADA_BILAN":"OHADA Bilan",
+    "OHADA_INCOME":"OHADA Compte de resultat",
+    "OHADA_PROFIT_LOSS" : "OHADA Profit et Perte",
+    "OHADA_RESULT_ACCOUNT":"OHADA Compte de Résultat",
     "OPERATING_ACCOUNT" : "Compte d'exploitation",
     "PATIENT_DOCUMENT":"Documents de Patient",
     "PATIENT_GRP":"Groupe des Patients",
@@ -135,10 +135,10 @@
     "PROJECT":"Projets",
     "PURCHASE":"Effectuer Achat",
     "PURCHASE_ORDER":"Achats",
-    "PURCHASE_ORDER_ANALYSIS": "[Stock] Analyse de commande d'achat",
+    "PURCHASE_ORDER_ANALYSIS": "Analyse de commande d'achat",
     "PURCHASE_REGISTRY":"Registre des achats",
     "PURCHASING":"Achat",
-    "REALIZED_PROFIT_REPORT": "[Facturation] Recouvrement",
+    "REALIZED_PROFIT_REPORT": "Recouvrement de factures",
     "RECOVERY_CAPACITY_REPORT": "Capacité de recouvrement",
     "REFERENCE":"Référence",
     "REFERENCE_GROUP":"Groupe de référence",
@@ -157,25 +157,25 @@
     "STOCK_CONSUMPTION_GRAPH_REPORT": "Rapport graphique de la consommation de stock",
     "STOCK_INVENTORY":"Articles en stock",
     "STOCK_DASHBOARD": "Tableau de bord",
-    "STOCK_ENTRY_REPORT":"[Stock] Entrées des stocks",
-    "STOCK_EXIT_REPORT":"[Stock] Sorties des stocks",
-    "STOCK_EXPIRATION_REPORT": "[Stock] Rapport d'expiration",
+    "STOCK_ENTRY_REPORT":"Entrées des stocks",
+    "STOCK_EXIT_REPORT":"Sorties des stocks",
+    "STOCK_EXPIRATION_REPORT": "Rapport d'expiration",
     "STOCK_INLINE_MOVEMENTS":"Registre des mouvements",
-    "STOCK_INVENTORY_REPORT":"[Stock] Fiche de stock",
+    "STOCK_INVENTORY_REPORT":"Fiche de stock",
     "STOCK_LOTS":"Lots en stock",
     "STOCK_MOVEMENTS":"Movements de stock",
-    "STOCK_REPORT": "[Stock] Articles en stock",
-    "STOCK_VALUE" : "[Stock] Valeur de stock",
+    "STOCK_REPORT": "Articles en stock",
+    "STOCK_VALUE" : "Valeur de stock",
     "STOCK_REQUISITION":"Réquisition",
-    "STOCK_MOVEMENT_REPORT": "[Stock] Rapport graphique des mouvements",
+    "STOCK_MOVEMENT_REPORT": "Rapport graphique des mouvements",
     "STOCK_SETTINGS": "Paramètres de stock",
     "SUBSIDY":"Gestion des subventions",
     "TAGS" : "Gestion des étiquettes",
     "TRANSACTION_TYPE":"Types de Transaction",
     "UPDATE_DISTRIBUTION": "Mettre à jour la répartition des centres de coût",
     "USERS":"Utilisateurs",
     "VISITS_REGISTRY": "Registre des visites",
-    "VISITS_REPORT": "[Visits] Admissions par services",
+    "VISITS_REPORT": "Admissions par services",
     "VOUCHER_REGISTRY":"Registre des Bordereaux",
     "WARD" : "Gestion des pavillons",
     "WARD_CONFIGURATION" : "Configurations",

server/models/bhima.sql

@@ -90,14 +90,14 @@ INSERT INTO unit VALUES
   (203,'Employees Configuration','TREE.PAYROLL_EMP_CONFIGURATION','',57,'/payroll/employee_configuration'),
   (204,'Exchange Rate','TREE.EXCHANGE','',1,'/exchange'),
   (205,'Account Reference Management','TREE.ACCOUNT_REFERENCE_MANAGEMENT','',1,'/account_reference'),
-  (206,'[OHADA] Bilan','TREE.OHADA_BALANCE_SHEET','',281,'/reports/ohada_balance_sheet_report'),
+  (206,'OHADA Bilan','TREE.OHADA_BALANCE_SHEET','',281,'/reports/ohada_balance_sheet_report'),
   (207,'Account Reference Report','TREE.ACCOUNT_REFERENCE_REPORT','',281,'/reports/account_reference'),
   (208,'Import Stock From File','TREE.IMPORT_STOCK_FROM_FILE','',160,'/stock/import'),
   (209,'Accounts Report Multiple','TREE.REPORTS_MULTIPLE_ACCOUNTS','',281,'/reports/account_report_multiple'),
   (210,'Unbalanced Invoice Payments','REPORT.UNPAID_INVOICE_PAYMENTS_REPORT.TITLE','',281,'/reports/unpaid_invoice_payments'),
   (211,'Profit & Loss by Month','REPORT.PROFIT_AND_LOSS_BY_MONTH','The report of income and expenses',281,'/reports/income_expense_by_month'),
   (213,'Stock Value Report','TREE.STOCK_VALUE','',282,'/reports/stock_value'),
-  (214,'[OHADA] Compte de resultat','TREE.OHADA_RESULT_ACCOUNT','',281,'/reports/ohada_profit_loss'),
+  (214,'OHADA Compte de resultat','TREE.OHADA_RESULT_ACCOUNT','',281,'/reports/ohada_profit_loss'),
   (216,'Profit & Loss by Year','REPORT.PROFIT_AND_LOSS_BY_YEAR','The report of income and expenses',281,'/reports/income_expense_by_year'),
   (217,'Tags','TREE.TAGS','',1,'/tags'),
   (218,'Fee Center Management','TREE.COST_CENTER_MANAGEMENT','',0,'/cost_center'),
@@ -121,7 +121,7 @@ INSERT INTO unit VALUES
   (237,'Finances dashboard','TREE.DASHBOARDS.FINANCES','Tableau de bord des finances',233,'/dashboards/finances'),
   (238,'Indicators report','TREE.INDICATORS_REPORT','Rapport sur les indicateurs',233,'/reports/indicators_report'),
   (239,'Visits Report','TREE.VISITS_REPORT','Visits registry',280,'/reports/visit_report'),
-  (240,'[Stock] Stock Entry Report','TREE.STOCK_ENTRY_REPORT','Stock Entry Report',282,'/reports/stock_entry'),
+  (240,'Stock Entry Report','TREE.STOCK_ENTRY_REPORT','Stock Entry Report',282,'/reports/stock_entry'),
   (241,'Entity Folder','ENTITY.MANAGEMENT','Entity Folder',0,'/ENTITY_FOLDER'),
   (242,'Entity Management','ENTITY.MANAGEMENT','',241,'/entities'),
   (243,'Entity Group','ENTITY.GROUP.TITLE','Entity Group',241,'/entity_group'),
@@ -149,7 +149,7 @@ INSERT INTO unit VALUES
   (265,'Purchase Order Analysis','TREE.PURCHASE_ORDER_ANALYSIS','Purchase order analysis',285,'/reports/purchase_order_analysis'),
   (266,'Inventory Changes Report','REPORT.INVENTORY_CHANGE.TITLE','Inventory Changes Report',287,'/reports/inventory_changes'),
   (267,'Monthly Consumption Report','TREE.MONTHLY_CONSUMPTION','Monthly consumption report',282,'/reports/monthly_consumption_report'),
-  (268,'[Stock] Consumption Graph','TREE.STOCK_CONSUMPTION_GRAPH_REPORT','Stock Consumption graph report',282,'/reports/stock_consumption_graph_report'),
+  (268,'Stock Consumption Graph','TREE.STOCK_CONSUMPTION_GRAPH_REPORT','Stock Consumption graph report',282,'/reports/stock_consumption_graph_report'),
   (269,'Inventory Adjustment','TREE.INVENTORY_ADJUSTMENT','Inventory Adjustment',160,'/stock/inventory-adjustment'),
   (270,'Compare Invoiced to Received','TREE.COMPARE_INVOICED_RECEIVED','Compare invoiced items to received stock',282,'/reports/invoiced_received_stock'),
   (271,'Recovery Capacity Report','TREE.RECOVERY_CAPACITY_REPORT','Recovery Capacity Report',281,'/reports/recovery_capacity'),
@@ -161,11 +161,11 @@ INSERT INTO unit VALUES
   (285,'Purchase Reports','TREE.REPORTS','reports for the purchasing modules',154,'/PURCHASE_FOLDER/reports'),
   (286,'Fee Center Reports','TREE.REPORTS','reports for the cost center modules',218,'/cost_center/reports'),
   (287,'Inventory Reports','TREE.REPORTS','reports for the inventory modules', 138,'/inventory/reports'),
-  (288, '[Stock] Movement Report','TREE.STOCK_MOVEMENT_REPORT','Stock Movement Report', 282,'/reports/stock_movement_report'),
-  (289, '[Stock] Expiration report','TREE.STOCK_EXPIRATION_REPORT','Stock expiration report', 282,'/reports/stock_expiration_report'),
+  (288, 'Stock Movement Report','TREE.STOCK_MOVEMENT_REPORT','Stock Movement Report', 282,'/reports/stock_movement_report'),
+  (289, 'Stock Expiration report','TREE.STOCK_EXPIRATION_REPORT','Stock expiration report', 282,'/reports/stock_expiration_report'),
   (290, '[SETTINGS] Settings', 'TREE.STOCK_SETTINGS', 'Stock Settings', 160, '/stock/setting'),
-  (291, '[Stock] Dashboard', 'TREE.STOCK_DASHBOARD','Stock Dashboard', 160,'/stock/dashboard'),
-  (292, '[Stock] Changes Report', 'REPORT.STOCK_CHANGES.TITLE', 'Stock Changes Report', 282, '/reports/stock_changes'),
+  (291, 'Stock Dashboard', 'TREE.STOCK_DASHBOARD','Stock Dashboard', 160,'/stock/dashboard'),
+  (292, 'Stock Changes Report', 'REPORT.STOCK_CHANGES.TITLE', 'Stock Changes Report', 282, '/reports/stock_changes'),
   (293, 'Aggregated consumption','TREE.AGGREGATED_STOCK_CONSUMPTION','Aggregated consumption', 160,'/stock/aggregated_consumption'),
   (294, 'Duplicate Lots','TREE.DUPLICATE_LOTS','The stock lots duplicates list', 160,'/stock/lots/duplicates'),
   (295, 'Rumer report','TREE.RUMER_REPORT','The rumer reports', 282,'/reports/rumer_report'),

server/models/migrations/next/migrate.sql

@@ -41,3 +41,13 @@ ALTER TABLE `exchange_rate` MODIFY `rate` DOUBLE NOT NULL;
 */
 INSERT IGNORE INTO `report` (`report_key`, `title_key`) VALUES
   ('realized_profit', 'REPORT.REALIZED_PROFIT.TITLE');
+
+UPDATE `unit` SET name = 'Stock Movement Report' WHERE name = '[Stock] Movement Report';
+UPDATE `unit` SET name = 'Stock Consumption Graph' WHERE name = '[Stock] Consumption Graph';
+UPDATE `unit` SET name = 'OHADA Bilan' WHERE name = '[OHADA] Bilan';
+UPDATE `unit` SET name = 'OHADA Compte de resultat' WHERE name = '[OHADA] Compte de resultat';
+UPDATE `unit` SET name = 'Stock Entry Report' WHERE name = '[Stock] Stock Entry Report';
+UPDATE `unit` SET name = 'Stock Consumption Graph' WHERE name = '[Stock] Consumption Graph';
+UPDATE `unit` SET name = 'Stock Expiration Report' WHERE name = '[Stock] Expiration report';
+UPDATE `unit` SET name = 'Stock Dashboard' WHERE name = '[Stock] Dashboard';
+UPDATE `unit` SET name = 'Stock Changes Report' WHERE name = '[Stock] Changes Report';