Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

ChangeLog

@@ -73,6 +73,9 @@ For users:
 - Fix: [ bug #1022 ] correct margin calculation for credit notes.
 - Fix: Better management of using ajax for upload form (to solve problem when enabling ajax jquery multifile upload in some cases).
 
+New experimental module:
+- New: [ task #157 ] Add a Skype button (adherents / third parties / contacts)
+
 For translators:
 - Qual: Normalized sort order of all languages files with English reference files.
 - New: Add language code files for South Africa, France new Caledonia, Vietnam.

htdocs/install/mysql/tables/llx_opensurvey_sondage.sql

@@ -17,17 +17,17 @@
 
 CREATE TABLE llx_opensurvey_sondage (
        id_sondage VARCHAR(16) PRIMARY KEY,
-       id_sondage_admin CHAR(24),
+       id_sondage_admin VARCHAR(24),
        commentaires text,
        mail_admin VARCHAR(128),
        nom_admin VARCHAR(64),
-       titre text,
-       date_fin datetime,
+       titre TEXT,
+       date_fin DATETIME,
        format VARCHAR(2),
        mailsonde varchar(2) DEFAULT '0',
        survey_link_visible integer DEFAULT 1,
 	   canedit integer DEFAULT 0,
-       origin varchar(64),
-       tms timestamp,
+       origin VARCHAR(64),
+       tms TIMESTAMP,
 	   sujet TEXT
 ) ENGINE=InnoDB;

htdocs/langs/en_US/admin.lang

@@ -487,6 +487,8 @@ Module2700Desc= Use online Gravatar service (www.gravatar.com) to show photo of
 Module2800Desc=FTP Client
 Module2900Name= GeoIPMaxmind
 Module2900Desc= GeoIP Maxmind conversions capabilities
+Module3100Name= Skype
+Module3100Desc= Add a Skype button into card of adherents / third parties / contacts
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow

htdocs/opensurvey/public/create_survey.php

@@ -168,7 +168,7 @@ print '<input type="checkbox" name="canedit" '.$cocheplus.'> '. $langs->trans("V
 
 if ($_SESSION["mailsonde"]) $cochemail="checked";
 
-print '<input type=checkbox name=mailsonde '.$cochemail.'> '. $langs->trans("ToReceiveEMailForEachVote") .'<br>'."\n";
+print '<input type="checkbox" name="mailsonde" '.$cochemail.'> '. $langs->trans("ToReceiveEMailForEachVote") .'<br>'."\n";
 
 if (GETPOST('choix_sondage'))
 {