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

Fix: Error on page when going from some link

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-13 17:42:25 +00:00
parent a8fba4277f
commit fd23d97793
1 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/expedition/fiche.php
View File

@ -48,12 +48,11 @@ $langs->load('stocks');
$langs->load('other'); $langs->load('other');
$langs->load('propal'); $langs->load('propal');
$origin = "expedition";
$origin_id = isset($_REQUEST["id"])?$_REQUEST["id"]:'';
$id = $origin_id;
$origin = $_GET["origin"]?$_GET["origin"]:$_POST["origin"]; // Example: commande, propal $origin = $_GET["origin"]?$_GET["origin"]:$_POST["origin"]; // Example: commande, propal
$origin_id = $_GET["origin_id"]?$_GET["origin_id"]:$_POST["origin_id"]; // Id of order or propal $origin_id = isset($_REQUEST["id"])?$_REQUEST["id"]:'';
if (empty($origin_id)) $origin_id = $_GET["origin_id"]?$_GET["origin_id"]:$_POST["origin_id"]; // Id of order or propal
if (empty($origin_id)) $origin_id = $_GET["object_id"]?$_GET["object_id"]:$_POST["object_id"]; // Id of order or propal
$id = $origin_id;
// Security check // Security check
@ -539,10 +538,6 @@ if ($_GET["action"] == 'create')
$quantityAsked = $line->qty; $quantityAsked = $line->qty;
$quantityToBeDelivered = $quantityAsked - $quantityDelivered; $quantityToBeDelivered = $quantityAsked - $quantityDelivered;
if ($conf->stock->enabled
//&& $line->product_type == 0
)
{
$defaultqty=0; $defaultqty=0;
if ($_REQUEST["entrepot_id"]) if ($_REQUEST["entrepot_id"])
{ {
@ -591,7 +586,6 @@ if ($_GET["action"] == 'create')
} }
print '</td>'; print '</td>';
} }
}
/*else /*else
{ {
// Quantity // Quantity