lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-12-30 12:44:46 +01:00
commit f0151ce112
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/dolibarr_changes.txt
View File

@ -49,3 +49,8 @@ with
//var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth); //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
window.location.href=pRef window.location.href=pRef
* Replace hard coded string with i18n["String"]; * Replace hard coded string with i18n["String"];
JCROP:
------
* Remove analytics tag into file index.html

4
htdocs/core/modules/modOpenSurvey.class.php
View File

@ -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) // 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)); $this->name = preg_replace('/^mod/i','',get_class($this));
// Module description used if translation string 'ModuleXXXDesc' not found (XXX is value MyModule) // 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 // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'dolibarr'; $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) // 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 // Permissions
$this->remove($options); $this->remove($options);
$sql = array(); $sql = array();
return $this->_init($sql,$options); return $this->_init($sql,$options);

15
htdocs/includes/jquery/plugins/jcrop/index.html
View File

@ -46,20 +46,5 @@
</div> </div>
<!-- Below here for internal analysis {{{ -->
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
var pageTracker = _gat._getTracker("UA-5176876-1");
pageTracker._trackPageview();
</script>
<!-- }}} -->
</body> </body>
</html> </html>

2
htdocs/langs/en_US/admin.lang
View File

@ -505,7 +505,7 @@ Module50200Desc= Module to offer an online payment page by credit card with Payp
Module54000Name=PrintIPP Module54000Name=PrintIPP
Module54000Desc=Print via Cups IPP Printer. Module54000Desc=Print via Cups IPP Printer.
Module55000Name=Open Survey 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 Module59000Name=Margins
Module59000Desc=Module to manage margins Module59000Desc=Module to manage margins
Module60000Name=Commissions Module60000Name=Commissions

2
htdocs/langs/fr_FR/admin.lang
View File

@ -505,7 +505,7 @@ Module50200Desc= Module permettant d'offrir en ligne une page de paiement par ca
Module54000Name=PrintIPP Module54000Name=PrintIPP
Module54000Desc=Impression via Cups IPP Printer. Module54000Desc=Impression via Cups IPP Printer.
Module55000Name=Open Survey 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 Module59000Name=Marges
Module59000Desc=Module pour gérer les marges Module59000Desc=Module pour gérer les marges
Module60000Name=Commissions Module60000Name=Commissions