diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt index 0e53b85eb7d..3f7f4767d4f 100644 --- a/dev/dolibarr_changes.txt +++ b/dev/dolibarr_changes.txt @@ -49,3 +49,8 @@ with //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth); window.location.href=pRef * Replace hard coded string with i18n["String"]; + + +JCROP: +------ +* Remove analytics tag into file index.html diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php index 8cdcf83774b..34c3e90e54d 100644 --- a/htdocs/core/modules/modOpenSurvey.class.php +++ b/htdocs/core/modules/modOpenSurvey.class.php @@ -57,7 +57,7 @@ class modOpenSurvey extends DolibarrModules // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i','',get_class($this)); // Module description used if translation string 'ModuleXXXDesc' not found (XXX is value MyModule) - $this->description = "Module to integrate a survey (like Doodle, Studs, Rdvz, ...)"; + $this->description = "Module to make online surveys (like Doodle, Studs, Rdvz, ...)"; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version $this->version = 'dolibarr'; // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) @@ -197,7 +197,7 @@ class modOpenSurvey extends DolibarrModules { // Permissions $this->remove($options); - + $sql = array(); return $this->_init($sql,$options); diff --git a/htdocs/includes/jquery/plugins/jcrop/index.html b/htdocs/includes/jquery/plugins/jcrop/index.html index 4f65fb095c8..209c929c61d 100755 --- a/htdocs/includes/jquery/plugins/jcrop/index.html +++ b/htdocs/includes/jquery/plugins/jcrop/index.html @@ -46,20 +46,5 @@ - - - - - - - - - diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 10ee42fab4a..1140d4fd455 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -505,7 +505,7 @@ Module50200Desc= Module to offer an online payment page by credit card with Payp Module54000Name=PrintIPP Module54000Desc=Print via Cups IPP Printer. Module55000Name=Open Survey -Module55000Desc=Module to integrate a survey (like Doodle, Studs, Rdvz, ...) +Module55000Desc=Module to make online surveys (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins Module59000Desc=Module to manage margins Module60000Name=Commissions diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 604b12a1981..cbc6bba54fc 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -505,7 +505,7 @@ Module50200Desc= Module permettant d'offrir en ligne une page de paiement par ca Module54000Name=PrintIPP Module54000Desc=Impression via Cups IPP Printer. Module55000Name=Open Survey -Module55000Desc=Module pour intégrer un sondage (comme Doodle, Studs, Rdvz, ...) +Module55000Desc=Module pour réaliser des sondages en ligne (comme Doodle, Studs, Rdvz, ...) Module59000Name=Marges Module59000Desc=Module pour gérer les marges Module60000Name=Commissions