Fixed issue that caused duplicate company creation, also made email field in company profile a required field. All other changes are only random variable name and date changes (due to automation)

README.md

@@ -1,4 +1,4 @@
-# Cost Benefit Projection (3.3.5)
+# Cost Benefit Projection (3.3.6)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -23,11 +23,11 @@ max_input_vars = 5000
 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
 + *Last Build*: 22nd February, 2016
-+ *Version*: 3.3.5
++ *Version*: 3.3.6
 + *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*: **83618**
-+ *File count*: **551**
++ *Line count*: **83710**
++ *File count*: **552**
 + *Folder count*: **101**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).

admin/assets/css/admin.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/causerisk.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/causesrisks.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/combinedresults.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/companies.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/company.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/companyresults.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/countries.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/country.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/currencies.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/currency.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/dashboard.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/health_data.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/health_data_sets.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/help_document.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/help_documents.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/intervention.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/interventions.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/scaling_factor.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/scaling_factors.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/service_provider.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/assets/css/service_providers.css

@@ -2,7 +2,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controller.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/ajax.json.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/causerisk.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/causesrisks.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/combinedresults.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/companies.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/company.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -332,12 +332,34 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 		if ($validData['id']  >=  0)
 		{
 			// if id is 0 get id
-			if (0 == $validData['id'])
+			if (0 >=  (int) $validData['id'])
 			{
-				$validData['id'] = CostbenefitprojectionHelper::getVar('company', $validData['email'], 'email', 'id');
+				// Get a db connection.
+				$db = JFactory::getDbo();
+				// Create a new query object.
+				$query = $db->getQuery(true);
+				// Select id of this company
+				$query->select($db->quoteName(array('id')));
+				$query->from($db->quoteName('#__costbenefitprojection_company'));
+				$query->where($db->quoteName('name') . ' = '. $db->quote($validData['name']));
+				$query->where($db->quoteName('email') . ' = '. $db->quote($validData['email']));
+				$query->where($db->quoteName('country') . ' = '. (int) $validData['country']);
+				$query->where($db->quoteName('service_provider') . ' = '. (int) $validData['service_provider']);
+				$query->where($db->quoteName('created_by') . ' = '. (int) $validData['created_by']);
+				$query->where($db->quoteName('created') . ' = '. $db->quote($validData['created']));
+				$db->setQuery($query);
+				$db->execute();
+				if ($db->getNumRows())
+				{
+					$validData['id'] = $db->loadResult();
+				}
+				else
+				{
+					return;
+				}
 			}
 			// user setup if not set
-			if (0  >=  (int) $validData['user'])
+			if (0  >=  (int) $validData['user'] && (int) $validData['id'] > 0)
 			{
 				// get user object
 				$user = JFactory::getUser();
@@ -367,172 +389,175 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
 					}
 				}
 			}
-			
-			// get params
-			$params	= JComponentHelper::getParams('com_costbenefitprojection');
-			// get all this users companies
-			$hisCompanies = CostbenefitprojectionHelper::hisCompanies($validData['user']);
-			if (CostbenefitprojectionHelper::checkArray($hisCompanies))
+			// only continue if we have a company id
+			if ((int) $validData['id'] > 0)
 			{
-				// set the user group based on the overall status of its companies
-				$departments = CostbenefitprojectionHelper::getVars('company', $hisCompanies, 'id', 'department');
-				if (in_array(2, $departments))
+				// get params
+				$params	= JComponentHelper::getParams('com_costbenefitprojection');
+				// get all this users companies
+				$hisCompanies = CostbenefitprojectionHelper::hisCompanies($validData['user']);
+				if (CostbenefitprojectionHelper::checkArray($hisCompanies))
 				{
-					$memberGroups = $params->get('advancedmembergroup');
-				}
-				else
-				{
-					$memberGroups = $params->get('memberbasicgroup');
-				}
-			}
-			else
-			{
-				// first company so act simply on this company department status
-				if (2 == $validData['department'])
-				{
-					$memberGroups = $params->get('advancedmembergroup');
-				}
-				else
-				{
-					$memberGroups =  $params->get('memberbasicgroup');
-				}
-			}
-			// update the user groups
-			JUserHelper::setUserGroups((int)$validData['user'],(array)$memberGroups);
-
-			// Get a db connection.
-			$db = JFactory::getDbo();
-			// Create a new query object.
-			$query = $db->getQuery(true);
-			// Select all records in scaling factors the belong to this company
-			$query->select($db->quoteName(array('id','causerisk','published')));
-			$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
-			$query->where($db->quoteName('company') . ' = '. (int) $validData['id']);
-			$db->setQuery($query);
-			$db->execute();
-			if ($db->getNumRows())
-			{
-				// load the scaling factors already set
-				$already = $db->loadObjectList();
-				$publish = array();
-				$archive = array();
-				$bucket = array();
-				foreach ($already as $scale)
-				{
-					if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
+					// set the user group based on the overall status of its companies
+					$departments = CostbenefitprojectionHelper::getVars('company', $hisCompanies, 'id', 'department');
+					if (in_array(2, $departments))
 					{
-						if (in_array($scale->causerisk, $validData['causesrisks']) && $scale->published != 1)
+						$memberGroups = $params->get('advancedmembergroup');
+					}
+					else
+					{
+						$memberGroups = $params->get('memberbasicgroup');
+					}
+				}
+				else
+				{
+					// first company so act simply on this company department status
+					if (2 == $validData['department'])
+					{
+						$memberGroups = $params->get('advancedmembergroup');
+					}
+					else
+					{
+						$memberGroups =  $params->get('memberbasicgroup');
+					}
+				}
+				// update the user groups
+				JUserHelper::setUserGroups((int)$validData['user'],(array)$memberGroups);
+
+				// Get a db connection.
+				$db = JFactory::getDbo();
+				// Create a new query object.
+				$query = $db->getQuery(true);
+				// Select all records in scaling factors the belong to this company
+				$query->select($db->quoteName(array('id','causerisk','published')));
+				$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
+				$query->where($db->quoteName('company') . ' = '. (int) $validData['id']);
+				$db->setQuery($query);
+				$db->execute();
+				if ($db->getNumRows())
+				{
+					// load the scaling factors already set
+					$already = $db->loadObjectList();
+					$publish = array();
+					$archive = array();
+					$bucket = array();
+					foreach ($already as $scale)
+					{
+						if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
 						{
-							// publish the scaling factor (update)
-							$publish[$scale->id] = $scale->id;
+							if (in_array($scale->causerisk, $validData['causesrisks']) && $scale->published != 1)
+							{
+								// publish the scaling factor (update)
+								$publish[$scale->id] = $scale->id;
+							}
+							elseif (!in_array($scale->causerisk, $validData['causesrisks']))
+							{
+								// archive the scaling factor (update)
+								$archive[$scale->id] = $scale->id;
+							}
+							$bucket[] = $scale->causerisk;
 						}
-						elseif (!in_array($scale->causerisk, $validData['causesrisks']))
+						else
 						{
 							// archive the scaling factor (update)
 							$archive[$scale->id] = $scale->id;
 						}
-						$bucket[] = $scale->causerisk;
+					}
+					// update the needed records
+					$types = array('publish' => 1,'archive' => 2);
+					foreach ($types as $type => $int)
+					{
+						if (CostbenefitprojectionHelper::checkArray(${$type}))
+						{
+							foreach (${$type} as $id)
+							{
+								$query = $db->getQuery(true);
+								// Fields to update.
+								$fields = array(
+									$db->quoteName('published') . ' = ' . (int) $int
+								);
+								// Conditions for which records should be updated.
+								$conditions = array(
+									$db->quoteName('id') . ' = ' . (int) $id
+								);
+
+								$query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions);
+								$db->setQuery($query);
+								$db->execute();
+							}
+						}
+					}
+				}
+				if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
+				{
+					// remove those already set from the saved list of causesrisks
+					if (CostbenefitprojectionHelper::checkArray($bucket))
+					{
+						$insert = array();
+						foreach ($validData['causesrisks'] as $causerisk)
+						{
+							if (!in_array($causerisk,$bucket))
+							{
+								$insert[] = $causerisk;
+							}
+						}
 					}
 					else
 					{
-						// archive the scaling factor (update)
-						$archive[$scale->id] = $scale->id;
+						$insert = $validData['causesrisks'];
 					}
 				}
-				// update the needed records
-				$types = array('publish' => 1,'archive' => 2);
-				foreach ($types as $type => $int)
+				// insert the new records
+				if (CostbenefitprojectionHelper::checkArray($insert))
 				{
-					if (CostbenefitprojectionHelper::checkArray(${$type}))
-					{
-						foreach (${$type} as $id)
-						{
-							$query = $db->getQuery(true);
-							// Fields to update.
-							$fields = array(
-								$db->quoteName('published') . ' = ' . (int) $int
-							);
-							// Conditions for which records should be updated.
-							$conditions = array(
-								$db->quoteName('id') . ' = ' . (int) $id
-							);
+					$created	= $db->quote(JFactory::getDate()->toSql());
+					$created_by	= JFactory::getUser()->get('id');
+					$company	= $validData['id'];
 
-							$query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions);
+					// Create a new query object.
+					$query = $db->getQuery(true);
+					// Insert columns.
+					$columns = array(
+						'causerisk', 'company', 'mortality_scaling_factor_females', 
+						'mortality_scaling_factor_males', 'presenteeism_scaling_factor_females', 
+						'presenteeism_scaling_factor_males', 'yld_scaling_factor_females', 
+						'yld_scaling_factor_males', 'published', 
+						'created_by', 'created');
+					// setup the values
+					$values = array();
+					foreach ($insert as $new)
+					{
+						$array = array($new,$company,1,1,1,1,1,1,1,$created_by,$created);
+						$values[] = implode(',',$array);
+					}
+					// Prepare the insert query.
+					$query
+						->insert($db->quoteName('#__costbenefitprojection_scaling_factor'))
+						->columns($db->quoteName($columns))
+						->values(implode('), (', $values));
+
+					// Set the query using our newly populated query object and execute it.
+					$db->setQuery($query);
+					$done = $db->execute();
+					if ($done)
+					{
+						// we must set the assets
+						foreach ($insert as $causerisk)
+						{
+							// get all the ids. Create a new query object.
+							$query = $db->getQuery(true);
+							$query->select($db->quoteName(array('id')));
+							$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
+							$query->where($db->quoteName('causerisk') . ' = '. (int) $causerisk);
+							$query->where($db->quoteName('company') . ' = '. (int) $company);
 							$db->setQuery($query);
 							$db->execute();
-						}
-					}
-				}
-			}
-			if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
-			{
-				// remove those already set from the saved list of causesrisks
-				if (CostbenefitprojectionHelper::checkArray($bucket))
-				{
-					$insert = array();
-					foreach ($validData['causesrisks'] as $causerisk)
-					{
-						if (!in_array($causerisk,$bucket))
-						{
-							$insert[] = $causerisk;
-						}
-					}
-				}
-				else
-				{
-					$insert = $validData['causesrisks'];
-				}
-			}
-			// insert the new records
-			if (CostbenefitprojectionHelper::checkArray($insert))
-			{
-				$created	= $db->quote(JFactory::getDate()->toSql());
-				$created_by	= JFactory::getUser()->get('id');
-				$company	= $validData['id'];
-				
-				// Create a new query object.
-				$query = $db->getQuery(true);
-				// Insert columns.
-				$columns = array(
-					'causerisk', 'company', 'mortality_scaling_factor_females', 
-					'mortality_scaling_factor_males', 'presenteeism_scaling_factor_females', 
-					'presenteeism_scaling_factor_males', 'yld_scaling_factor_females', 
-					'yld_scaling_factor_males', 'published', 
-					'created_by', 'created');
-				// setup the values
-				$values = array();
-				foreach ($insert as $new)
-				{
-					$array = array($new,$company,1,1,1,1,1,1,1,$created_by,$created);
-					$values[] = implode(',',$array);
-				}
-				// Prepare the insert query.
-				$query
-					->insert($db->quoteName('#__costbenefitprojection_scaling_factor'))
-					->columns($db->quoteName($columns))
-					->values(implode('), (', $values));
-				 
-				// Set the query using our newly populated query object and execute it.
-				$db->setQuery($query);
-				$done = $db->execute();
-				if ($done)
-				{
-					// we must set the assets
-					foreach ($insert as $causerisk)
-					{
-						// get all the ids. Create a new query object.
-						$query = $db->getQuery(true);
-						$query->select($db->quoteName(array('id')));
-						$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
-						$query->where($db->quoteName('causerisk') . ' = '. (int) $causerisk);
-						$query->where($db->quoteName('company') . ' = '. (int) $company);
-						$db->setQuery($query);
-						$db->execute();
-						if ($db->getNumRows())
-						{
-							$aId = $db->loadResult();
-							// make sure the access of asset is set
-							CostbenefitprojectionHelper::setAsset($aId,'scaling_factor');
+							if ($db->getNumRows())
+							{
+								$aId = $db->loadResult();
+								// make sure the access of asset is set
+								CostbenefitprojectionHelper::setAsset($aId,'scaling_factor');
+							}
 						}
 					}
 				}

admin/controllers/companyresults.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/costbenefitprojection.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/countries.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/country.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/currencies.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/currency.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/health_data.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/health_data_sets.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/help.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/help_document.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/help_documents.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/import.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/intervention.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/interventions.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/scaling_factor.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/scaling_factors.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/controllers/service_provider.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -324,6 +324,30 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
 	{
 		if ($validData['id'] >= 0)
 		{
+			// if id is 0 get id
+			if (0 >=  (int) $validData['id'])
+			{
+				// Get a db connection.
+				$db = JFactory::getDbo();
+				// Create a new query object.
+				$query = $db->getQuery(true);
+				// Select id of this service_provider
+				$query->select($db->quoteName(array('id')));
+				$query->from($db->quoteName('#__costbenefitprojection_service_provider'));
+				$query->where($db->quoteName('country') . ' = '. (int) $validData['country']);
+				$query->where($db->quoteName('created_by') . ' = '.  (int) $validData['created_by']);
+				$query->where($db->quoteName('created') . ' = '. $db->quote($validData['created']));
+				$db->setQuery($query);
+				$db->execute();
+				if ($db->getNumRows())
+				{
+					$validData['id'] = $db->loadResult();
+				}
+				else
+				{
+					return;
+				}
+			}
 			// user setup if not set
 			if (0 >= (int) $validData['user'])
 			{

admin/controllers/service_providers.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/costbenefitprojection.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/helpers/costbenefitprojection.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/helpers/html/batch_.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/helpers/sum.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/helpers/sumcombine.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/batchselection.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/causerisk/details_above.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/causerisk/details_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/causerisk/publishing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/causerisk/publlshing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/age_groups_percentages_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/age_groups_percentages_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/age_groups_percentages_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/causerisk_selection_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/details_above.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/details_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/details_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/details_under.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/interventions_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->tbginterventions;
+$items	= $displayData->oabinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";

admin/layouts/company/publishing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/publlshing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/company/scaling_factors_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->eoascaling_factors;
+$items	= $displayData->tmyscaling_factors;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit";

admin/layouts/country/age_groups_percentages_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/age_groups_percentages_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/causerisk_selection_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/companies_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->oyfcompanies;
+$items	= $displayData->vmqcompanies;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";

admin/layouts/country/details_above.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/details_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/details_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/health_data_totals_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/health_data_totals_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/interventions_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->geointerventions;
+$items	= $displayData->jirinterventions;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";

admin/layouts/country/public_details_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/publishing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/publlshing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/country/service_providers_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
@@ -22,7 +22,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->kweservice_providers;
+$items	= $displayData->oehservice_providers;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit";

admin/layouts/currency/details_above.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/currency/details_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/currency/details_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/currency/publishing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/currency/publlshing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/databreakdownmalefemale.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/health_data/details_above.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/health_data/details_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/health_data/details_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/health_data/details_rightside.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/health_data/publishing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/health_data/publlshing.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/help_document/details_above.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/help_document/details_fullwidth.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/help_document/details_left.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection

admin/layouts/help_document/details_right.php

@@ -3,7 +3,7 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		3.3.5
+	@version		3.3.6
 	@build			22nd February, 2016
 	@created		15th June, 2012
 	@package		Cost Benefit Projection