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

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

Browse Source
This commit is contained in:
Laurent Destailleur
2012-04-28 17:01:48 +02:00
parent ff06360071 25441e57f4
commit e411852c39
25 changed files with 1618 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/admin.lib.php
View File

@@ -1081,9 +1081,9 @@ function form_constantes($tableau)
{
print '<td>';
//print 'aa'.$const;
if (in_array($const,array('ADHERENT_CARD_TEXT','ADHERENT_CARD_TEXT_RIGHT')))
if (in_array($const,array('ADHERENT_CARD_TEXT','ADHERENT_CARD_TEXT_RIGHT','ADHERENT_ETIQUETTE_TEXT')))
{
print '<textarea class="flat" name="constvalue" cols="35" rows="5" wrap="soft">'."\n";
print '<textarea class="flat" name="constvalue" cols="50" rows="5" wrap="soft">'."\n";
print $obj->value;
print "</textarea>\n";
print '</td><td>';
@@ -1192,4 +1192,4 @@ function delDocumentModel($name, $type)
}
}
?>
?>