Merge pull request #984 from FHenry/3.4

Fix [ bug #895 ] Description is lost when adding a new predefined
This commit is contained in:
Laurent Destailleur 2013-05-25 08:11:48 -07:00
commit 982fec65ec

View File

@ -433,7 +433,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
$desc = $prod->description;
$desc.= $prod->description && GETPOST('desc') ? "\n" : "";
$desc.= GETPOST('desc');
$desc.= GETPOST('np_desc');
}
else
{
@ -871,10 +871,10 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">';
$doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
print $doleditor->Create(1);
if (! $user->societe_id)
{