From 7a7d284c4bfe5f391719c0de552b38adadf2bf1b Mon Sep 17 00:00:00 2001
From: Craig Bezuidenhout <cbezuidenhout@tajemo.co.za>
Date: Thu, 21 Jun 2012 10:50:16 +0200
Subject: [PATCH] This helps in Cases where fees may not be required or as in
 our case, compatible.

It looks more proffesional to not have it than to say it does not work

Signed-off-by: Craig Bezuidenhout <cbezuidenhout@tajemo.co.za>

minor mods by brady:
fixed a merge conflict in left_nav.php
incremented version.php database parameter
minor mod to english constants to avoid creating two separate enlgish constants that are very similar
---
 interface/main/left_nav.php | 8 +++++++-
 library/globals.inc.php     | 8 ++++++++
 version.php                 | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php
index 9411efdb4..2d58bc00e 100644
--- a/interface/main/left_nav.php
+++ b/interface/main/left_nav.php
@@ -1053,12 +1053,15 @@ if ($GLOBALS['athletic_team']) {
       </li>
     </ul>
   </li>
+  <?php // TajEmo Work by CB 2012/06/21 10:41:15 AM hides fees if disabled in globals ?>
+  <?php if(!isset($GLOBALS['enable_fees_in_left_menu']) || $GLOBALS['enable_fees_in_left_menu'] == 1){ ?>
   <li><a class="collapsed" id="feeimg" ><span><?php xl('Fees','e') ?></span></a>
     <ul>
       <?php genMiscLink('RBot','cod','2',xl('Fee Sheet'),'patient_file/encounter/load_form.php?formname=fee_sheet'); ?>
       <?php genMiscLink('RBot','bil','1',xl('Checkout'),'patient_file/pos_checkout.php?framed=1'); ?>
     </ul>
-  </li>
+  </li> 
+  <?php } ?>
   <?php if ($GLOBALS['inhouse_pharmacy'] && acl_check('admin', 'drugs')) genMiscLink('RTop','adm','0',xl('Inventory'),'drugs/drug_inventory.php'); ?>
   <li><a class="collapsed" id="admimg" ><span><?php xl('Administration','e') ?></span></a>
     <ul>
@@ -1160,6 +1163,8 @@ if (!empty($reg)) {
 
     </ul>
   </li>
+  <?php // TajEmo Work by CB 2012/06/21 10:41:15 AM hides fees if disabled in globals ?>
+  <?php if(!isset($GLOBALS['enable_fees_in_left_menu']) || $GLOBALS['enable_fees_in_left_menu'] == 1){ ?>
   <li><a class="collapsed" id="feeimg" ><span><?php xl('Fees','e') ?></span></a>
     <ul>
       <?php genMiscLink('RBot','cod','2',xl('Fee Sheet'),'patient_file/encounter/load_form.php?formname=fee_sheet'); ?>
@@ -1169,6 +1174,7 @@ if (!empty($reg)) {
 	  <?php genTreeLink('RTop','npa',xl('Payments'),false,2);?>
     </ul>
   </li>
+  <?php } ?>
   <?php // if ($GLOBALS['inhouse_pharmacy'] && acl_check('admin', 'drugs')) genMiscLink('RTop','adm','0',xl('Inventory'),'drugs/drug_inventory.php'); ?>
 <?php if ($GLOBALS['inhouse_pharmacy'] && acl_check('admin', 'drugs')) { ?>
   <li><a class="collapsed" id="invimg" ><span><?php xl('Inventory','e') ?></span></a>
diff --git a/library/globals.inc.php b/library/globals.inc.php
index 3f4f0a4a2..a151c1403 100644
--- a/library/globals.inc.php
+++ b/library/globals.inc.php
@@ -206,6 +206,14 @@ $GLOBALS_METADATA = array(
       xl('Enables the old Charges panel for entering billing codes and payments. Not recommended, use the Fee Sheet instead.')
     ),
 
+    // TajEmo Work BY CB 2012/06/21 10:42:31 AM added option to Hide Fees
+    'enable_fees_in_left_menu' => array(
+      xl('Enable Fees In Left Menu'),
+      'bool',                           // data type
+      '1',                              // default = true
+      xl('Enable Fees In Left Menu')
+    ),
+
     'online_support_link' => array(
       xl('Online Support Link'),
       'text',                           // data type
diff --git a/version.php b/version.php
index e9286e355..c56b8116b 100644
--- a/version.php
+++ b/version.php
@@ -17,5 +17,5 @@ $v_realpatch = '0';
 // is a database change in the course of development.  It is used
 // internally to determine when a database upgrade is needed.
 //
-$v_database = 72;
+$v_database = 73;
 ?>
-- 
2.11.4.GIT