Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2013-11-06 15:32:13 +01:00
parent 521b3a89bf 51ad76b6de
commit ab668d1b26
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -73,6 +73,9 @@ For users:
- Fix: [ bug #1022 ] correct margin calculation for credit notes. - 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). - 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: For translators:
- Qual: Normalized sort order of all languages files with English reference files. - Qual: Normalized sort order of all languages files with English reference files.
- New: Add language code files for South Africa, France new Caledonia, Vietnam. - New: Add language code files for South Africa, France new Caledonia, Vietnam.

10
htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
View File

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

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

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

2
htdocs/opensurvey/public/create_survey.php
View File

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