From 8dbf6f673de8f9fa3149f3966b908b6ba19cce41 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 22 Feb 2016 10:17:04 +0200 Subject: [PATCH] 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 | 10 +- admin/assets/css/admin.css | 4 +- admin/assets/css/causerisk.css | 4 +- admin/assets/css/causesrisks.css | 4 +- admin/assets/css/combinedresults.css | 4 +- admin/assets/css/companies.css | 4 +- admin/assets/css/company.css | 4 +- admin/assets/css/companyresults.css | 4 +- admin/assets/css/countries.css | 4 +- admin/assets/css/country.css | 4 +- admin/assets/css/currencies.css | 4 +- admin/assets/css/currency.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/health_data.css | 4 +- admin/assets/css/health_data_sets.css | 4 +- admin/assets/css/help_document.css | 4 +- admin/assets/css/help_documents.css | 4 +- admin/assets/css/intervention.css | 4 +- admin/assets/css/interventions.css | 4 +- admin/assets/css/scaling_factor.css | 4 +- admin/assets/css/scaling_factors.css | 4 +- admin/assets/css/service_provider.css | 4 +- admin/assets/css/service_providers.css | 4 +- admin/controller.php | 4 +- admin/controllers/ajax.json.php | 4 +- admin/controllers/causerisk.php | 4 +- admin/controllers/causesrisks.php | 4 +- admin/controllers/combinedresults.php | 4 +- admin/controllers/companies.php | 4 +- admin/controllers/company.php | 9 +- admin/controllers/companyresults.php | 4 +- admin/controllers/costbenefitprojection.php | 4 +- admin/controllers/countries.php | 4 +- admin/controllers/country.php | 4 +- admin/controllers/currencies.php | 4 +- admin/controllers/currency.php | 4 +- admin/controllers/health_data.php | 4 +- admin/controllers/health_data_sets.php | 4 +- admin/controllers/help.php | 4 +- admin/controllers/help_document.php | 4 +- admin/controllers/help_documents.php | 4 +- admin/controllers/import.php | 4 +- admin/controllers/intervention.php | 4 +- admin/controllers/interventions.php | 4 +- admin/controllers/scaling_factor.php | 4 +- admin/controllers/scaling_factors.php | 4 +- admin/controllers/service_provider.php | 4 +- admin/controllers/service_providers.php | 4 +- admin/costbenefitprojection.php | 4 +- admin/helpers/costbenefitprojection.php | 4 +- admin/helpers/html/batch_.php | 4 +- admin/helpers/sum.php | 4 +- admin/helpers/sumcombine.php | 4 +- admin/layouts/batchselection.php | 4 +- admin/layouts/causerisk/details_above.php | 4 +- admin/layouts/causerisk/details_left.php | 4 +- admin/layouts/causerisk/publishing.php | 4 +- admin/layouts/causerisk/publlshing.php | 4 +- .../age_groups_percentages_fullwidth.php | 4 +- .../company/age_groups_percentages_left.php | 4 +- .../company/age_groups_percentages_right.php | 4 +- .../company/causerisk_selection_fullwidth.php | 4 +- admin/layouts/company/details_above.php | 4 +- admin/layouts/company/details_left.php | 4 +- admin/layouts/company/details_right.php | 4 +- admin/layouts/company/details_under.php | 4 +- .../company/interventions_fullwidth.php | 6 +- admin/layouts/company/publishing.php | 4 +- admin/layouts/company/publlshing.php | 4 +- .../company/scaling_factors_fullwidth.php | 6 +- .../country/age_groups_percentages_left.php | 4 +- .../country/age_groups_percentages_right.php | 4 +- .../country/causerisk_selection_fullwidth.php | 4 +- admin/layouts/country/companies_fullwidth.php | 6 +- admin/layouts/country/details_above.php | 4 +- admin/layouts/country/details_left.php | 4 +- admin/layouts/country/details_right.php | 4 +- .../country/health_data_totals_left.php | 4 +- .../country/health_data_totals_right.php | 4 +- .../country/interventions_fullwidth.php | 6 +- .../country/public_details_fullwidth.php | 4 +- admin/layouts/country/publishing.php | 4 +- admin/layouts/country/publlshing.php | 4 +- .../country/service_providers_fullwidth.php | 6 +- admin/layouts/currency/details_above.php | 4 +- admin/layouts/currency/details_left.php | 4 +- admin/layouts/currency/details_right.php | 4 +- admin/layouts/currency/publishing.php | 4 +- admin/layouts/currency/publlshing.php | 4 +- admin/layouts/databreakdownmalefemale.php | 4 +- admin/layouts/health_data/details_above.php | 4 +- admin/layouts/health_data/details_left.php | 4 +- admin/layouts/health_data/details_right.php | 4 +- .../layouts/health_data/details_rightside.php | 4 +- admin/layouts/health_data/publishing.php | 4 +- admin/layouts/health_data/publlshing.php | 4 +- admin/layouts/help_document/details_above.php | 4 +- .../help_document/details_fullwidth.php | 4 +- admin/layouts/help_document/details_left.php | 4 +- admin/layouts/help_document/details_right.php | 4 +- admin/layouts/help_document/details_under.php | 4 +- admin/layouts/help_document/publishing.php | 4 +- admin/layouts/help_document/publlshing.php | 4 +- admin/layouts/intervention/details_above.php | 4 +- .../intervention/details_fullwidth.php | 4 +- admin/layouts/intervention/details_under.php | 4 +- admin/layouts/intervention/publishing.php | 4 +- admin/layouts/intervention/publlshing.php | 4 +- .../intervention/settings_fullwidth.php | 4 +- admin/layouts/intervention/settings_left.php | 4 +- .../layouts/scaling_factor/details_above.php | 4 +- admin/layouts/scaling_factor/details_left.php | 4 +- .../layouts/scaling_factor/details_right.php | 4 +- admin/layouts/scaling_factor/publishing.php | 4 +- admin/layouts/scaling_factor/publlshing.php | 4 +- .../service_provider/companies_fullwidth.php | 6 +- .../service_provider/details_above.php | 4 +- .../service_provider/details_fullwidth.php | 4 +- admin/layouts/service_provider/publishing.php | 4 +- admin/layouts/service_provider/publlshing.php | 4 +- admin/models/ajax.php | 4 +- admin/models/causerisk.php | 4 +- admin/models/causesrisks.php | 4 +- admin/models/combinedresults.php | 4 +- admin/models/companies.php | 4 +- admin/models/company.php | 40 ++--- admin/models/companyresults.php | 4 +- admin/models/costbenefitprojection.php | 4 +- admin/models/countries.php | 4 +- admin/models/country.php | 62 +++---- admin/models/currencies.php | 4 +- admin/models/currency.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/causesrisks.php | 4 +- admin/models/fields/causesriskscheck.php | 4 +- admin/models/fields/company.php | 4 +- admin/models/fields/countries.php | 4 +- admin/models/fields/countryuser.php | 4 +- admin/models/fields/currency.php | 4 +- admin/models/fields/datayear.php | 4 +- admin/models/fields/interventions.php | 4 +- admin/models/fields/memberuser.php | 4 +- admin/models/fields/serviceprovider.php | 4 +- admin/models/fields/serviceprovideruser.php | 4 +- admin/models/forms/causerisk.js | 4 +- admin/models/forms/company.js | 94 +++++------ admin/models/forms/company.xml | 2 +- admin/models/forms/country.js | 4 +- admin/models/forms/currency.js | 4 +- admin/models/forms/health_data.js | 4 +- admin/models/forms/help_document.js | 158 +++++++++--------- admin/models/forms/intervention.js | 72 ++++---- admin/models/forms/scaling_factor.js | 42 ++--- admin/models/forms/service_provider.js | 4 +- admin/models/health_data.php | 4 +- admin/models/health_data_sets.php | 4 +- admin/models/help_document.php | 4 +- admin/models/help_documents.php | 4 +- admin/models/import.php | 4 +- admin/models/intervention.php | 4 +- admin/models/interventions.php | 4 +- admin/models/scaling_factor.php | 4 +- admin/models/scaling_factors.php | 4 +- admin/models/service_provider.php | 26 +-- admin/models/service_providers.php | 4 +- admin/sql/updates/mysql/3.3.4.sql | 1 + admin/tables/causerisk.php | 4 +- admin/tables/company.php | 4 +- admin/tables/country.php | 4 +- admin/tables/currency.php | 4 +- admin/tables/health_data.php | 4 +- admin/tables/help_document.php | 4 +- admin/tables/intervention.php | 4 +- admin/tables/scaling_factor.php | 4 +- admin/tables/service_provider.php | 4 +- admin/vdm.php | 4 +- admin/views/causerisk/submitbutton.js | 4 +- admin/views/causerisk/tmpl/edit.php | 4 +- admin/views/causerisk/view.html.php | 4 +- admin/views/causesrisks/tmpl/default.php | 4 +- .../causesrisks/tmpl/default_batch_body.php | 4 +- .../causesrisks/tmpl/default_batch_footer.php | 4 +- admin/views/causesrisks/tmpl/default_body.php | 4 +- admin/views/causesrisks/tmpl/default_foot.php | 4 +- admin/views/causesrisks/tmpl/default_head.php | 4 +- .../causesrisks/tmpl/default_toolbar.php | 4 +- admin/views/causesrisks/view.html.php | 4 +- admin/views/combinedresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- .../combinedresults/tmpl/default_main.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- admin/views/combinedresults/view.html.php | 4 +- admin/views/companies/tmpl/default.php | 4 +- .../companies/tmpl/default_batch_body.php | 4 +- .../companies/tmpl/default_batch_footer.php | 4 +- admin/views/companies/tmpl/default_body.php | 4 +- admin/views/companies/tmpl/default_foot.php | 4 +- admin/views/companies/tmpl/default_head.php | 4 +- .../views/companies/tmpl/default_toolbar.php | 4 +- admin/views/companies/view.html.php | 4 +- admin/views/company/submitbutton.js | 4 +- admin/views/company/tmpl/edit.php | 24 +-- admin/views/company/view.html.php | 8 +- admin/views/companyresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- .../companyresults/tmpl/default_main.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- .../companyresults/tmpl/default_variables.php | 4 +- admin/views/companyresults/view.html.php | 4 +- .../costbenefitprojection/tmpl/default.php | 4 +- .../tmpl/default_main.php | 4 +- .../tmpl/default_usage_statistics_table.php | 4 +- .../tmpl/default_vdm.php | 4 +- .../views/costbenefitprojection/view.html.php | 4 +- admin/views/countries/tmpl/default.php | 4 +- .../countries/tmpl/default_batch_body.php | 4 +- .../countries/tmpl/default_batch_footer.php | 4 +- admin/views/countries/tmpl/default_body.php | 4 +- admin/views/countries/tmpl/default_foot.php | 4 +- admin/views/countries/tmpl/default_head.php | 4 +- .../views/countries/tmpl/default_toolbar.php | 4 +- admin/views/countries/view.html.php | 4 +- admin/views/country/submitbutton.js | 4 +- admin/views/country/tmpl/edit.php | 4 +- admin/views/country/view.html.php | 10 +- admin/views/currencies/tmpl/default.php | 4 +- .../currencies/tmpl/default_batch_body.php | 4 +- .../currencies/tmpl/default_batch_footer.php | 4 +- admin/views/currencies/tmpl/default_body.php | 4 +- admin/views/currencies/tmpl/default_foot.php | 4 +- admin/views/currencies/tmpl/default_head.php | 4 +- .../views/currencies/tmpl/default_toolbar.php | 4 +- admin/views/currencies/view.html.php | 4 +- admin/views/currency/submitbutton.js | 4 +- admin/views/currency/tmpl/edit.php | 4 +- admin/views/currency/view.html.php | 4 +- admin/views/health_data/submitbutton.js | 4 +- admin/views/health_data/tmpl/edit.php | 4 +- admin/views/health_data/view.html.php | 4 +- admin/views/health_data_sets/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../health_data_sets/tmpl/default_body.php | 4 +- .../health_data_sets/tmpl/default_foot.php | 4 +- .../health_data_sets/tmpl/default_head.php | 4 +- .../health_data_sets/tmpl/default_toolbar.php | 4 +- admin/views/health_data_sets/view.html.php | 4 +- admin/views/help_document/submitbutton.js | 4 +- admin/views/help_document/tmpl/edit.php | 64 +++---- admin/views/help_document/view.html.php | 4 +- admin/views/help_documents/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../help_documents/tmpl/default_body.php | 4 +- .../help_documents/tmpl/default_foot.php | 4 +- .../help_documents/tmpl/default_head.php | 4 +- .../help_documents/tmpl/default_toolbar.php | 4 +- admin/views/help_documents/view.html.php | 4 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- admin/views/intervention/submitbutton.js | 4 +- admin/views/intervention/tmpl/edit.php | 34 ++-- admin/views/intervention/view.html.php | 4 +- admin/views/interventions/tmpl/default.php | 4 +- .../interventions/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/interventions/tmpl/default_body.php | 4 +- .../views/interventions/tmpl/default_foot.php | 4 +- .../views/interventions/tmpl/default_head.php | 4 +- .../interventions/tmpl/default_toolbar.php | 4 +- admin/views/interventions/view.html.php | 4 +- admin/views/scaling_factor/submitbutton.js | 4 +- admin/views/scaling_factor/tmpl/edit.php | 14 +- admin/views/scaling_factor/view.html.php | 4 +- admin/views/scaling_factors/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../scaling_factors/tmpl/default_body.php | 4 +- .../scaling_factors/tmpl/default_foot.php | 4 +- .../scaling_factors/tmpl/default_head.php | 4 +- .../scaling_factors/tmpl/default_toolbar.php | 4 +- admin/views/scaling_factors/view.html.php | 4 +- admin/views/service_provider/submitbutton.js | 4 +- admin/views/service_provider/tmpl/edit.php | 4 +- admin/views/service_provider/view.html.php | 6 +- .../views/service_providers/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../service_providers/tmpl/default_body.php | 4 +- .../service_providers/tmpl/default_foot.php | 4 +- .../service_providers/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/service_providers/view.html.php | 4 +- costbenefitprojection.xml | 6 +- script.php | 6 +- site/assets/css/combinedresults.css | 4 +- site/assets/css/company.css | 4 +- site/assets/css/companyresults.css | 4 +- site/assets/css/cpanel.css | 4 +- site/assets/css/createaccount.css | 4 +- site/assets/css/intervention.css | 4 +- site/assets/css/publicresults.css | 4 +- site/assets/css/scaling_factor.css | 4 +- site/assets/css/site.css | 4 +- site/controller.php | 4 +- site/controllers/ajax.json.php | 4 +- site/controllers/company.php | 9 +- site/controllers/help.php | 4 +- site/controllers/intervention.php | 4 +- site/controllers/scaling_factor.php | 4 +- site/costbenefitprojection.php | 4 +- site/helpers/costbenefitprojection.php | 4 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- site/layouts/appnotice.php | 4 +- .../age_groups_percentages_fullwidth.php | 4 +- .../company/age_groups_percentages_left.php | 4 +- .../company/age_groups_percentages_right.php | 4 +- .../company/causerisk_selection_fullwidth.php | 4 +- site/layouts/company/details_above.php | 4 +- site/layouts/company/details_left.php | 4 +- site/layouts/company/details_right.php | 4 +- site/layouts/company/details_under.php | 4 +- .../company/interventions_fullwidth.php | 6 +- site/layouts/company/publishing.php | 4 +- site/layouts/company/publlshing.php | 4 +- .../company/scaling_factors_fullwidth.php | 6 +- site/layouts/companydetails.php | 4 +- site/layouts/databreakdownmalefemale.php | 4 +- site/layouts/intervention/details_above.php | 4 +- .../intervention/details_fullwidth.php | 4 +- site/layouts/intervention/details_under.php | 4 +- site/layouts/intervention/publishing.php | 4 +- site/layouts/intervention/publlshing.php | 4 +- .../intervention/settings_fullwidth.php | 4 +- site/layouts/intervention/settings_left.php | 4 +- site/layouts/scaling_factor/details_above.php | 4 +- site/layouts/scaling_factor/details_left.php | 4 +- site/layouts/scaling_factor/details_right.php | 4 +- site/layouts/scaling_factor/publishing.php | 4 +- site/layouts/scaling_factor/publlshing.php | 4 +- site/models/ajax.php | 4 +- site/models/combinedresults.php | 4 +- site/models/company.php | 40 ++--- site/models/companyresults.php | 4 +- site/models/cpanel.php | 4 +- site/models/createaccount.php | 4 +- site/models/forms/company.js | 94 +++++------ site/models/forms/company.xml | 2 +- site/models/forms/intervention.js | 72 ++++---- site/models/forms/scaling_factor.js | 42 ++--- site/models/intervention.php | 4 +- site/models/publicresults.php | 4 +- site/models/scaling_factor.php | 4 +- site/router.php | 4 +- site/views/combinedresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- ...t_chart_intervention_cost_benefit_save.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- site/views/combinedresults/view.html.php | 4 +- site/views/company/submitbutton.js | 4 +- site/views/company/tmpl/edit.php | 24 +-- site/views/company/view.html.php | 8 +- site/views/companyresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- ...t_chart_intervention_cost_benefit_save.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- site/views/companyresults/view.html.php | 4 +- site/views/cpanel/tmpl/default.php | 4 +- site/views/cpanel/view.html.php | 4 +- site/views/createaccount/tmpl/default.php | 4 +- .../tmpl/default_cbpmenumodule.php | 4 +- site/views/createaccount/view.html.php | 4 +- site/views/intervention/submitbutton.js | 4 +- site/views/intervention/tmpl/edit.php | 34 ++-- site/views/intervention/view.html.php | 4 +- site/views/publicresults/tmpl/default.php | 4 +- .../tmpl/default_cbpmenumodule.php | 4 +- .../tmpl/default_chart_cost_public.php | 4 +- ...chart_intervention_cost_benefit_public.php | 4 +- .../tmpl/default_contact_form_public.php | 4 +- site/views/publicresults/view.html.php | 4 +- site/views/scaling_factor/submitbutton.js | 4 +- site/views/scaling_factor/tmpl/edit.php | 14 +- site/views/scaling_factor/view.html.php | 4 +- 413 files changed, 1293 insertions(+), 1282 deletions(-) create mode 100644 admin/sql/updates/mysql/3.3.4.sql diff --git a/README.md b/README.md index a9579f53..d8d7c125 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.3.4) +# Cost Benefit Projection (3.3.5) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -22,12 +22,12 @@ 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*: 20th February, 2016 -+ *Version*: 3.3.4 ++ *Last Build*: 22nd February, 2016 ++ *Version*: 3.3.5 + *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*: **83590** -+ *File count*: **550** ++ *Line count*: **83618** ++ *File count*: **551** + *Folder count*: **101** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index ff249937..c0bdd7a9 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.css diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index b5aae54f..be020544 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.css diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index b1458931..7f9633a6 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.css diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index 6e59496f..1ff03089 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index 7b859861..0bdae237 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.css diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 17f8e751..40fe9d81 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index bf6fcced..6c1f2564 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index a473fa5e..1546b941 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index c90dbb09..03b6906f 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 2e19a46a..a92193fe 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index e245af8c..e48ef4b2 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 5f4b0676..fa8974bb 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage dashboard.css diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index 8e0fe23f..61420d12 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.css diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index 9d9f14b1..6826862d 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index d17284fa..974d393d 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 330941b9..48417a31 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.css diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index 362c628d..5f18d25e 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index e3b875c7..40013db2 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.css diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index 0f3687c8..797447c7 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index 181e2a08..1ac54457 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.css diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index 2a4e71f2..266fc6c6 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.css diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 68fdee55..8f3cb471 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index 26350f67..a83be5c6 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 41fb532e..3d6572e1 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index df45e1c7..1bdc72b3 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index b889a25d..908a6ddd 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index f83a3316..23b1060e 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 897a1b97..445c9880 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/controllers/company.php b/admin/controllers/company.php index e1bd2310..eeffca5b 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -331,6 +331,11 @@ class CostbenefitprojectionControllerCompany extends JControllerForm { if ($validData['id'] >= 0) { + // if id is 0 get id + if (0 == $validData['id']) + { + $validData['id'] = CostbenefitprojectionHelper::getVar('company', $validData['email'], 'email', 'id'); + } // user setup if not set if (0 >= (int) $validData['user']) { diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 37e677da..c6bab6ae 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index ca40fe72..2efa2344 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 5097d0f8..0dd092c5 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index 305ff694..403d911f 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 08c4d342..eacf5bd9 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index d23b73e7..474459f4 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index 3ba67eeb..879bb3c1 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index ddf6071b..b3bf8004 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index d8318750..69fb2300 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index b410357e..886c699a 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 26ebe8d0..25e6c741 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 528ff515..511b212f 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 928a99d3..7b6d2ab2 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index 463b1c6d..141efb5f 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index e2bd36d6..de8c793c 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index 1f46adb2..4df97611 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index ca37b375..a2f2bb73 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index a49eef57..c33b0d2b 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index f7fdc3d8..baf16885 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 43488bf7..cf0b143e 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index c43e6e8f..8cdbaee5 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index ee9db118..18447b43 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index c420c11b..f352d357 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 9d659c2b..f3ceec03 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batchselection.php diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index efebdbff..defe8b1b 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 3756acab..f8041737 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index 96850b04..a0c15717 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index 20e8333f..c0981068 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index be48c7d9..53dd0ee4 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 0e64aa0e..6b940159 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index b0f6eef3..a94a6e7b 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index 3810b144..0ce52f4e 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index afe9c64d..9d820b57 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index dd15b471..fea59968 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index 21bff0d6..3922483b 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 90816f13..e2b2994f 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->anuinterventions; +$items = $displayData->tbginterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index 96850b04..a0c15717 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index a2f23224..6259e16b 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->hbvscaling_factors; +$items = $displayData->eoascaling_factors; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit"; diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index be48c7d9..53dd0ee4 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 0e64aa0e..6b940159 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index 3b356e5b..ed411d10 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 82a22254..2773e0fa 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->nbccompanies; +$items = $displayData->oyfcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index a2974e9e..2ef12dd3 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index b8d7d3b1..669246fb 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index 5534139d..ea61d0b8 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index cac921b4..a6b24bbb 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 01234c7d..4b233a2c 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index a6d841cc..6eb48d8e 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->owninterventions; +$items = $displayData->geointerventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index fa67fecf..6da77db1 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index 96850b04..a0c15717 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index e0e93336..a0811c93 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->sjwservice_providers; +$items = $displayData->kweservice_providers; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit"; diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 26ffcba4..a6e9ba98 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 61263f06..f91de17f 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index f397e9bf..17fd1d80 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index 96850b04..a0c15717 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index 8f7b8d03..326d127c 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index ce44cd24..62f06e39 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index dd72df3e..0045e58d 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index f40b7748..6bb04601 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 021cefa0..52014048 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index 96850b04..a0c15717 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index b0c19c58..30389f1e 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 9369e892..8ed18748 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index ca3fd783..0444bacb 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index f038c10d..5d0c0318 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 21bff0d6..3922483b 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 348fd9e4..5e120941 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index 387bfb9e..52cf66bf 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index c313925a..41f67764 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index 21bff0d6..3922483b 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 348fd9e4..5e120941 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 0f23e1b3..cb09c2ab 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index a520f27f..9beae593 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 2c682eea..436c8759 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index a7c63bcf..396ac190 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index 6b500867..bf9a33bd 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 348fd9e4..5e120941 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 41f8fba5..b86a58c4 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->whbcompanies; +$items = $displayData->siecompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 62fbd4ae..a4f3a0d2 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php index 84cd3333..5393125b 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index f68f9e46..f0256ea3 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 348fd9e4..5e120941 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 3cfeabc1..886fc18c 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 64048ec8..2828c312 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 3aa355dd..22d77f18 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index 1ebf237f..19fceb4d 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/models/companies.php b/admin/models/companies.php index 3cf80f00..cf7d56d5 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/models/company.php b/admin/models/company.php index 39ddcf88..f127153d 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.company'); } } - $this->companyihwb = $item->id; - $this->companykzki = $item->id; + $this->companyuqpn = $item->id; + $this->companymzoc = $item->id; return $item; } @@ -165,7 +165,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getHbvscaling_factors() + public function getEoascaling_factors() { // Get the user object. $user = JFactory::getUser(); @@ -204,15 +204,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('h.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')'); - // Filter by companyihwb global. - $companyihwb = $this->companyihwb; - if (is_numeric($companyihwb )) + // Filter by companyuqpn global. + $companyuqpn = $this->companyuqpn; + if (is_numeric($companyuqpn )) { - $query->where('a.company = ' . (int) $companyihwb ); + $query->where('a.company = ' . (int) $companyuqpn ); } - elseif (is_string($companyihwb)) + elseif (is_string($companyuqpn)) { - $query->where('a.company = ' . $db->quote($companyihwb)); + $query->where('a.company = ' . $db->quote($companyuqpn)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getAnuinterventions() + public function getTbginterventions() { // Get the user object. $user = JFactory::getUser(); @@ -290,15 +290,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by companykzki global. - $companykzki = $this->companykzki; - if (is_numeric($companykzki )) + // Filter by companymzoc global. + $companymzoc = $this->companymzoc; + if (is_numeric($companymzoc )) { - $query->where('a.company = ' . (int) $companykzki ); + $query->where('a.company = ' . (int) $companymzoc ); } - elseif (is_string($companykzki)) + elseif (is_string($companymzoc)) { - $query->where('a.company = ' . $db->quote($companykzki)); + $query->where('a.company = ' . $db->quote($companymzoc)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationAnuinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationTbginterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationAnuinterventions($value,$name) + public function selectionTranslationTbginterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 034030e3..905449cd 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 9d1150a4..004dd496 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/models/countries.php b/admin/models/countries.php index b2c442f6..bc984cc6 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index 999aec31..dcd9a932 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -101,9 +101,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.country'); } } - $this->countryodro = $item->id; - $this->countrydxmm = $item->id; - $this->countryrjsj = $item->id; + $this->countrygfhe = $item->id; + $this->countryjrkv = $item->id; + $this->countryetft = $item->id; return $item; } @@ -113,7 +113,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getOwninterventions() + public function getGeointerventions() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by countryodro global. - $countryodro = $this->countryodro; - if (is_numeric($countryodro )) + // Filter by countrygfhe global. + $countrygfhe = $this->countrygfhe; + if (is_numeric($countrygfhe )) { - $query->where('a.country = ' . (int) $countryodro ); + $query->where('a.country = ' . (int) $countrygfhe ); } - elseif (is_string($countryodro)) + elseif (is_string($countrygfhe)) { - $query->where('a.country = ' . $db->quote($countryodro)); + $query->where('a.country = ' . $db->quote($countrygfhe)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationOwninterventions($item->type, 'type'); + $item->type = $this->selectionTranslationGeointerventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationOwninterventions($value,$name) + public function selectionTranslationGeointerventions($value,$name) { // Array of type language strings if ($name == 'type') @@ -246,7 +246,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getSjwservice_providers() + public function getKweservice_providers() { // Get the user object. $user = JFactory::getUser(); @@ -285,15 +285,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('h.name','country_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')'); - // Filter by countrydxmm global. - $countrydxmm = $this->countrydxmm; - if (is_numeric($countrydxmm )) + // Filter by countryjrkv global. + $countryjrkv = $this->countryjrkv; + if (is_numeric($countryjrkv )) { - $query->where('a.country = ' . (int) $countrydxmm ); + $query->where('a.country = ' . (int) $countryjrkv ); } - elseif (is_string($countrydxmm)) + elseif (is_string($countryjrkv)) { - $query->where('a.country = ' . $db->quote($countrydxmm)); + $query->where('a.country = ' . $db->quote($countryjrkv)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getNbccompanies() + public function getOyfcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -379,15 +379,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by countryrjsj global. - $countryrjsj = $this->countryrjsj; - if (is_numeric($countryrjsj )) + // Filter by countryetft global. + $countryetft = $this->countryetft; + if (is_numeric($countryetft )) { - $query->where('a.country = ' . (int) $countryrjsj ); + $query->where('a.country = ' . (int) $countryetft ); } - elseif (is_string($countryrjsj)) + elseif (is_string($countryetft)) { - $query->where('a.country = ' . $db->quote($countryrjsj)); + $query->where('a.country = ' . $db->quote($countryetft)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationNbccompanies($item->department, 'department'); + $item->department = $this->selectionTranslationOyfcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationNbccompanies($item->per, 'per'); + $item->per = $this->selectionTranslationOyfcompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationNbccompanies($value,$name) + public function selectionTranslationOyfcompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 56ff4122..32941219 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index e529cc55..18c20e3f 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 47c8ed28..95d2d748 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage articles.php diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index a2029031..3d896e22 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index b0420cc4..85a2646f 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesriskscheck.php diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index fff86492..8d4d9d0e 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index fc384418..fdc0502f 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index 3d00b92e..dea4db98 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countryuser.php diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index 89f247d7..aa2c3c3d 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index fff69cd3..1bae1215 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage datayear.php diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index 98e0b746..f2d3760d 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index a65a320a..d330a9c4 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage memberuser.php diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index ad4409f6..351dceb5 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index d940cfa0..cc9368d8 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index 54a253d7..71e3c5cd 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.js diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index 8acf3ecc..6641636f 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_PMWNSmETkT_required = false; -jform_PMWNSmEvwG_required = false; -jform_PMWNSmEMOM_required = false; -jform_PMWNSmEEfk_required = false; -jform_PMWNSmEUYy_required = false; -jform_PMWNSmEWiq_required = false; -jform_PMWNSmEOgA_required = false; +jform_nkZhFFcqqG_required = false; +jform_nkZhFFcYzd_required = false; +jform_nkZhFFclVH_required = false; +jform_nkZhFFcJSK_required = false; +jform_nkZhFFcbCZ_required = false; +jform_nkZhFFcjBH_required = false; +jform_nkZhFFcrhM_required = false; // Initial Script jQuery(document).ready(function() { - var department_PMWNSmE = jQuery("#jform_department input[type='radio']:checked").val(); - PMWNSmE(department_PMWNSmE); + var department_nkZhFFc = jQuery("#jform_department input[type='radio']:checked").val(); + nkZhFFc(department_nkZhFFc); - var department_qzPeqNQ = jQuery("#jform_department input[type='radio']:checked").val(); - qzPeqNQ(department_qzPeqNQ); + var department_vVHReGY = jQuery("#jform_department input[type='radio']:checked").val(); + vVHReGY(department_vVHReGY); }); -// the PMWNSmE function -function PMWNSmE(department_PMWNSmE) +// the nkZhFFc function +function nkZhFFc(department_nkZhFFc) { // set the function logic - if (department_PMWNSmE == 2) + if (department_nkZhFFc == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_PMWNSmETkT_required) + if (jform_nkZhFFcqqG_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_PMWNSmETkT_required = false; + jform_nkZhFFcqqG_required = false; } jQuery('#jform_percentfemale').closest('.control-group').show(); jQuery('#jform_percentmale').closest('.control-group').show(); jQuery('#jform_productivity_losses').closest('.control-group').show(); - if (jform_PMWNSmEvwG_required) + if (jform_nkZhFFcYzd_required) { updateFieldRequired('productivity_losses',0); jQuery('#jform_productivity_losses').prop('required','required'); jQuery('#jform_productivity_losses').attr('aria-required',true); jQuery('#jform_productivity_losses').addClass('required'); - jform_PMWNSmEvwG_required = false; + jform_nkZhFFcYzd_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_PMWNSmEMOM_required) + if (jform_nkZhFFclVH_required) { updateFieldRequired('medical_turnovers_females',0); jQuery('#jform_medical_turnovers_females').prop('required','required'); jQuery('#jform_medical_turnovers_females').attr('aria-required',true); jQuery('#jform_medical_turnovers_females').addClass('required'); - jform_PMWNSmEMOM_required = false; + jform_nkZhFFclVH_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_PMWNSmEEfk_required) + if (jform_nkZhFFcJSK_required) { updateFieldRequired('medical_turnovers_males',0); jQuery('#jform_medical_turnovers_males').prop('required','required'); jQuery('#jform_medical_turnovers_males').attr('aria-required',true); jQuery('#jform_medical_turnovers_males').addClass('required'); - jform_PMWNSmEEfk_required = false; + jform_nkZhFFcJSK_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_PMWNSmEUYy_required) + if (jform_nkZhFFcbCZ_required) { updateFieldRequired('sick_leave_females',0); jQuery('#jform_sick_leave_females').prop('required','required'); jQuery('#jform_sick_leave_females').attr('aria-required',true); jQuery('#jform_sick_leave_females').addClass('required'); - jform_PMWNSmEUYy_required = false; + jform_nkZhFFcbCZ_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_PMWNSmEWiq_required) + if (jform_nkZhFFcjBH_required) { updateFieldRequired('sick_leave_males',0); jQuery('#jform_sick_leave_males').prop('required','required'); jQuery('#jform_sick_leave_males').attr('aria-required',true); jQuery('#jform_sick_leave_males').addClass('required'); - jform_PMWNSmEWiq_required = false; + jform_nkZhFFcjBH_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_PMWNSmEOgA_required) + if (jform_nkZhFFcrhM_required) { updateFieldRequired('total_healthcare',0); jQuery('#jform_total_healthcare').prop('required','required'); jQuery('#jform_total_healthcare').attr('aria-required',true); jQuery('#jform_total_healthcare').addClass('required'); - jform_PMWNSmEOgA_required = false; + jform_nkZhFFcrhM_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_PMWNSmETkT_required) + if (!jform_nkZhFFcqqG_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_PMWNSmETkT_required = true; + jform_nkZhFFcqqG_required = true; } jQuery('#jform_percentfemale').closest('.control-group').hide(); jQuery('#jform_percentmale').closest('.control-group').hide(); jQuery('#jform_productivity_losses').closest('.control-group').hide(); - if (!jform_PMWNSmEvwG_required) + if (!jform_nkZhFFcYzd_required) { updateFieldRequired('productivity_losses',1); jQuery('#jform_productivity_losses').removeAttr('required'); jQuery('#jform_productivity_losses').removeAttr('aria-required'); jQuery('#jform_productivity_losses').removeClass('required'); - jform_PMWNSmEvwG_required = true; + jform_nkZhFFcYzd_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_PMWNSmEMOM_required) + if (!jform_nkZhFFclVH_required) { updateFieldRequired('medical_turnovers_females',1); jQuery('#jform_medical_turnovers_females').removeAttr('required'); jQuery('#jform_medical_turnovers_females').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_females').removeClass('required'); - jform_PMWNSmEMOM_required = true; + jform_nkZhFFclVH_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_PMWNSmEEfk_required) + if (!jform_nkZhFFcJSK_required) { updateFieldRequired('medical_turnovers_males',1); jQuery('#jform_medical_turnovers_males').removeAttr('required'); jQuery('#jform_medical_turnovers_males').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_males').removeClass('required'); - jform_PMWNSmEEfk_required = true; + jform_nkZhFFcJSK_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_PMWNSmEUYy_required) + if (!jform_nkZhFFcbCZ_required) { updateFieldRequired('sick_leave_females',1); jQuery('#jform_sick_leave_females').removeAttr('required'); jQuery('#jform_sick_leave_females').removeAttr('aria-required'); jQuery('#jform_sick_leave_females').removeClass('required'); - jform_PMWNSmEUYy_required = true; + jform_nkZhFFcbCZ_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_PMWNSmEWiq_required) + if (!jform_nkZhFFcjBH_required) { updateFieldRequired('sick_leave_males',1); jQuery('#jform_sick_leave_males').removeAttr('required'); jQuery('#jform_sick_leave_males').removeAttr('aria-required'); jQuery('#jform_sick_leave_males').removeClass('required'); - jform_PMWNSmEWiq_required = true; + jform_nkZhFFcjBH_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_PMWNSmEOgA_required) + if (!jform_nkZhFFcrhM_required) { updateFieldRequired('total_healthcare',1); jQuery('#jform_total_healthcare').removeAttr('required'); jQuery('#jform_total_healthcare').removeAttr('aria-required'); jQuery('#jform_total_healthcare').removeClass('required'); - jform_PMWNSmEOgA_required = true; + jform_nkZhFFcrhM_required = true; } } } -// the qzPeqNQ function -function qzPeqNQ(department_qzPeqNQ) +// the vVHReGY function +function vVHReGY(department_vVHReGY) { // set the function logic - if (department_qzPeqNQ == 1) + if (department_vVHReGY == 1) { jQuery('.age_groups_note').closest('.control-group').show(); jQuery('.cause_risk_selection_note').closest('.control-group').show(); diff --git a/admin/models/forms/company.xml b/admin/models/forms/company.xml index 7a1075ca..4a9e7732 100644 --- a/admin/models/forms/company.xml +++ b/admin/models/forms/company.xml @@ -109,7 +109,7 @@ maxlength="50" description="COM_COSTBENEFITPROJECTION_COMPANY_EMAIL_DESCRIPTION" class="text_area" - required="false" + required="true" filter="STRING" validate="email" message="Error! Please add email address here." diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index 162d9349..5856168d 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.js diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index d66fab7b..b1c73001 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.js diff --git a/admin/models/forms/health_data.js b/admin/models/forms/health_data.js index 2086b8b0..2c3603cc 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.js diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 6dc44a62..b32242bd 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_nAUNRuRYvC_required = false; -jform_AoScEjXMUe_required = false; -jform_FrqcCsFvQO_required = false; -jform_TguOTheFhI_required = false; +jform_qDDgGiNYyX_required = false; +jform_wVtDCYhiQV_required = false; +jform_xYrjdyEars_required = false; +jform_FEQkJCtDBS_required = false; // Initial Script jQuery(document).ready(function() { - var location_cMgRrgD = jQuery("#jform_location input[type='radio']:checked").val(); - cMgRrgD(location_cMgRrgD); + var location_yTJjiqR = jQuery("#jform_location input[type='radio']:checked").val(); + yTJjiqR(location_yTJjiqR); - var location_nhJbrdp = jQuery("#jform_location input[type='radio']:checked").val(); - nhJbrdp(location_nhJbrdp); + var location_dlBWMKL = jQuery("#jform_location input[type='radio']:checked").val(); + dlBWMKL(location_dlBWMKL); - var type_nAUNRuR = jQuery("#jform_type").val(); - nAUNRuR(type_nAUNRuR); + var type_qDDgGiN = jQuery("#jform_type").val(); + qDDgGiN(type_qDDgGiN); - var type_AoScEjX = jQuery("#jform_type").val(); - AoScEjX(type_AoScEjX); + var type_wVtDCYh = jQuery("#jform_type").val(); + wVtDCYh(type_wVtDCYh); - var type_FrqcCsF = jQuery("#jform_type").val(); - FrqcCsF(type_FrqcCsF); + var type_xYrjdyE = jQuery("#jform_type").val(); + xYrjdyE(type_xYrjdyE); - var target_TguOThe = jQuery("#jform_target input[type='radio']:checked").val(); - TguOThe(target_TguOThe); + var target_FEQkJCt = jQuery("#jform_target input[type='radio']:checked").val(); + FEQkJCt(target_FEQkJCt); }); -// the cMgRrgD function -function cMgRrgD(location_cMgRrgD) +// the yTJjiqR function +function yTJjiqR(location_yTJjiqR) { // set the function logic - if (location_cMgRrgD == 1) + if (location_yTJjiqR == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function cMgRrgD(location_cMgRrgD) } } -// the nhJbrdp function -function nhJbrdp(location_nhJbrdp) +// the dlBWMKL function +function dlBWMKL(location_dlBWMKL) { // set the function logic - if (location_nhJbrdp == 2) + if (location_dlBWMKL == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function nhJbrdp(location_nhJbrdp) } } -// the nAUNRuR function -function nAUNRuR(type_nAUNRuR) +// the qDDgGiN function +function qDDgGiN(type_qDDgGiN) { - if (isSet(type_nAUNRuR) && type_nAUNRuR.constructor !== Array) + if (isSet(type_qDDgGiN) && type_qDDgGiN.constructor !== Array) { - var temp_nAUNRuR = type_nAUNRuR; - var type_nAUNRuR = []; - type_nAUNRuR.push(temp_nAUNRuR); + var temp_qDDgGiN = type_qDDgGiN; + var type_qDDgGiN = []; + type_qDDgGiN.push(temp_qDDgGiN); } - else if (!isSet(type_nAUNRuR)) + else if (!isSet(type_qDDgGiN)) { - var type_nAUNRuR = []; + var type_qDDgGiN = []; } - var type = type_nAUNRuR.some(type_nAUNRuR_SomeFunc); + var type = type_qDDgGiN.some(type_qDDgGiN_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_nAUNRuRYvC_required) + if (jform_qDDgGiNYyX_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_nAUNRuRYvC_required = false; + jform_qDDgGiNYyX_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_nAUNRuRYvC_required) + if (!jform_qDDgGiNYyX_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_nAUNRuRYvC_required = true; + jform_qDDgGiNYyX_required = true; } } } -// the nAUNRuR Some function -function type_nAUNRuR_SomeFunc(type_nAUNRuR) +// the qDDgGiN Some function +function type_qDDgGiN_SomeFunc(type_qDDgGiN) { // set the function logic - if (type_nAUNRuR == 3) + if (type_qDDgGiN == 3) { return true; } return false; } -// the AoScEjX function -function AoScEjX(type_AoScEjX) +// the wVtDCYh function +function wVtDCYh(type_wVtDCYh) { - if (isSet(type_AoScEjX) && type_AoScEjX.constructor !== Array) + if (isSet(type_wVtDCYh) && type_wVtDCYh.constructor !== Array) { - var temp_AoScEjX = type_AoScEjX; - var type_AoScEjX = []; - type_AoScEjX.push(temp_AoScEjX); + var temp_wVtDCYh = type_wVtDCYh; + var type_wVtDCYh = []; + type_wVtDCYh.push(temp_wVtDCYh); } - else if (!isSet(type_AoScEjX)) + else if (!isSet(type_wVtDCYh)) { - var type_AoScEjX = []; + var type_wVtDCYh = []; } - var type = type_AoScEjX.some(type_AoScEjX_SomeFunc); + var type = type_wVtDCYh.some(type_wVtDCYh_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_AoScEjXMUe_required) + if (jform_wVtDCYhiQV_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_AoScEjXMUe_required = false; + jform_wVtDCYhiQV_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_AoScEjXMUe_required) + if (!jform_wVtDCYhiQV_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_AoScEjXMUe_required = true; + jform_wVtDCYhiQV_required = true; } } } -// the AoScEjX Some function -function type_AoScEjX_SomeFunc(type_AoScEjX) +// the wVtDCYh Some function +function type_wVtDCYh_SomeFunc(type_wVtDCYh) { // set the function logic - if (type_AoScEjX == 1) + if (type_wVtDCYh == 1) { return true; } return false; } -// the FrqcCsF function -function FrqcCsF(type_FrqcCsF) +// the xYrjdyE function +function xYrjdyE(type_xYrjdyE) { - if (isSet(type_FrqcCsF) && type_FrqcCsF.constructor !== Array) + if (isSet(type_xYrjdyE) && type_xYrjdyE.constructor !== Array) { - var temp_FrqcCsF = type_FrqcCsF; - var type_FrqcCsF = []; - type_FrqcCsF.push(temp_FrqcCsF); + var temp_xYrjdyE = type_xYrjdyE; + var type_xYrjdyE = []; + type_xYrjdyE.push(temp_xYrjdyE); } - else if (!isSet(type_FrqcCsF)) + else if (!isSet(type_xYrjdyE)) { - var type_FrqcCsF = []; + var type_xYrjdyE = []; } - var type = type_FrqcCsF.some(type_FrqcCsF_SomeFunc); + var type = type_xYrjdyE.some(type_xYrjdyE_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_FrqcCsFvQO_required) + if (jform_xYrjdyEars_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_FrqcCsFvQO_required = false; + jform_xYrjdyEars_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_FrqcCsFvQO_required) + if (!jform_xYrjdyEars_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_FrqcCsFvQO_required = true; + jform_xYrjdyEars_required = true; } } } -// the FrqcCsF Some function -function type_FrqcCsF_SomeFunc(type_FrqcCsF) +// the xYrjdyE Some function +function type_xYrjdyE_SomeFunc(type_xYrjdyE) { // set the function logic - if (type_FrqcCsF == 2) + if (type_xYrjdyE == 2) { return true; } return false; } -// the TguOThe function -function TguOThe(target_TguOThe) +// the FEQkJCt function +function FEQkJCt(target_FEQkJCt) { // set the function logic - if (target_TguOThe == 1) + if (target_FEQkJCt == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_TguOTheFhI_required) + if (jform_FEQkJCtDBS_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_TguOTheFhI_required = false; + jform_FEQkJCtDBS_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_TguOTheFhI_required) + if (!jform_FEQkJCtDBS_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_TguOTheFhI_required = true; + jform_FEQkJCtDBS_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 87f97712..6e0a43e7 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_LZKQahRoCu_required = false; -jform_ihFJQrCtrT_required = false; +jform_mECXSCSvnM_required = false; +jform_ssnxqqjMKL_required = false; // Initial Script jQuery(document).ready(function() { - var type_LZKQahR = jQuery("#jform_type input[type='radio']:checked").val(); - LZKQahR(type_LZKQahR); + var type_mECXSCS = jQuery("#jform_type input[type='radio']:checked").val(); + mECXSCS(type_mECXSCS); - var type_WDFtkAe = jQuery("#jform_type input[type='radio']:checked").val(); - WDFtkAe(type_WDFtkAe); + var type_KRRMiCK = jQuery("#jform_type input[type='radio']:checked").val(); + KRRMiCK(type_KRRMiCK); - var company_ihFJQrC = jQuery("#jform_company").val(); - ihFJQrC(company_ihFJQrC); + var company_ssnxqqj = jQuery("#jform_company").val(); + ssnxqqj(company_ssnxqqj); }); -// the LZKQahR function -function LZKQahR(type_LZKQahR) +// the mECXSCS function +function mECXSCS(type_mECXSCS) { // set the function logic - if (type_LZKQahR == 2) + if (type_mECXSCS == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_LZKQahRoCu_required) + if (jform_mECXSCSvnM_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_LZKQahRoCu_required = false; + jform_mECXSCSvnM_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_LZKQahRoCu_required) + if (!jform_mECXSCSvnM_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_LZKQahRoCu_required = true; + jform_mECXSCSvnM_required = true; } } } -// the WDFtkAe function -function WDFtkAe(type_WDFtkAe) +// the KRRMiCK function +function KRRMiCK(type_KRRMiCK) { // set the function logic - if (type_WDFtkAe == 1) + if (type_KRRMiCK == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function WDFtkAe(type_WDFtkAe) } } -// the ihFJQrC function -function ihFJQrC(company_ihFJQrC) +// the ssnxqqj function +function ssnxqqj(company_ssnxqqj) { - if (isSet(company_ihFJQrC) && company_ihFJQrC.constructor !== Array) + if (isSet(company_ssnxqqj) && company_ssnxqqj.constructor !== Array) { - var temp_ihFJQrC = company_ihFJQrC; - var company_ihFJQrC = []; - company_ihFJQrC.push(temp_ihFJQrC); + var temp_ssnxqqj = company_ssnxqqj; + var company_ssnxqqj = []; + company_ssnxqqj.push(temp_ssnxqqj); } - else if (!isSet(company_ihFJQrC)) + else if (!isSet(company_ssnxqqj)) { - var company_ihFJQrC = []; + var company_ssnxqqj = []; } - var company = company_ihFJQrC.some(company_ihFJQrC_SomeFunc); + var company = company_ssnxqqj.some(company_ssnxqqj_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_ihFJQrCtrT_required) + if (jform_ssnxqqjMKL_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_ihFJQrCtrT_required = false; + jform_ssnxqqjMKL_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_ihFJQrCtrT_required) + if (!jform_ssnxqqjMKL_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_ihFJQrCtrT_required = true; + jform_ssnxqqjMKL_required = true; } } } -// the ihFJQrC Some function -function company_ihFJQrC_SomeFunc(company_ihFJQrC) +// the ssnxqqj Some function +function company_ssnxqqj_SomeFunc(company_ssnxqqj) { // set the function logic - if (company_ihFJQrC == 0) + if (company_ssnxqqj == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 8bbca1a9..47290509 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_LJQDUtNAlQ_required = false; +jform_XhNomDSndE_required = false; // Initial Script jQuery(document).ready(function() { - var company_LJQDUtN = jQuery("#jform_company").val(); - LJQDUtN(company_LJQDUtN); + var company_XhNomDS = jQuery("#jform_company").val(); + XhNomDS(company_XhNomDS); }); -// the LJQDUtN function -function LJQDUtN(company_LJQDUtN) +// the XhNomDS function +function XhNomDS(company_XhNomDS) { - if (isSet(company_LJQDUtN) && company_LJQDUtN.constructor !== Array) + if (isSet(company_XhNomDS) && company_XhNomDS.constructor !== Array) { - var temp_LJQDUtN = company_LJQDUtN; - var company_LJQDUtN = []; - company_LJQDUtN.push(temp_LJQDUtN); + var temp_XhNomDS = company_XhNomDS; + var company_XhNomDS = []; + company_XhNomDS.push(temp_XhNomDS); } - else if (!isSet(company_LJQDUtN)) + else if (!isSet(company_XhNomDS)) { - var company_LJQDUtN = []; + var company_XhNomDS = []; } - var company = company_LJQDUtN.some(company_LJQDUtN_SomeFunc); + var company = company_XhNomDS.some(company_XhNomDS_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_LJQDUtNAlQ_required) + if (jform_XhNomDSndE_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_LJQDUtNAlQ_required = false; + jform_XhNomDSndE_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_LJQDUtNAlQ_required) + if (!jform_XhNomDSndE_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_LJQDUtNAlQ_required = true; + jform_XhNomDSndE_required = true; } } } -// the LJQDUtN Some function -function company_LJQDUtN_SomeFunc(company_LJQDUtN) +// the XhNomDS Some function +function company_XhNomDS_SomeFunc(company_XhNomDS) { // set the function logic - if (company_LJQDUtN == 0) + if (company_XhNomDS == 0) { return true; } diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js index 37df489b..69030ef9 100644 --- a/admin/models/forms/service_provider.js +++ b/admin/models/forms/service_provider.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.js diff --git a/admin/models/health_data.php b/admin/models/health_data.php index d5e8f6ab..5974a822 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index 8d397ae1..bfb26d5a 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 76c87de5..a71632dc 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 1a707ecd..902568f2 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 7786ea66..1c0cabdd 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/models/intervention.php b/admin/models/intervention.php index cc4c5d01..bcce7cf8 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/models/interventions.php b/admin/models/interventions.php index 20a23dd0..ff114e2f 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index ed8d26f6..9c81cd34 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index afeb15d8..aa87ef3a 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 9cb805fa..c56b7e27 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider'); } } - $this->service_providerrdrr = $item->id; + $this->service_providerahqy = $item->id; return $item; } @@ -105,7 +105,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWhbcompanies() + public function getSiecompanies() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by service_providerrdrr global. - $service_providerrdrr = $this->service_providerrdrr; - if (is_numeric($service_providerrdrr )) + // Filter by service_providerahqy global. + $service_providerahqy = $this->service_providerahqy; + if (is_numeric($service_providerahqy )) { - $query->where('a.service_provider = ' . (int) $service_providerrdrr ); + $query->where('a.service_provider = ' . (int) $service_providerahqy ); } - elseif (is_string($service_providerrdrr)) + elseif (is_string($service_providerahqy)) { - $query->where('a.service_provider = ' . $db->quote($service_providerrdrr)); + $query->where('a.service_provider = ' . $db->quote($service_providerahqy)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationWhbcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationSiecompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationWhbcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationSiecompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWhbcompanies($value,$name) + public function selectionTranslationSiecompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index 25443910..129fbdca 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/sql/updates/mysql/3.3.4.sql b/admin/sql/updates/mysql/3.3.4.sql new file mode 100644 index 00000000..d3f5a12f --- /dev/null +++ b/admin/sql/updates/mysql/3.3.4.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 2b033604..62abdb0a 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/tables/company.php b/admin/tables/company.php index 52ce4d52..065c54f1 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/tables/country.php b/admin/tables/country.php index 76d7e2ac..5a9cafd6 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index d6811ce9..16c4ae42 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index 2852e2fc..f8892aee 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 8da6fd88..de608729 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index 2255f130..c646624d 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index eb2b3803..dd4a9ecc 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index f3a801e6..34b00867 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index 64a5bd90..248863c1 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage vdm.php diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index ea3fc706..6e556eda 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index 4dd30a66..3bbafc9a 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index 2f957e92..d780b5ab 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index 24a88210..7c4aac12 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index 6429b8dc..e61abb00 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index 2ac9cece..747d4228 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 25c00ff9..7f2020a5 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index 61cc384c..607d97eb 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index 8d4dd38f..b094a0ee 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index 13474898..7303381e 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index 4af2fc21..65b41d29 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index 85c69c3f..f2da3245 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index 5c6b487e..a23f8dea 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index 2b082e73..43072bd4 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index aa0752f9..ad706896 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php index 0e07c653..43cf3e9e 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 524d3876..66778543 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index 41a223dd..88247fe1 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index 8d88a0fb..e01324a8 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index 94b7068c..e0da28ff 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index c5009eaa..eccb49b9 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 7574e3d8..10a4f9cc 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index 01331707..af92059c 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index d6f8b135..b69ef851 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index 2ecff83a..e38aa524 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index aefcb417..5463c5a1 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index 73542ac3..9ce83c1e 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index ace10950..98cf08c9 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index 7e86a863..a377c2b3 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index b6cfef4f..2aacc014 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index 21e8fae2..e5b9cf28 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index d826d3f7..b7b2c3b7 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index cce82653..45fd99e4 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.4 - @build 20th February, 2016 + @version 3.3.5 + @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php @@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');