resolves #9 updated the sum to make use of consistent calculation in operator precedence.

2016-05-02 15:29:04 +01:00 · 2016-05-02 15:29:04 +01:00 · 434762da52
parent ef2a4506a0
commit 434762da52
413 changed files with 531 additions and 433 deletions
--- a/README.md
+++ b/README.md
@ -22,11 +22,11 @@ max_input_vars = 5000
 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io)
 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
-+ *Last Build*: 9th April, 2016
+ *Last Build*: 2nd May, 2016
 + *Version*: 3.3.11
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **84042**
+ *Line count*: **84140**
 + *File count*: **559**
 + *Folder count*: **101**

--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		admin.css
--- a/admin/assets/css/causerisk.css
+++ b/admin/assets/css/causerisk.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.css
--- a/admin/assets/css/causesrisks.css
+++ b/admin/assets/css/causesrisks.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.css
--- a/admin/assets/css/combinedresults.css
+++ b/admin/assets/css/combinedresults.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.css
--- a/admin/assets/css/companies.css
+++ b/admin/assets/css/companies.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.css
--- a/admin/assets/css/company.css
+++ b/admin/assets/css/company.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.css
--- a/admin/assets/css/companyresults.css
+++ b/admin/assets/css/companyresults.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.css
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.css
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.css
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.css
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.css
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		dashboard.css
--- a/admin/assets/css/health_data.css
+++ b/admin/assets/css/health_data.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.css
--- a/admin/assets/css/health_data_sets.css
+++ b/admin/assets/css/health_data_sets.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.css
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.css
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.css
--- a/admin/assets/css/intervention.css
+++ b/admin/assets/css/intervention.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.css
--- a/admin/assets/css/interventions.css
+++ b/admin/assets/css/interventions.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.css
--- a/admin/assets/css/scaling_factor.css
+++ b/admin/assets/css/scaling_factor.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.css
--- a/admin/assets/css/scaling_factors.css
+++ b/admin/assets/css/scaling_factors.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.css
--- a/admin/assets/css/service_provider.css
+++ b/admin/assets/css/service_provider.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.css
--- a/admin/assets/css/service_providers.css
+++ b/admin/assets/css/service_providers.css
@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.css
--- a/admin/controller.php
+++ b/admin/controller.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		controller.php
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.json.php
--- a/admin/controllers/causerisk.php
+++ b/admin/controllers/causerisk.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php
--- a/admin/controllers/causesrisks.php
+++ b/admin/controllers/causesrisks.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
--- a/admin/controllers/combinedresults.php
+++ b/admin/controllers/combinedresults.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php
--- a/admin/controllers/companies.php
+++ b/admin/controllers/companies.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.php
--- a/admin/controllers/company.php
+++ b/admin/controllers/company.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php
--- a/admin/controllers/companyresults.php
+++ b/admin/controllers/companyresults.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php
--- a/admin/controllers/costbenefitprojection.php
+++ b/admin/controllers/costbenefitprojection.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
--- a/admin/controllers/countries.php
+++ b/admin/controllers/countries.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
--- a/admin/controllers/country.php
+++ b/admin/controllers/country.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php
--- a/admin/controllers/currencies.php
+++ b/admin/controllers/currencies.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php
--- a/admin/controllers/currency.php
+++ b/admin/controllers/currency.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php
--- a/admin/controllers/health_data.php
+++ b/admin/controllers/health_data.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php
--- a/admin/controllers/health_data_sets.php
+++ b/admin/controllers/health_data_sets.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help.php
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.php
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import.php
--- a/admin/controllers/intervention.php
+++ b/admin/controllers/intervention.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php
--- a/admin/controllers/interventions.php
+++ b/admin/controllers/interventions.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
--- a/admin/controllers/scaling_factor.php
+++ b/admin/controllers/scaling_factor.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php
--- a/admin/controllers/scaling_factors.php
+++ b/admin/controllers/scaling_factors.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.php
--- a/admin/controllers/service_provider.php
+++ b/admin/controllers/service_provider.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php
--- a/admin/controllers/service_providers.php
+++ b/admin/controllers/service_providers.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.php
--- a/admin/costbenefitprojection.php
+++ b/admin/costbenefitprojection.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@ -37,7 +37,7 @@ $document->addStyleSheet('components/com_costbenefitprojection/assets/css/admin.
 $document->addScript('components/com_costbenefitprojection/assets/js/admin.js');

 // require helper files
-JLoader::register('CostbenefitprojectionHelper', dirname(__FILE__) . '/helpers/costbenefitprojection.php');
+JLoader::register('CostbenefitprojectionHelper', dirname(__FILE__) . '/helpers/costbenefitprojection.php'); 
 JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 

 // import joomla controller library
--- a/admin/helpers/chartbuilder.php
+++ b/admin/helpers/chartbuilder.php
@ -7,8 +7,8 @@
 *
 **/

-// No direct access.
-defined('_JEXEC') or die;
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');

 class Chartbuilder
 {
--- a/admin/helpers/costbenefitprojection.php
+++ b/admin/helpers/costbenefitprojection.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@ -945,6 +945,55 @@ abstract class CostbenefitprojectionHelper
 			$db->query();
 		}
 		return $was;
+	}
+
+	/**
+	* Update user values
+	*/
+	public static function updateUser($new)
+	{
+		// load the user component language files if there is an error.
+		$lang = JFactory::getLanguage();
+		$extension = 'com_users';
+		$base_dir = JPATH_ADMINISTRATOR;
+		$language_tag = 'en-GB';
+		$reload = true;
+		$lang->load($extension, $base_dir, $language_tag, $reload);
+		// load the user model
+		$model = self::getModel('user', JPATH_ADMINISTRATOR . '/components/com_users', 'Users');
+		// Check if password was set
+		if (isset($new['password']) && isset($new['password2']) && self::checkString($new['password']) && self::checkString($new['password2']))
+		{
+			// Use the users passwords
+			$password = $new['password'];
+			$password2 = $new['password2'];
+		}
+		// set username
+		if (isset($new['username']) && self::checkString($new['username']))
+		{
+			$new['username'] = self::safeString($new['username']);
+		}
+		else
+		{
+			$new['username'] = self::safeString($new['name']);			
+		}
+		// linup update user data
+		$data = array(
+			'id' => $new['id'],
+			'username' => $new['username'],
+			'name' => $new['name'],
+			'email' => $new['email'],
+			'password1' => $password, // First password field
+			'password2' => $password2, // Confirm password field
+			'block' => 0 );
+		// register the new user
+		$done = $model->save($data);
+		// if user is updated
+		if ($done)
+		{
+			return $new['id'];
+		}
+		return $model->getError();
 	} 

 	/**
@ -1967,7 +2016,7 @@ abstract class CostbenefitprojectionHelper
 					$w .= ' ';
 					if($r < 100)
 					{
-						$word .= 'and ';
+						$w .= 'and ';
 					}
 					$w .= self::numberToString($r);
 				}
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batch_.php
--- a/admin/helpers/sum.php
+++ b/admin/helpers/sum.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sum.php
@ -1042,8 +1042,8 @@ class Sum
 							// unscaled ///////////////
 							// set each gender and age group morbidity_unscaled
 							$this->items[$id]->$gender->$age->cost_morbidity_unscaled 	= $this->items[$id]->$gender->$age->morbidity_unscaled
-															* (( $this->company->total_salary / ($this->company->males + $this->company->females) 
-															/ $this->company->working_days )
+															* ( $this->company->total_salary / (( $this->company->males + $this->company->females) 
+															* $this->company->working_days))
 															+ $this->company->total_healthcare / $this->totals['total_morbidity_unscaled']);
 							// set total each cause/risk cost_morbidity_unscaled
 							if(!isset($this->items[$id]->subtotal_cost_morbidity_unscaled))
--- a/admin/helpers/sumcombine.php
+++ b/admin/helpers/sumcombine.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sumcombine.php
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batchselection.php
--- a/admin/layouts/causerisk/details_above.php
+++ b/admin/layouts/causerisk/details_above.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
--- a/admin/layouts/causerisk/details_left.php
+++ b/admin/layouts/causerisk/details_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
--- a/admin/layouts/causerisk/publishing.php
+++ b/admin/layouts/causerisk/publishing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
--- a/admin/layouts/causerisk/publlshing.php
+++ b/admin/layouts/causerisk/publlshing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
--- a/admin/layouts/company/age_groups_percentages_fullwidth.php
+++ b/admin/layouts/company/age_groups_percentages_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_fullwidth.php
--- a/admin/layouts/company/age_groups_percentages_left.php
+++ b/admin/layouts/company/age_groups_percentages_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
--- a/admin/layouts/company/age_groups_percentages_right.php
+++ b/admin/layouts/company/age_groups_percentages_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
--- a/admin/layouts/company/causerisk_selection_fullwidth.php
+++ b/admin/layouts/company/causerisk_selection_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
--- a/admin/layouts/company/details_above.php
+++ b/admin/layouts/company/details_above.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
--- a/admin/layouts/company/details_left.php
+++ b/admin/layouts/company/details_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
--- a/admin/layouts/company/details_right.php
+++ b/admin/layouts/company/details_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
--- a/admin/layouts/company/details_under.php
+++ b/admin/layouts/company/details_under.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php
--- a/admin/layouts/company/interventions_fullwidth.php
+++ b/admin/layouts/company/interventions_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
--- a/admin/layouts/company/publishing.php
+++ b/admin/layouts/company/publishing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
--- a/admin/layouts/company/publlshing.php
+++ b/admin/layouts/company/publlshing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
--- a/admin/layouts/company/scaling_factors_fullwidth.php
+++ b/admin/layouts/company/scaling_factors_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors_fullwidth.php
--- a/admin/layouts/country/age_groups_percentages_left.php
+++ b/admin/layouts/country/age_groups_percentages_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php
--- a/admin/layouts/country/age_groups_percentages_right.php
+++ b/admin/layouts/country/age_groups_percentages_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php
--- a/admin/layouts/country/causerisk_selection_fullwidth.php
+++ b/admin/layouts/country/causerisk_selection_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php
--- a/admin/layouts/country/companies_fullwidth.php
+++ b/admin/layouts/country/companies_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies_fullwidth.php
--- a/admin/layouts/country/details_above.php
+++ b/admin/layouts/country/details_above.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
--- a/admin/layouts/country/details_left.php
+++ b/admin/layouts/country/details_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
--- a/admin/layouts/country/details_right.php
+++ b/admin/layouts/country/details_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
--- a/admin/layouts/country/health_data_totals_left.php
+++ b/admin/layouts/country/health_data_totals_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_left.php
--- a/admin/layouts/country/health_data_totals_right.php
+++ b/admin/layouts/country/health_data_totals_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_right.php
--- a/admin/layouts/country/interventions_fullwidth.php
+++ b/admin/layouts/country/interventions_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
--- a/admin/layouts/country/public_details_fullwidth.php
+++ b/admin/layouts/country/public_details_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		public_details_fullwidth.php
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
--- a/admin/layouts/country/publlshing.php
+++ b/admin/layouts/country/publlshing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
--- a/admin/layouts/country/service_providers_fullwidth.php
+++ b/admin/layouts/country/service_providers_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers_fullwidth.php
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
--- a/admin/layouts/currency/publlshing.php
+++ b/admin/layouts/currency/publlshing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
--- a/admin/layouts/databreakdownmalefemale.php
+++ b/admin/layouts/databreakdownmalefemale.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		databreakdownmalefemale.php
--- a/admin/layouts/health_data/details_above.php
+++ b/admin/layouts/health_data/details_above.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
--- a/admin/layouts/health_data/details_left.php
+++ b/admin/layouts/health_data/details_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
--- a/admin/layouts/health_data/details_right.php
+++ b/admin/layouts/health_data/details_right.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php
--- a/admin/layouts/health_data/details_rightside.php
+++ b/admin/layouts/health_data/details_rightside.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_rightside.php
--- a/admin/layouts/health_data/publishing.php
+++ b/admin/layouts/health_data/publishing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
--- a/admin/layouts/health_data/publlshing.php
+++ b/admin/layouts/health_data/publlshing.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/

 	@version		3.3.11
-	@build			9th April, 2016
+	@build			2nd May, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php
--- a/Show More
+++ b/Show More