Skip to content
Snippets Groups Projects
Commit a1085f9c authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: missing public note and private note

parent 72d8dbaa
No related branches found
No related tags found
No related merge requests found
...@@ -1244,6 +1244,9 @@ if ($action == 'create' && $user->rights->commande->creer) ...@@ -1244,6 +1244,9 @@ if ($action == 'create' && $user->rights->commande->creer)
$remise_absolue = (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0)); $remise_absolue = (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
$note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
$note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
// Object source contacts list // Object source contacts list
$srccontactslist = $objectsrc->liste_contact(-1,'external',1); $srccontactslist = $objectsrc->liste_contact(-1,'external',1);
} }
...@@ -1383,8 +1386,8 @@ if ($action == 'create' && $user->rights->commande->creer) ...@@ -1383,8 +1386,8 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'; print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
print '</textarea></td></tr>'; print '</td></tr>';
// Note privee // Note privee
if (! $user->societe_id) if (! $user->societe_id)
...@@ -1392,8 +1395,8 @@ if ($action == 'create' && $user->rights->commande->creer) ...@@ -1392,8 +1395,8 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'; print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
print '</textarea></td></tr>'; print '</td></tr>';
} }
if (is_object($objectsrc)) if (is_object($objectsrc))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment