FIX inversion customer/supplier price

This commit is contained in:
Laurent Destailleur 2016-09-11 13:48:05 +02:00
parent 79f19f5c66
commit 9709c8bbbf
2 changed files with 6 additions and 3 deletions

View File

@ -334,7 +334,10 @@ if ($object->id > 0)
print '<td class="nowrap">';
print $productstatic->getNomUrl(1);
print '</td>';
print '<td align="center">';
print '<td>';
print $productstatic->ref;
print '</td>';
print '<td>';
print dol_trunc(dol_htmlentities($objp->label), 30);
print '</td>';
print '<td align="right" class="nowrap">'.dol_print_date($objp->tms).'</td>';

View File

@ -1659,7 +1659,7 @@ if ($action == 'create')
print '<table id="tablelines" class="noborder noshadow" width="100%">';
if (! empty($object->lines))
$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
// Form to add new line
if ($object->statut == 0 && $user->rights->supplier_proposal->creer)
@ -1669,7 +1669,7 @@ if ($action == 'create')
$var = true;
// Add products/services form
$object->formAddObjectLine(1, $mysoc, $soc);
$object->formAddObjectLine(1, $soc, $mysoc);
$parameters = array();
$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook