diff --git a/README.md b/README.md
index 56cb68a5..a6bd4c4a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Cost Benefit Projection (3.3.3)
+# Cost Benefit Projection (3.3.4)
This is a [Joomla 3.x] (http://www.joomla.org/) component.
@@ -23,11 +23,11 @@ max_input_vars = 5000
+ *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
+ *First Build*: 15th June, 2012
+ *Last Build*: 19th February, 2016
-+ *Version*: 3.3.3
++ *Version*: 3.3.4
+ *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*: **83344**
-+ *File count*: **549**
++ *Line count*: **83518**
++ *File count*: **550**
+ *Folder count*: **101**
> This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
diff --git a/admin/access.xml b/admin/access.xml
index 63a0e1d4..47c03fa6 100644
--- a/admin/access.xml
+++ b/admin/access.xml
@@ -49,7 +49,7 @@
-
+
@@ -171,7 +171,7 @@
-
+
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 18478ba9..260a368f 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css
index d5b0e299..fa8f935c 100644
--- a/admin/assets/css/causerisk.css
+++ b/admin/assets/css/causerisk.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css
index 48fa8cc9..1b926445 100644
--- a/admin/assets/css/causesrisks.css
+++ b/admin/assets/css/causesrisks.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css
index 01c04c9d..b339ec59 100644
--- a/admin/assets/css/combinedresults.css
+++ b/admin/assets/css/combinedresults.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css
index ee881c61..f4ad0ad9 100644
--- a/admin/assets/css/companies.css
+++ b/admin/assets/css/companies.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css
index e6fcfa62..1089ebc1 100644
--- a/admin/assets/css/company.css
+++ b/admin/assets/css/company.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css
index 23eab832..575a35e6 100644
--- a/admin/assets/css/companyresults.css
+++ b/admin/assets/css/companyresults.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css
index 5b311077..6ad4d73a 100644
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css
index 1e0633c0..d41b270e 100644
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css
index 1b6489b9..6163c992 100644
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css
index b08a6595..ee711df6 100644
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 40810ec5..b32e7e55 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css
index 9f4b17ec..291a95b0 100644
--- a/admin/assets/css/health_data.css
+++ b/admin/assets/css/health_data.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css
index 3c224fa4..4b296b66 100644
--- a/admin/assets/css/health_data_sets.css
+++ b/admin/assets/css/health_data_sets.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 1944b740..0446f68c 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index b510602d..7ee2c873 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css
index 1bf0a08d..a022e4bf 100644
--- a/admin/assets/css/intervention.css
+++ b/admin/assets/css/intervention.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css
index b0034ccd..320a9b62 100644
--- a/admin/assets/css/interventions.css
+++ b/admin/assets/css/interventions.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css
index a91b02b0..b8f6240e 100644
--- a/admin/assets/css/scaling_factor.css
+++ b/admin/assets/css/scaling_factor.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css
index dae16399..f8f2ab3c 100644
--- a/admin/assets/css/scaling_factors.css
+++ b/admin/assets/css/scaling_factors.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css
index 1128e710..be115c1f 100644
--- a/admin/assets/css/service_provider.css
+++ b/admin/assets/css/service_provider.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css
index 7c27243b..27f75997 100644
--- a/admin/assets/css/service_providers.css
+++ b/admin/assets/css/service_providers.css
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controller.php b/admin/controller.php
index b7732f6f..181e3d7b 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index fc858d6a..ac93d7ac 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php
index 1af8aa10..f07b8c72 100644
--- a/admin/controllers/causerisk.php
+++ b/admin/controllers/causerisk.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php
index 42aab6fd..8f1b5e79 100644
--- a/admin/controllers/causesrisks.php
+++ b/admin/controllers/causesrisks.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php
index 16e0294b..63c50a5d 100644
--- a/admin/controllers/combinedresults.php
+++ b/admin/controllers/combinedresults.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php
index 26f18548..99610819 100644
--- a/admin/controllers/companies.php
+++ b/admin/controllers/companies.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/company.php b/admin/controllers/company.php
index 3fd0fa94..111024bf 100644
--- a/admin/controllers/company.php
+++ b/admin/controllers/company.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php
index 8e2630e1..5d47300f 100644
--- a/admin/controllers/companyresults.php
+++ b/admin/controllers/companyresults.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php
index 425b8821..bf5e452f 100644
--- a/admin/controllers/costbenefitprojection.php
+++ b/admin/controllers/costbenefitprojection.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php
index 357a9aaf..4ff2ee1b 100644
--- a/admin/controllers/countries.php
+++ b/admin/controllers/countries.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/country.php b/admin/controllers/country.php
index 3278b709..d7babc8b 100644
--- a/admin/controllers/country.php
+++ b/admin/controllers/country.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php
index 6fec6070..205450a9 100644
--- a/admin/controllers/currencies.php
+++ b/admin/controllers/currencies.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php
index 11fe78c5..b2e6b774 100644
--- a/admin/controllers/currency.php
+++ b/admin/controllers/currency.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php
index c45d5e32..e35cfc00 100644
--- a/admin/controllers/health_data.php
+++ b/admin/controllers/health_data.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php
index a1a0fdf5..5634aa56 100644
--- a/admin/controllers/health_data_sets.php
+++ b/admin/controllers/health_data_sets.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index 0b0c96eb..ac8d4cbe 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index 798b122c..e4aef41c 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index c930aa85..7319aa1f 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 125e5c59..7ae8536c 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php
index 2f0ddf64..af25e287 100644
--- a/admin/controllers/intervention.php
+++ b/admin/controllers/intervention.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php
index 3a8b272d..d132094d 100644
--- a/admin/controllers/interventions.php
+++ b/admin/controllers/interventions.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php
index 845c13ee..8bc623c6 100644
--- a/admin/controllers/scaling_factor.php
+++ b/admin/controllers/scaling_factor.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php
index c89b3352..fe8fc71f 100644
--- a/admin/controllers/scaling_factors.php
+++ b/admin/controllers/scaling_factors.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php
index 822dc523..f11939c1 100644
--- a/admin/controllers/service_provider.php
+++ b/admin/controllers/service_provider.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php
index f5e1a6cb..98fd2fa3 100644
--- a/admin/controllers/service_providers.php
+++ b/admin/controllers/service_providers.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php
index f04008eb..0a5ccec8 100644
--- a/admin/costbenefitprojection.php
+++ b/admin/costbenefitprojection.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php
index 6213fba9..88e5a3a3 100644
--- a/admin/helpers/costbenefitprojection.php
+++ b/admin/helpers/costbenefitprojection.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -211,7 +211,7 @@ abstract class CostbenefitprojectionHelper
break;
// serves provider (only load companies that belong to the service provider)
case 2:
- return self::getIds('serviceprovider',self::getIds('user',$id,'service_provider'),'company');
+ return self::getIds('service_provider',self::getIds('user',$id,'service_provider'),'company');
break;
// country (only load companies that belong to the country)
case 3:
@@ -235,7 +235,7 @@ abstract class CostbenefitprojectionHelper
// return in relation
if (1 == $is) // member
{
- return self::getIds('user',$id,'company','serviceprovider');
+ return self::getIds('user',$id,'company','service_provider');
}
elseif (2 == $is) // serves provider
{
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index 1906cb5f..c2155ce5 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php
index 72792036..e7d3d083 100644
--- a/admin/helpers/sum.php
+++ b/admin/helpers/sum.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php
index 5fc3dfd9..dd9dcc6f 100644
--- a/admin/helpers/sumcombine.php
+++ b/admin/helpers/sumcombine.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini
index d6b88156..bce8739b 100644
--- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini
+++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini
@@ -139,8 +139,8 @@ COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PERCENTFEMALE_DESC="Allows the users in
COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PERCENTMALE="Companies Edit Percentmale"
COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PERCENTMALE_DESC="Allows the users in this group to update the edit percentmale of the company"
COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PER_DESC="Allows the users in this group to update the edit per of the company"
-COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_SERVICEPROVIDER="Companies Edit Serviceprovider"
-COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_SERVICEPROVIDER_DESC="Allows the users in this group to update the edit serviceprovider of the company"
+COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_SERVICE_PROVIDER="Companies Edit Service Provider"
+COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_SERVICE_PROVIDER_DESC="Allows the users in this group to update the edit service provider of the company"
COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_STATE="Companies Edit State"
COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_STATE_DESC="Allows the users in this group to update the state of the company"
COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_USER="Companies Edit User"
@@ -262,8 +262,8 @@ COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS="Company Results Ed
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS_DESC=" Allows the users in this group to access the edit button."
COM_COSTBENEFITPROJECTION_COMPANY_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Company to customise the alias."
COM_COSTBENEFITPROJECTION_COMPANY_SCALING_FACTORS="Scaling Factors"
-COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER="Serviceprovider"
-COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL="Service Provider"
+COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER="Service Provider"
+COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER_LABEL="Service Provider"
COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_FEMALES="Sick Leave Females"
COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_FEMALES_DESCRIPTION="The total number of sick leave days for females per/year."
COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_FEMALES_HINT="per/year"
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 1e6fa3cd..c4009c49 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php
index 98e1e0fa..00970e5c 100644
--- a/admin/layouts/causerisk/details_above.php
+++ b/admin/layouts/causerisk/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php
index eb9fd1ce..936274e4 100644
--- a/admin/layouts/causerisk/details_left.php
+++ b/admin/layouts/causerisk/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/causerisk/publishing.php
+++ b/admin/layouts/causerisk/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php
index 490f55d8..b0035ac5 100644
--- a/admin/layouts/causerisk/publlshing.php
+++ b/admin/layouts/causerisk/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php
index d65128dc..2266f120 100644
--- a/admin/layouts/company/age_groups_percentages_fullwidth.php
+++ b/admin/layouts/company/age_groups_percentages_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php
index f6cf42b9..15f237c4 100644
--- a/admin/layouts/company/age_groups_percentages_left.php
+++ b/admin/layouts/company/age_groups_percentages_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php
index daf4a6bd..5868fa33 100644
--- a/admin/layouts/company/age_groups_percentages_right.php
+++ b/admin/layouts/company/age_groups_percentages_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php
index 78a71b27..ec954832 100644
--- a/admin/layouts/company/causerisk_selection_fullwidth.php
+++ b/admin/layouts/company/causerisk_selection_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php
index c6af19a1..125f523b 100644
--- a/admin/layouts/company/details_above.php
+++ b/admin/layouts/company/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php
index ff34fdcd..4546f472 100644
--- a/admin/layouts/company/details_left.php
+++ b/admin/layouts/company/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -27,7 +27,7 @@ $fields = $displayData->get('fields') ?: array(
'per',
'email',
'country',
- 'serviceprovider',
+ 'service_provider',
'datayear'
);
diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php
index c816d2e4..b589e8bc 100644
--- a/admin/layouts/company/details_right.php
+++ b/admin/layouts/company/details_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php
index 7aa51c1d..74e2b020 100644
--- a/admin/layouts/company/details_under.php
+++ b/admin/layouts/company/details_under.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php
index 5b0f49f9..d04be49f 100644
--- a/admin/layouts/company/interventions_fullwidth.php
+++ b/admin/layouts/company/interventions_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->avtinterventions;
+$items = $displayData->qntinterventions;
$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 232eea20..8c323d72 100644
--- a/admin/layouts/company/publishing.php
+++ b/admin/layouts/company/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php
index 490f55d8..b0035ac5 100644
--- a/admin/layouts/company/publlshing.php
+++ b/admin/layouts/company/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php
index 577092c0..6bdb2c98 100644
--- a/admin/layouts/company/scaling_factors_fullwidth.php
+++ b/admin/layouts/company/scaling_factors_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->ttcscaling_factors;
+$items = $displayData->olrscaling_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 f6cf42b9..15f237c4 100644
--- a/admin/layouts/country/age_groups_percentages_left.php
+++ b/admin/layouts/country/age_groups_percentages_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php
index daf4a6bd..5868fa33 100644
--- a/admin/layouts/country/age_groups_percentages_right.php
+++ b/admin/layouts/country/age_groups_percentages_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php
index c863c63b..581f1ee9 100644
--- a/admin/layouts/country/causerisk_selection_fullwidth.php
+++ b/admin/layouts/country/causerisk_selection_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php
index 64d32616..ef94c66d 100644
--- a/admin/layouts/country/companies_fullwidth.php
+++ b/admin/layouts/country/companies_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->nxwcompanies;
+$items = $displayData->iebcompanies;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";
@@ -52,7 +52,7 @@ $can = CostbenefitprojectionHelper::getActions('company');
|
-
+
|
@@ -105,10 +105,10 @@ $can = CostbenefitprojectionHelper::getActions('company');
escape($item->country_name); ?>
|
- authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int)$item->serviceprovider)): ?>
- serviceprovider_user)->name; ?>
+ authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int)$item->service_provider)): ?>
+ service_provider_user)->name; ?>
- serviceprovider_user)->name; ?>
+ service_provider_user)->name; ?>
|
diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php
index 2bafe6f8..35a4c321 100644
--- a/admin/layouts/country/details_above.php
+++ b/admin/layouts/country/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php
index 8e1ba33c..5a65aa86 100644
--- a/admin/layouts/country/details_left.php
+++ b/admin/layouts/country/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php
index 5df6db99..06b85825 100644
--- a/admin/layouts/country/details_right.php
+++ b/admin/layouts/country/details_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php
index b5794719..cb4bc013 100644
--- a/admin/layouts/country/health_data_totals_left.php
+++ b/admin/layouts/country/health_data_totals_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php
index fc0f274e..910e623d 100644
--- a/admin/layouts/country/health_data_totals_right.php
+++ b/admin/layouts/country/health_data_totals_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php
index a8dc2227..7c4ffd09 100644
--- a/admin/layouts/country/interventions_fullwidth.php
+++ b/admin/layouts/country/interventions_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->zxninterventions;
+$items = $displayData->elvinterventions;
$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 a16db6d9..89a7421b 100644
--- a/admin/layouts/country/public_details_fullwidth.php
+++ b/admin/layouts/country/public_details_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php
index 490f55d8..b0035ac5 100644
--- a/admin/layouts/country/publlshing.php
+++ b/admin/layouts/country/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php
index 22dd7281..f62b9562 100644
--- a/admin/layouts/country/service_providers_fullwidth.php
+++ b/admin/layouts/country/service_providers_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->fnxservice_providers;
+$items = $displayData->wnzservice_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 a3b95025..f2d069aa 100644
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php
index b303047a..5a7f7b5c 100644
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php
index 27feaee7..468b9656 100644
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php
index 490f55d8..b0035ac5 100644
--- a/admin/layouts/currency/publlshing.php
+++ b/admin/layouts/currency/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php
index 6e200a2f..3d476084 100644
--- a/admin/layouts/databreakdownmalefemale.php
+++ b/admin/layouts/databreakdownmalefemale.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php
index 060384d1..888ce5b7 100644
--- a/admin/layouts/health_data/details_above.php
+++ b/admin/layouts/health_data/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php
index 6e47f6a6..f7bf50f9 100644
--- a/admin/layouts/health_data/details_left.php
+++ b/admin/layouts/health_data/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php
index 9366f394..0180d26d 100644
--- a/admin/layouts/health_data/details_right.php
+++ b/admin/layouts/health_data/details_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php
index 5c0c9592..d49aaeb1 100644
--- a/admin/layouts/health_data/details_rightside.php
+++ b/admin/layouts/health_data/details_rightside.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/health_data/publishing.php
+++ b/admin/layouts/health_data/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php
index 490f55d8..b0035ac5 100644
--- a/admin/layouts/health_data/publlshing.php
+++ b/admin/layouts/health_data/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 6678d6ad..cbd15649 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index 1c38dde8..8215c33f 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index b03a40f5..74af54fc 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 947fe7dd..2e56e90e 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index 7aa51c1d..74e2b020 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index ef5db82d..0be6cf1d 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php
index 77f16f4e..58c7e857 100644
--- a/admin/layouts/intervention/details_above.php
+++ b/admin/layouts/intervention/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php
index c48b1159..c1e608b2 100644
--- a/admin/layouts/intervention/details_fullwidth.php
+++ b/admin/layouts/intervention/details_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php
index 7aa51c1d..74e2b020 100644
--- a/admin/layouts/intervention/details_under.php
+++ b/admin/layouts/intervention/details_under.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/intervention/publishing.php
+++ b/admin/layouts/intervention/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php
index ef5db82d..0be6cf1d 100644
--- a/admin/layouts/intervention/publlshing.php
+++ b/admin/layouts/intervention/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php
index f20629b5..8f98677f 100644
--- a/admin/layouts/intervention/settings_fullwidth.php
+++ b/admin/layouts/intervention/settings_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php
index 89e4f611..6e2321f8 100644
--- a/admin/layouts/intervention/settings_left.php
+++ b/admin/layouts/intervention/settings_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php
index 583a9baf..9b627a18 100644
--- a/admin/layouts/scaling_factor/details_above.php
+++ b/admin/layouts/scaling_factor/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php
index 86c794fd..58cc5ccb 100644
--- a/admin/layouts/scaling_factor/details_left.php
+++ b/admin/layouts/scaling_factor/details_left.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php
index 6c6278d4..5563ad83 100644
--- a/admin/layouts/scaling_factor/details_right.php
+++ b/admin/layouts/scaling_factor/details_right.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/scaling_factor/publishing.php
+++ b/admin/layouts/scaling_factor/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php
index ef5db82d..0be6cf1d 100644
--- a/admin/layouts/scaling_factor/publlshing.php
+++ b/admin/layouts/scaling_factor/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php
index 1754fe3f..374070b7 100644
--- a/admin/layouts/service_provider/companies_fullwidth.php
+++ b/admin/layouts/service_provider/companies_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access');
// set the defaults
-$items = $displayData->krrcompanies;
+$items = $displayData->pbkcompanies;
$user = JFactory::getUser();
$id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";
@@ -52,7 +52,7 @@ $can = CostbenefitprojectionHelper::getActions('company');
|
-
+
|
@@ -109,7 +109,7 @@ $can = CostbenefitprojectionHelper::getActions('company');
|
- serviceprovider_user)->name; ?>
+ service_provider_user)->name; ?>
|
per); ?>
diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php
index e0ae4f3f..e9f451f2 100644
--- a/admin/layouts/service_provider/details_above.php
+++ b/admin/layouts/service_provider/details_above.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php
index cba1b2f2..b87803e6 100644
--- a/admin/layouts/service_provider/details_fullwidth.php
+++ b/admin/layouts/service_provider/details_fullwidth.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php
index 232eea20..8c323d72 100644
--- a/admin/layouts/service_provider/publishing.php
+++ b/admin/layouts/service_provider/publishing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php
index ef5db82d..0be6cf1d 100644
--- a/admin/layouts/service_provider/publlshing.php
+++ b/admin/layouts/service_provider/publlshing.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index ee9197f6..1fe0ccc7 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php
index 8bcabbdb..5d185d99 100644
--- a/admin/models/causerisk.php
+++ b/admin/models/causerisk.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -163,6 +163,19 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php
index b951b5aa..6912af87 100644
--- a/admin/models/causesrisks.php
+++ b/admin/models/causesrisks.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php
index acc2f92b..84f5cb82 100644
--- a/admin/models/combinedresults.php
+++ b/admin/models/combinedresults.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -100,8 +100,8 @@ class CostbenefitprojectionModelCombinedresults extends JModelList
// Get from #__costbenefitprojection_company as a
$query->select($db->quoteName(
- array('a.id','a.name','a.user','a.department','a.per','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
- array('id','name','user','department','per','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
+ array('a.id','a.name','a.user','a.department','a.per','a.country','a.service_provider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
+ array('id','name','user','department','per','country','service_provider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
// Get from #__costbenefitprojection_country as e
diff --git a/admin/models/companies.php b/admin/models/companies.php
index 02d58c71..c084d3e0 100644
--- a/admin/models/companies.php
+++ b/admin/models/companies.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -42,7 +42,7 @@ class CostbenefitprojectionModelCompanies extends JModelList
'a.user','user',
'a.department','department',
'a.country','country',
- 'a.serviceprovider','serviceprovider',
+ 'a.service_provider','service_provider',
'a.per','per'
);
}
@@ -76,8 +76,8 @@ class CostbenefitprojectionModelCompanies extends JModelList
$country = $this->getUserStateFromRequest($this->context . '.filter.country', 'filter_country');
$this->setState('filter.country', $country);
- $serviceprovider = $this->getUserStateFromRequest($this->context . '.filter.serviceprovider', 'filter_serviceprovider');
- $this->setState('filter.serviceprovider', $serviceprovider);
+ $service_provider = $this->getUserStateFromRequest($this->context . '.filter.service_provider', 'filter_service_provider');
+ $this->setState('filter.service_provider', $service_provider);
$per = $this->getUserStateFromRequest($this->context . '.filter.per', 'filter_per');
$this->setState('filter.per', $per);
@@ -232,8 +232,8 @@ class CostbenefitprojectionModelCompanies extends JModelList
$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
// From the costbenefitprojection_service_provider table.
- $query->select($db->quoteName('i.user','serviceprovider_user'));
- $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
+ $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 published state
$published = $this->getState('filter.published');
@@ -271,7 +271,7 @@ class CostbenefitprojectionModelCompanies extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search, true) . '%');
- $query->where('(a.name LIKE '.$search.' OR a.email LIKE '.$search.' OR a.user LIKE '.$search.' OR g.name LIKE '.$search.' OR a.department LIKE '.$search.' OR a.country LIKE '.$search.' OR h.name LIKE '.$search.' OR a.serviceprovider LIKE '.$search.' OR i.user LIKE '.$search.' OR a.per LIKE '.$search.')');
+ $query->where('(a.name LIKE '.$search.' OR a.email LIKE '.$search.' OR a.user LIKE '.$search.' OR g.name LIKE '.$search.' OR a.department LIKE '.$search.' OR a.country LIKE '.$search.' OR h.name LIKE '.$search.' OR a.service_provider LIKE '.$search.' OR i.user LIKE '.$search.' OR a.per LIKE '.$search.')');
}
}
@@ -285,10 +285,10 @@ class CostbenefitprojectionModelCompanies extends JModelList
{
$query->where('a.country = ' . $db->quote($db->escape($country, true)));
}
- // Filter by serviceprovider.
- if ($serviceprovider = $this->getState('filter.serviceprovider'))
+ // Filter by service_provider.
+ if ($service_provider = $this->getState('filter.service_provider'))
{
- $query->where('a.serviceprovider = ' . $db->quote($db->escape($serviceprovider, true)));
+ $query->where('a.service_provider = ' . $db->quote($db->escape($service_provider, true)));
}
// Filter by Per.
if ($per = $this->getState('filter.per'))
@@ -486,7 +486,7 @@ class CostbenefitprojectionModelCompanies extends JModelList
$id .= ':' . $this->getState('filter.user');
$id .= ':' . $this->getState('filter.department');
$id .= ':' . $this->getState('filter.country');
- $id .= ':' . $this->getState('filter.serviceprovider');
+ $id .= ':' . $this->getState('filter.service_provider');
$id .= ':' . $this->getState('filter.per');
return parent::getStoreId($id);
diff --git a/admin/models/company.php b/admin/models/company.php
index 2cda82fc..ce5c6851 100644
--- a/admin/models/company.php
+++ b/admin/models/company.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_costbenefitprojection.company');
}
}
- $this->companyatyc = $item->id;
- $this->companyrlyy = $item->id;
+ $this->companyajof = $item->id;
+ $this->companyyyxj = $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 getTtcscaling_factors()
+ public function getOlrscaling_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 companyatyc global.
- $companyatyc = $this->companyatyc;
- if (is_numeric($companyatyc ))
+ // Filter by companyajof global.
+ $companyajof = $this->companyajof;
+ if (is_numeric($companyajof ))
{
- $query->where('a.company = ' . (int) $companyatyc );
+ $query->where('a.company = ' . (int) $companyajof );
}
- elseif (is_string($companyatyc))
+ elseif (is_string($companyajof))
{
- $query->where('a.company = ' . $db->quote($companyatyc));
+ $query->where('a.company = ' . $db->quote($companyajof));
}
else
{
@@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getAvtinterventions()
+ public function getQntinterventions()
{
// 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 companyrlyy global.
- $companyrlyy = $this->companyrlyy;
- if (is_numeric($companyrlyy ))
+ // Filter by companyyyxj global.
+ $companyyyxj = $this->companyyyxj;
+ if (is_numeric($companyyyxj ))
{
- $query->where('a.company = ' . (int) $companyrlyy );
+ $query->where('a.company = ' . (int) $companyyyxj );
}
- elseif (is_string($companyrlyy))
+ elseif (is_string($companyyyxj))
{
- $query->where('a.company = ' . $db->quote($companyrlyy));
+ $query->where('a.company = ' . $db->quote($companyyyxj));
}
else
{
@@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert type
- $item->type = $this->selectionTranslationAvtinterventions($item->type, 'type');
+ $item->type = $this->selectionTranslationQntinterventions($item->type, 'type');
}
}
@@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationAvtinterventions($value,$name)
+ public function selectionTranslationQntinterventions($value,$name)
{
// Array of type language strings
if ($name == 'type')
@@ -516,20 +516,20 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
$form->setFieldAttribute('country', 'required', 'false');
}
}
- // Modify the form based on Edit Serviceprovider access controls.
- if ($id != 0 && (!$user->authorise('company.edit.serviceprovider', 'com_costbenefitprojection.company.' . (int) $id))
- || ($id == 0 && !$user->authorise('company.edit.serviceprovider', 'com_costbenefitprojection')))
+ // Modify the form based on Edit Service Provider access controls.
+ if ($id != 0 && (!$user->authorise('company.edit.service_provider', 'com_costbenefitprojection.company.' . (int) $id))
+ || ($id == 0 && !$user->authorise('company.edit.service_provider', 'com_costbenefitprojection')))
{
// Disable fields for display.
- $form->setFieldAttribute('serviceprovider', 'disabled', 'true');
+ $form->setFieldAttribute('service_provider', 'disabled', 'true');
// Disable fields for display.
- $form->setFieldAttribute('serviceprovider', 'readonly', 'true');
- if (!$form->getValue('serviceprovider'))
+ $form->setFieldAttribute('service_provider', 'readonly', 'true');
+ if (!$form->getValue('service_provider'))
{
// Disable fields while saving.
- $form->setFieldAttribute('serviceprovider', 'filter', 'unset');
+ $form->setFieldAttribute('service_provider', 'filter', 'unset');
// Disable fields while saving.
- $form->setFieldAttribute('serviceprovider', 'required', 'false');
+ $form->setFieldAttribute('service_provider', 'required', 'false');
}
}
// Modify the form based on Edit Per access controls.
@@ -621,6 +621,19 @@ class CostbenefitprojectionModelCompany extends JModelAdmin
$form->setFieldAttribute('percentmale', 'required', 'false');
}
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php
index bc3e65dc..daffeb3e 100644
--- a/admin/models/companyresults.php
+++ b/admin/models/companyresults.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -145,8 +145,8 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem
// Get from #__costbenefitprojection_company as a
$query->select($db->quoteName(
- array('a.id','a.name','a.user','a.department','a.per','a.country','a.serviceprovider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
- array('id','name','user','department','per','country','serviceprovider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
+ array('a.id','a.name','a.user','a.department','a.per','a.country','a.service_provider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'),
+ array('id','name','user','department','per','country','service_provider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access')));
$query->from($db->quoteName('#__costbenefitprojection_company', 'a'));
// Get from #__costbenefitprojection_country as e
diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php
index 85b0ee3d..6923d050 100644
--- a/admin/models/costbenefitprojection.php
+++ b/admin/models/costbenefitprojection.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/countries.php b/admin/models/countries.php
index 5a1f56ce..e4d1b239 100644
--- a/admin/models/countries.php
+++ b/admin/models/countries.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/country.php b/admin/models/country.php
index 7b4e6bb3..ddbf520d 100644
--- a/admin/models/country.php
+++ b/admin/models/country.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -101,9 +101,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_costbenefitprojection.country');
}
}
- $this->countrybexq = $item->id;
- $this->countryxprp = $item->id;
- $this->countryscqw = $item->id;
+ $this->countryozjb = $item->id;
+ $this->countryhtgc = $item->id;
+ $this->countryxhbr = $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 getZxninterventions()
+ public function getElvinterventions()
{
// 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 countrybexq global.
- $countrybexq = $this->countrybexq;
- if (is_numeric($countrybexq ))
+ // Filter by countryozjb global.
+ $countryozjb = $this->countryozjb;
+ if (is_numeric($countryozjb ))
{
- $query->where('a.country = ' . (int) $countrybexq );
+ $query->where('a.country = ' . (int) $countryozjb );
}
- elseif (is_string($countrybexq))
+ elseif (is_string($countryozjb))
{
- $query->where('a.country = ' . $db->quote($countrybexq));
+ $query->where('a.country = ' . $db->quote($countryozjb));
}
else
{
@@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert type
- $item->type = $this->selectionTranslationZxninterventions($item->type, 'type');
+ $item->type = $this->selectionTranslationElvinterventions($item->type, 'type');
}
}
@@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationZxninterventions($value,$name)
+ public function selectionTranslationElvinterventions($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 getFnxservice_providers()
+ public function getWnzservice_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 countryxprp global.
- $countryxprp = $this->countryxprp;
- if (is_numeric($countryxprp ))
+ // Filter by countryhtgc global.
+ $countryhtgc = $this->countryhtgc;
+ if (is_numeric($countryhtgc ))
{
- $query->where('a.country = ' . (int) $countryxprp );
+ $query->where('a.country = ' . (int) $countryhtgc );
}
- elseif (is_string($countryxprp))
+ elseif (is_string($countryhtgc))
{
- $query->where('a.country = ' . $db->quote($countryxprp));
+ $query->where('a.country = ' . $db->quote($countryhtgc));
}
else
{
@@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
- public function getNxwcompanies()
+ public function getIebcompanies()
{
// Get the user object.
$user = JFactory::getUser();
@@ -376,18 +376,18 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
// From the costbenefitprojection_service_provider table.
- $query->select($db->quoteName('i.user','serviceprovider_user'));
- $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
+ $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 countryscqw global.
- $countryscqw = $this->countryscqw;
- if (is_numeric($countryscqw ))
+ // Filter by countryxhbr global.
+ $countryxhbr = $this->countryxhbr;
+ if (is_numeric($countryxhbr ))
{
- $query->where('a.country = ' . (int) $countryscqw );
+ $query->where('a.country = ' . (int) $countryxhbr );
}
- elseif (is_string($countryscqw))
+ elseif (is_string($countryxhbr))
{
- $query->where('a.country = ' . $db->quote($countryscqw));
+ $query->where('a.country = ' . $db->quote($countryxhbr));
}
else
{
@@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert department
- $item->department = $this->selectionTranslationNxwcompanies($item->department, 'department');
+ $item->department = $this->selectionTranslationIebcompanies($item->department, 'department');
// convert per
- $item->per = $this->selectionTranslationNxwcompanies($item->per, 'per');
+ $item->per = $this->selectionTranslationIebcompanies($item->per, 'per');
}
}
@@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationNxwcompanies($value,$name)
+ public function selectionTranslationIebcompanies($value,$name)
{
// Array of department language strings
if ($name == 'department')
@@ -553,6 +553,19 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/currencies.php b/admin/models/currencies.php
index 090450bb..19360313 100644
--- a/admin/models/currencies.php
+++ b/admin/models/currencies.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/currency.php b/admin/models/currency.php
index c38fd3af..0feb7fd8 100644
--- a/admin/models/currency.php
+++ b/admin/models/currency.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -163,6 +163,19 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 451e64f4..92aa2966 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php
index 7ac3e041..03267ba6 100644
--- a/admin/models/fields/causesrisks.php
+++ b/admin/models/fields/causesrisks.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php
index 08d78179..5254dbf1 100644
--- a/admin/models/fields/causesriskscheck.php
+++ b/admin/models/fields/causesriskscheck.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php
index 435bdff5..bb13ec71 100644
--- a/admin/models/fields/company.php
+++ b/admin/models/fields/company.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php
index 4cab976e..c713dd59 100644
--- a/admin/models/fields/countries.php
+++ b/admin/models/fields/countries.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php
index 0b109391..5237c44b 100644
--- a/admin/models/fields/countryuser.php
+++ b/admin/models/fields/countryuser.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php
index 41bf5d9a..7b5c94e0 100644
--- a/admin/models/fields/currency.php
+++ b/admin/models/fields/currency.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php
index 938bf7c5..e3b44472 100644
--- a/admin/models/fields/datayear.php
+++ b/admin/models/fields/datayear.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php
index 2de3aa99..4a62926a 100644
--- a/admin/models/fields/interventions.php
+++ b/admin/models/fields/interventions.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php
index 92ca3b83..016f7ae7 100644
--- a/admin/models/fields/memberuser.php
+++ b/admin/models/fields/memberuser.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php
index 5d01d1c4..343373e9 100644
--- a/admin/models/fields/serviceprovider.php
+++ b/admin/models/fields/serviceprovider.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -92,7 +92,7 @@ class JFormFieldServiceprovider extends JFormFieldList
// Create a new query object.
$db = JFactory::getDBO();
$query = $db->getQuery(true);
- $query->select($db->quoteName(array('a.id','a.user'),array('id','serviceprovider_user')));
+ $query->select($db->quoteName(array('a.id','a.user'),array('id','service_provider_user')));
$query->from($db->quoteName('#__costbenefitprojection_service_provider', 'a'));
$query->where($db->quoteName('a.published') . ' = 1');
if (!$user->authorise('core.options', 'com_costbenefitprojection'))
@@ -118,7 +118,7 @@ class JFormFieldServiceprovider extends JFormFieldList
{
foreach($items as $item)
{
- $options[] = JHtml::_('select.option', $item->id, JFactory::getUser($item->serviceprovider_user)->name);
+ $options[] = JHtml::_('select.option', $item->id, JFactory::getUser($item->service_provider_user)->name);
}
}
return $options;
diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php
index 6b02e118..c8885153 100644
--- a/admin/models/fields/serviceprovideruser.php
+++ b/admin/models/fields/serviceprovideruser.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js
index 6fd13e88..9cf6fa91 100644
--- a/admin/models/forms/causerisk.js
+++ b/admin/models/forms/causerisk.js
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js
index a4cea50a..2d9c6c45 100644
--- a/admin/models/forms/company.js
+++ b/admin/models/forms/company.js
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -17,178 +17,178 @@
/------------------------------------------------------------------------------------------------------*/
// Some Global Values
-jform_NgVskxnHKL_required = false;
-jform_NgVskxnjTx_required = false;
-jform_NgVskxnNzv_required = false;
-jform_NgVskxnzln_required = false;
-jform_NgVskxnOoy_required = false;
-jform_NgVskxnvZu_required = false;
-jform_NgVskxndxz_required = false;
+jform_KnoPOIjccb_required = false;
+jform_KnoPOIjyfw_required = false;
+jform_KnoPOIjUoF_required = false;
+jform_KnoPOIjRKe_required = false;
+jform_KnoPOIjlOb_required = false;
+jform_KnoPOIjNTk_required = false;
+jform_KnoPOIjaAE_required = false;
// Initial Script
jQuery(document).ready(function()
{
- var department_NgVskxn = jQuery("#jform_department input[type='radio']:checked").val();
- NgVskxn(department_NgVskxn);
+ var department_KnoPOIj = jQuery("#jform_department input[type='radio']:checked").val();
+ KnoPOIj(department_KnoPOIj);
- var department_ocAanot = jQuery("#jform_department input[type='radio']:checked").val();
- ocAanot(department_ocAanot);
+ var department_hOoOaLC = jQuery("#jform_department input[type='radio']:checked").val();
+ hOoOaLC(department_hOoOaLC);
});
-// the NgVskxn function
-function NgVskxn(department_NgVskxn)
+// the KnoPOIj function
+function KnoPOIj(department_KnoPOIj)
{
// set the function logic
- if (department_NgVskxn == 2)
+ if (department_KnoPOIj == 2)
{
jQuery('#jform_causesrisks').closest('.control-group').show();
- if (jform_NgVskxnHKL_required)
+ if (jform_KnoPOIjccb_required)
{
updateFieldRequired('causesrisks',0);
jQuery('#jform_causesrisks').prop('required','required');
jQuery('#jform_causesrisks').attr('aria-required',true);
jQuery('#jform_causesrisks').addClass('required');
- jform_NgVskxnHKL_required = false;
+ jform_KnoPOIjccb_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_NgVskxnjTx_required)
+ if (jform_KnoPOIjyfw_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_NgVskxnjTx_required = false;
+ jform_KnoPOIjyfw_required = false;
}
jQuery('#jform_medical_turnovers_females').closest('.control-group').show();
- if (jform_NgVskxnNzv_required)
+ if (jform_KnoPOIjUoF_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_NgVskxnNzv_required = false;
+ jform_KnoPOIjUoF_required = false;
}
jQuery('#jform_medical_turnovers_males').closest('.control-group').show();
- if (jform_NgVskxnzln_required)
+ if (jform_KnoPOIjRKe_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_NgVskxnzln_required = false;
+ jform_KnoPOIjRKe_required = false;
}
jQuery('#jform_sick_leave_females').closest('.control-group').show();
- if (jform_NgVskxnOoy_required)
+ if (jform_KnoPOIjlOb_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_NgVskxnOoy_required = false;
+ jform_KnoPOIjlOb_required = false;
}
jQuery('#jform_sick_leave_males').closest('.control-group').show();
- if (jform_NgVskxnvZu_required)
+ if (jform_KnoPOIjNTk_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_NgVskxnvZu_required = false;
+ jform_KnoPOIjNTk_required = false;
}
jQuery('#jform_total_healthcare').closest('.control-group').show();
- if (jform_NgVskxndxz_required)
+ if (jform_KnoPOIjaAE_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_NgVskxndxz_required = false;
+ jform_KnoPOIjaAE_required = false;
}
}
else
{
jQuery('#jform_causesrisks').closest('.control-group').hide();
- if (!jform_NgVskxnHKL_required)
+ if (!jform_KnoPOIjccb_required)
{
updateFieldRequired('causesrisks',1);
jQuery('#jform_causesrisks').removeAttr('required');
jQuery('#jform_causesrisks').removeAttr('aria-required');
jQuery('#jform_causesrisks').removeClass('required');
- jform_NgVskxnHKL_required = true;
+ jform_KnoPOIjccb_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_NgVskxnjTx_required)
+ if (!jform_KnoPOIjyfw_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_NgVskxnjTx_required = true;
+ jform_KnoPOIjyfw_required = true;
}
jQuery('#jform_medical_turnovers_females').closest('.control-group').hide();
- if (!jform_NgVskxnNzv_required)
+ if (!jform_KnoPOIjUoF_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_NgVskxnNzv_required = true;
+ jform_KnoPOIjUoF_required = true;
}
jQuery('#jform_medical_turnovers_males').closest('.control-group').hide();
- if (!jform_NgVskxnzln_required)
+ if (!jform_KnoPOIjRKe_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_NgVskxnzln_required = true;
+ jform_KnoPOIjRKe_required = true;
}
jQuery('#jform_sick_leave_females').closest('.control-group').hide();
- if (!jform_NgVskxnOoy_required)
+ if (!jform_KnoPOIjlOb_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_NgVskxnOoy_required = true;
+ jform_KnoPOIjlOb_required = true;
}
jQuery('#jform_sick_leave_males').closest('.control-group').hide();
- if (!jform_NgVskxnvZu_required)
+ if (!jform_KnoPOIjNTk_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_NgVskxnvZu_required = true;
+ jform_KnoPOIjNTk_required = true;
}
jQuery('#jform_total_healthcare').closest('.control-group').hide();
- if (!jform_NgVskxndxz_required)
+ if (!jform_KnoPOIjaAE_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_NgVskxndxz_required = true;
+ jform_KnoPOIjaAE_required = true;
}
}
}
-// the ocAanot function
-function ocAanot(department_ocAanot)
+// the hOoOaLC function
+function hOoOaLC(department_hOoOaLC)
{
// set the function logic
- if (department_ocAanot == 1)
+ if (department_hOoOaLC == 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 24b6b4a4..7a1075ca 100644
--- a/admin/models/forms/company.xml
+++ b/admin/models/forms/company.xml
@@ -148,11 +148,11 @@
default="0"
required="true"
/>
-
+
setFieldAttribute('femaleyld', 'required', 'false');
}
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php
index eeacbb44..cf507f6f 100644
--- a/admin/models/health_data_sets.php
+++ b/admin/models/health_data_sets.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 68e2ebfe..8eb4f113 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -169,6 +169,19 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index cd0971a0..b7f458a8 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/import.php b/admin/models/import.php
index b5c8b6cc..526922e2 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/intervention.php b/admin/models/intervention.php
index a04aa89b..bb63e4b6 100644
--- a/admin/models/intervention.php
+++ b/admin/models/intervention.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -169,6 +169,19 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/interventions.php b/admin/models/interventions.php
index 5b4904f9..e5f9c690 100644
--- a/admin/models/interventions.php
+++ b/admin/models/interventions.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php
index 3019a6a3..c3a98114 100644
--- a/admin/models/scaling_factor.php
+++ b/admin/models/scaling_factor.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -163,6 +163,19 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php
index 9ce571ae..dae0254b 100644
--- a/admin/models/scaling_factors.php
+++ b/admin/models/scaling_factors.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php
index 07edec58..d2f23d8b 100644
--- a/admin/models/service_provider.php
+++ b/admin/models/service_provider.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
$item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider');
}
}
- $this->serviceproviderxdpg = $item->id;
+ $this->service_providerustf = $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 getKrrcompanies()
+ public function getPbkcompanies()
{
// Get the user object.
$user = JFactory::getUser();
@@ -145,22 +145,22 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
$query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')');
// From the costbenefitprojection_service_provider table.
- $query->select($db->quoteName('i.user','serviceprovider_user'));
- $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')');
+ $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 serviceproviderxdpg global.
- $serviceproviderxdpg = $this->serviceproviderxdpg;
- if (is_numeric($serviceproviderxdpg ))
+ // Filter by service_providerustf global.
+ $service_providerustf = $this->service_providerustf;
+ if (is_numeric($service_providerustf ))
{
- $query->where('a.serviceprovider = ' . (int) $serviceproviderxdpg );
+ $query->where('a.service_provider = ' . (int) $service_providerustf );
}
- elseif (is_string($serviceproviderxdpg))
+ elseif (is_string($service_providerustf))
{
- $query->where('a.serviceprovider = ' . $db->quote($serviceproviderxdpg));
+ $query->where('a.service_provider = ' . $db->quote($service_providerustf));
}
else
{
- $query->where('a.serviceprovider = -5');
+ $query->where('a.service_provider = -5');
}
// Join over the asset groups.
@@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert department
- $item->department = $this->selectionTranslationKrrcompanies($item->department, 'department');
+ $item->department = $this->selectionTranslationPbkcompanies($item->department, 'department');
// convert per
- $item->per = $this->selectionTranslationKrrcompanies($item->per, 'per');
+ $item->per = $this->selectionTranslationPbkcompanies($item->per, 'per');
}
}
@@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
*
* @return translatable string
*/
- public function selectionTranslationKrrcompanies($value,$name)
+ public function selectionTranslationPbkcompanies($value,$name)
{
// Array of department language strings
if ($name == 'department')
@@ -322,6 +322,19 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
// Disable fields while saving.
$form->setFieldAttribute('created', 'filter', 'unset');
}
+ // Only load these values if no id is found
+ if (0 == $id)
+ {
+ // Set redirected field name
+ $redirectedField = $jinput->get('ref', null, 'STRING');
+ // Set redirected field value
+ $redirectedValue = $jinput->get('refid', 0, 'INT');
+ if (0 != $redirectedValue && $redirectedField)
+ {
+ // Now set the local-redirected field default value
+ $form->setValue($redirectedField, null, $redirectedValue);
+ }
+ }
return $form;
}
diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php
index 29cd2612..d057ffe2 100644
--- a/admin/models/service_providers.php
+++ b/admin/models/service_providers.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index a2c8e2f6..52df369c 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_company` (
`percentfemale` TEXT NOT NULL DEFAULT '',
`percentmale` TEXT NOT NULL DEFAULT '',
`productivity_losses` VARCHAR(64) NOT NULL DEFAULT '',
- `serviceprovider` INT(11) NOT NULL DEFAULT '0',
+ `service_provider` INT(11) NOT NULL DEFAULT '0',
`sick_leave_females` VARCHAR(255) NOT NULL DEFAULT '',
`sick_leave_males` VARCHAR(255) NOT NULL DEFAULT '',
`total_healthcare` VARCHAR(255) NOT NULL DEFAULT '',
@@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_company` (
KEY `idx_name` (`name`),
KEY `idx_user` (`user`),
KEY `idx_country` (`country`),
- KEY `idx_serviceprovider` (`serviceprovider`),
+ KEY `idx_service_provider` (`service_provider`),
KEY `idx_per` (`per`),
KEY `idx_datayear` (`datayear`),
KEY `idx_working_days` (`working_days`),
diff --git a/admin/sql/updates/mysql/3.3.3.sql b/admin/sql/updates/mysql/3.3.3.sql
new file mode 100644
index 00000000..98547d4c
--- /dev/null
+++ b/admin/sql/updates/mysql/3.3.3.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__costbenefitprojection_company` CHANGE `serviceprovider` `service_provider` INT( 11 ) NOT NULL DEFAULT '0';
diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php
index f3586235..d43aed6b 100644
--- a/admin/tables/causerisk.php
+++ b/admin/tables/causerisk.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/company.php b/admin/tables/company.php
index 35549683..caeed3f9 100644
--- a/admin/tables/company.php
+++ b/admin/tables/company.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/country.php b/admin/tables/country.php
index 599a8e5a..7aa43276 100644
--- a/admin/tables/country.php
+++ b/admin/tables/country.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/currency.php b/admin/tables/currency.php
index cff46485..15ec1da7 100644
--- a/admin/tables/currency.php
+++ b/admin/tables/currency.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php
index f3365c1a..830c11ac 100644
--- a/admin/tables/health_data.php
+++ b/admin/tables/health_data.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 2907ec66..69ceb594 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php
index 48730a41..34f18bad 100644
--- a/admin/tables/intervention.php
+++ b/admin/tables/intervention.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php
index 7dad0ff1..7963884e 100644
--- a/admin/tables/scaling_factor.php
+++ b/admin/tables/scaling_factor.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php
index 85c7fdf0..32a5763a 100644
--- a/admin/tables/service_provider.php
+++ b/admin/tables/service_provider.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/vdm.php b/admin/vdm.php
index c6399452..a6c87c19 100644
--- a/admin/vdm.php
+++ b/admin/vdm.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js
index a10b926e..75147885 100644
--- a/admin/views/causerisk/submitbutton.js
+++ b/admin/views/causerisk/submitbutton.js
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php
index 606230cd..59ffc291 100644
--- a/admin/views/causerisk/tmpl/edit.php
+++ b/admin/views/causerisk/tmpl/edit.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php
index 37a6b98b..e6ce97b9 100644
--- a/admin/views/causerisk/view.html.php
+++ b/admin/views/causerisk/view.html.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php
index 0af84ee2..0707f0c9 100644
--- a/admin/views/causesrisks/tmpl/default.php
+++ b/admin/views/causesrisks/tmpl/default.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php
index 9cfbfbf4..b54ca99e 100644
--- a/admin/views/causesrisks/tmpl/default_batch_body.php
+++ b/admin/views/causesrisks/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php
index 462930a3..3db5534b 100644
--- a/admin/views/causesrisks/tmpl/default_batch_footer.php
+++ b/admin/views/causesrisks/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php
index 0f7ce422..eb8cab1f 100644
--- a/admin/views/causesrisks/tmpl/default_body.php
+++ b/admin/views/causesrisks/tmpl/default_body.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php
index 6e9552d0..cd607def 100644
--- a/admin/views/causesrisks/tmpl/default_foot.php
+++ b/admin/views/causesrisks/tmpl/default_foot.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php
index 9b3d905e..63af870c 100644
--- a/admin/views/causesrisks/tmpl/default_head.php
+++ b/admin/views/causesrisks/tmpl/default_head.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php
index e9676370..af614cad 100644
--- a/admin/views/causesrisks/tmpl/default_toolbar.php
+++ b/admin/views/causesrisks/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php
index b89adca3..e8c585ab 100644
--- a/admin/views/causesrisks/view.html.php
+++ b/admin/views/causesrisks/view.html.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php
index 62cd6322..688faa8b 100644
--- a/admin/views/combinedresults/tmpl/default.php
+++ b/admin/views/combinedresults/tmpl/default.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php
index 039ea783..ddbd2a36 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
index 4481aa8c..e17ef1a5 100644
--- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
+++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
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 f245f40f..a0828f17 100644
--- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
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 bd56c6b7..f0916579 100644
--- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
+++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
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 6b9e5fb3..48965cd2 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,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php
index 826af948..43d8ae12 100644
--- a/admin/views/combinedresults/tmpl/default_main.php
+++ b/admin/views/combinedresults/tmpl/default_main.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
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 04c4cccd..f342d7c4 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,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
index 58f26462..c9146ade 100644
--- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php
+++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
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 391f563f..d4ff15bf 100644
--- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
+++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
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 660caf80..5a7b3ae6 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,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php
index 9a958539..9e09f469 100644
--- a/admin/views/combinedresults/view.html.php
+++ b/admin/views/combinedresults/view.html.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php
index 52f6fb42..462a5975 100644
--- a/admin/views/companies/tmpl/default.php
+++ b/admin/views/companies/tmpl/default.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php
index 93f5290f..4557b581 100644
--- a/admin/views/companies/tmpl/default_batch_body.php
+++ b/admin/views/companies/tmpl/default_batch_body.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php
index a6e4dcba..54c39e0d 100644
--- a/admin/views/companies/tmpl/default_batch_footer.php
+++ b/admin/views/companies/tmpl/default_batch_footer.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php
index 6277f1d4..3d643ff6 100644
--- a/admin/views/companies/tmpl/default_body.php
+++ b/admin/views/companies/tmpl/default_body.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -108,12 +108,12 @@ $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.
|
- user->authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int)$item->serviceprovider)): ?>
+ user->authorise('service_provider.edit', 'com_costbenefitprojection.service_provider.' . (int)$item->service_provider)): ?>
- serviceprovider_user)->name; ?>
+ service_provider_user)->name; ?>
|
diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php
index 33a0ac01..f3d32547 100644
--- a/admin/views/companies/tmpl/default_foot.php
+++ b/admin/views/companies/tmpl/default_foot.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php
index cb916d4f..175aac2d 100644
--- a/admin/views/companies/tmpl/default_head.php
+++ b/admin/views/companies/tmpl/default_head.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -50,7 +50,7 @@ defined('_JEXEC') or die('Restricted access');
listDirn, $this->listOrder); ?>
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
listDirn, $this->listOrder); ?>
diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php
index 45ddde45..9f30fccb 100644
--- a/admin/views/companies/tmpl/default_toolbar.php
+++ b/admin/views/companies/tmpl/default_toolbar.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php
index 0cc78e4c..b0ee3139 100644
--- a/admin/views/companies/view.html.php
+++ b/admin/views/companies/view.html.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -244,24 +244,24 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
}
}
- // Set Serviceprovider User Selection
- $this->serviceproviderUserOptions = JFormHelper::loadFieldType('Serviceprovider')->getOptions();
- if ($this->serviceproviderUserOptions)
+ // Set Service Provider User Selection
+ $this->service_providerUserOptions = JFormHelper::loadFieldType('Serviceprovider')->getOptions();
+ if ($this->service_providerUserOptions)
{
- // Serviceprovider User Filter
+ // Service Provider User Filter
JHtmlSidebar::addFilter(
- '- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL').' -',
- 'filter_serviceprovider',
- JHtml::_('select.options', $this->serviceproviderUserOptions, 'value', 'text', $this->state->get('filter.serviceprovider'))
+ '- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER_LABEL').' -',
+ 'filter_service_provider',
+ JHtml::_('select.options', $this->service_providerUserOptions, 'value', 'text', $this->state->get('filter.service_provider'))
);
if ($this->canBatch && $this->canCreate && $this->canEdit)
{
- // Serviceprovider User Batch Selection
+ // Service Provider User Batch Selection
JHtmlBatch_::addListSelection(
- '- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL').' -',
- 'batch[serviceprovider]',
- JHtml::_('select.options', $this->serviceproviderUserOptions, 'value', 'text')
+ '- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER_LABEL').' -',
+ 'batch[service_provider]',
+ JHtml::_('select.options', $this->service_providerUserOptions, 'value', 'text')
);
}
}
@@ -333,7 +333,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy
'g.name' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_USER_LABEL'),
'a.department' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL'),
'h.name' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL'),
- 'i.user' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICEPROVIDER_LABEL'),
+ 'i.user' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER_LABEL'),
'a.per' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_PER_LABEL'),
'a.id' => JText::_('JGRID_HEADING_ID')
);
diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js
index 6542894c..4d196b68 100644
--- a/admin/views/company/submitbutton.js
+++ b/admin/views/company/submitbutton.js
@@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php
index 409dfb51..8ecb3edf 100644
--- a/admin/views/company/tmpl/edit.php
+++ b/admin/views/company/tmpl/edit.php
@@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/
- @version 3.3.3
+ @version 3.3.4
@build 19th February, 2016
@created 15th June, 2012
@package Cost Benefit Projection
@@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
|