Fix [ bug #895 ] Description is lost when adding a new predefined
product to a contract
This commit is contained in:
parent
7b13be4653
commit
8656a9f417
@ -433,7 +433,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
|
|||||||
|
|
||||||
$desc = $prod->description;
|
$desc = $prod->description;
|
||||||
$desc.= $prod->description && GETPOST('desc') ? "\n" : "";
|
$desc.= $prod->description && GETPOST('desc') ? "\n" : "";
|
||||||
$desc.= GETPOST('desc');
|
$desc.= GETPOST('np_desc');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -871,10 +871,10 @@ if ($action == 'create')
|
|||||||
|
|
||||||
print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">';
|
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);
|
$doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
|
||||||
print $doleditor->Create(1);
|
print $doleditor->Create(1);
|
||||||
|
|
||||||
|
|
||||||
if (! $user->societe_id)
|
if (! $user->societe_id)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user