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

Fixed: Cancel button not correctly supported

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-14 16:01:25 +01:00
parent c0afd4f174
commit c6bb5904e7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/product/price.php
View File

@ -55,11 +55,19 @@ $object = new Product($db);
$error=0; $error=0;
/* /*
* Actions * Actions
*/ */
if ($action == 'update_price' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) { if ($action == 'update_price' && GETPOST("cancel"))
{
$action='';
}
if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit->creer || $user->rights->service->creer))
{
$result = $object->fetch($id); $result = $object->fetch($id);
$error=0; $error=0;
@ -341,9 +349,9 @@ if ($isphoto) {
print '</tr>'; print '</tr>';
// MultiPrix // MultiPrix
if (! empty($conf->global->PRODUIT_MULTIPRICES)) if (! empty($conf->global->PRODUIT_MULTIPRICES))
{ {
if (! empty($socid)) if (! empty($socid))
{ {
$soc = new Societe($db); $soc = new Societe($db);
$soc->id = $socid; $soc->id = $socid;
@ -366,7 +374,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
// Prix mini // Prix mini
print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>'; print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
{ {
print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]); print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
} else { } else {
@ -411,10 +419,10 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
// Prix mini // Prix mini
print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>'; print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>';
if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT"; if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT";
if ($object->multiprices_base_type["$i"] == 'TTC') if ($object->multiprices_base_type["$i"] == 'TTC')
{ {
print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
} }
else else
{ {
print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]); print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);