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

Merge pull request #4990 from FHenry/3.9

Browse Source 
FIX  #4989
This commit is contained in:
Laurent Destailleur 2016-04-11 19:09:46 +02:00
commit fabeb37b65
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dict.php
View File

@ -232,7 +232,7 @@ $tabfield[21]= "code,label";
$tabfield[22]= "code,label"; $tabfield[22]= "code,label";
$tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
$tabfield[24]= "code,label"; $tabfield[24]= "code,label";
$tabfield[25]= "label,type_template,position,topic,content"; $tabfield[25]= "label,type_template,private,position,topic,content";
$tabfield[26]= "code,label,short_label"; $tabfield[26]= "code,label,short_label";
$tabfield[27]= "code,libelle"; $tabfield[27]= "code,libelle";
$tabfield[28]= "code,label,affect,delay,newByMonth,country_id,country"; $tabfield[28]= "code,label,affect,delay,newByMonth,country_id,country";
@ -264,7 +264,7 @@ $tabfieldvalue[21]= "code,label";
$tabfieldvalue[22]= "code,label"; $tabfieldvalue[22]= "code,label";
$tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
$tabfieldvalue[24]= "code,label"; $tabfieldvalue[24]= "code,label";
$tabfieldvalue[25]= "label,type_template,position,topic,content"; $tabfieldvalue[25]= "label,type_template,private,position,topic,content";
$tabfieldvalue[26]= "code,label,short_label"; $tabfieldvalue[26]= "code,label,short_label";
$tabfieldvalue[27]= "code,libelle"; $tabfieldvalue[27]= "code,libelle";
$tabfieldvalue[28]= "code,label,affect,delay,newByMonth,country"; $tabfieldvalue[28]= "code,label,affect,delay,newByMonth,country";

2
htdocs/core/class/html.formmail.class.php
View File

@ -894,7 +894,7 @@ class FormMail extends Form
$line->id=$obj->rowid; $line->id=$obj->rowid;
$line->label=$obj->label; $line->label=$obj->label;
$line->topic=$obj->topic; $line->topic=$obj->topic;
$line->content=$obj->lacontentbel; $line->content=$obj->content;
$line->lang=$obj->lang; $line->lang=$obj->lang;
$this->lines_model[]=$line; $this->lines_model[]=$line;
} }