lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix do not show no price because e already have default

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-27 11:59:51 +01:00
parent c86a1a30d5
commit 997fd5ba5d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/price.php
View File

@ -887,7 +887,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
{ {
print "\n" . '<div class="tabsAction">' . "\n"; print "\n" . '<div class="tabsAction">' . "\n";
if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES)) if (empty($conf->global->PRODUIT_MULTIPRICES))
{ {
if ($user->rights->produit->creer || $user->rights->service->creer) { if ($user->rights->produit->creer || $user->rights->service->creer) {
print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
@ -1606,7 +1606,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print $langs->trans('None'); print $langs->trans('None');
} }
} }
else if ($action != 'showlog_default_price') else if ($action != 'showlog_default_price' && $action != 'edit_price')
{ {
// List of all prices by customers // List of all prices by customers
@ -1738,14 +1738,14 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print "</tr>\n"; print "</tr>\n";
} }
} }
else /*else
{ {
$colspan=9; $colspan=9;
if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1; if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1;
print "<tr ".$bc[false].">"; print "<tr ".$bc[false].">";
print '<td colspan="'.$colspan.'">'.$langs->trans('None').'</td>'; print '<td colspan="'.$colspan.'">'.$langs->trans('None').'</td>';
print "</tr>"; print "</tr>";
} }*/
print "</table>"; print "</table>";