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

Fix: Bad request

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-28 18:02:18 +00:00
parent 2011b76963
commit c197d3c9ed
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/livraison/fiche.php
View File

@ -569,7 +569,7 @@ else
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd"; $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
$sql.= " , ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l"; $sql.= " , ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l";
$sql.= " WHERE l.rowid <> ".$livraison->id; $sql.= " WHERE l.rowid <> ".$livraison->id;
$sql.= " AND cd.rowid = ld.fk_commande_ligne"; $sql.= " AND cd.rowid = ld.fk_origin_line";
$sql.= " AND ld.fk_livraison = l.rowid"; $sql.= " AND ld.fk_livraison = l.rowid";
$sql.= " AND l.fk_statut > 0"; $sql.= " AND l.fk_statut > 0";
$sql.= " ORDER BY cd.fk_product"; $sql.= " ORDER BY cd.fk_product";

24
htdocs/livraison/livraison.class.php
View File

@ -120,10 +120,10 @@ class Livraison extends CommonObject
*/ */
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++) for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{ {
$origin_id=$this->lignes[$i]->origin_ligne_id; $origin_id=$this->lignes[$i]->origin_line_id;
if (! $origin_id) $origin_id=$this->lignes[$i]->commande_ligne_id; // For backward compatibility if (! $origin_id) $origin_id=$this->lignes[$i]->commande_ligne_id; // For backward compatibility
if (! $this->create_line(0, $origin_id, $this->lignes[$i]->qty)) if (! $this->create_line(0, $origin_id, $this->lignes[$i]->qty, $this->lignes[$i]->fk_product))
{ {
$error++; $error++;
} }
@ -178,24 +178,14 @@ class Livraison extends CommonObject
* *
* *
*/ */
function create_line($transaction, $commande_ligne_id, $qty) function create_line($transaction, $commande_ligne_id, $qty, $fk_product=0)
{ {
$error = 0; $error = 0;
$idprod = 0; $idprod = $fk_product;
$j = 0; $j = 0;
// Search product id
while (($j < sizeof($this->commande->lignes)) && idprod == 0)
{
if ($this->commande->lignes[$j]->id == $commande_ligne_id)
{
$idprod = $this->commande->lignes[$j]->fk_product;
}
$j++;
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraisondet (fk_livraison, fk_origin_line,"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."livraisondet (fk_livraison, fk_origin_line,";
if ($idprod) $sql.=" fk_product"; if ($idprod) $sql.=" fk_product,";
$sql.= " qty)"; $sql.= " qty)";
$sql.= " VALUES (".$this->id.",".$commande_ligne_id.","; $sql.= " VALUES (".$this->id.",".$commande_ligne_id.",";
if ($idprod) $sql.=" ".$idprod.","; if ($idprod) $sql.=" ".$idprod.",";
@ -480,9 +470,9 @@ class Livraison extends CommonObject
for ($i = 0 ; $i < sizeof($expedition->lignes) ; $i++) for ($i = 0 ; $i < sizeof($expedition->lignes) ; $i++)
{ {
$LivraisonLigne = new LivraisonLigne($this->db); $LivraisonLigne = new LivraisonLigne($this->db);
$LivraisonLigne->origin_ligne_id = $expedition->lignes[$i]->origin_line_id; $LivraisonLigne->origin_line_id = $expedition->lignes[$i]->origin_line_id;
$LivraisonLigne->libelle = $expedition->lignes[$i]->libelle; $LivraisonLigne->libelle = $expedition->lignes[$i]->libelle;
$LivraisonLigne->description = $expedition->lignes[$i]->product_desc; $LivraisonLigne->description = $expedition->lignes[$i]->description;
$LivraisonLigne->qty = $expedition->lignes[$i]->qty_shipped; $LivraisonLigne->qty = $expedition->lignes[$i]->qty_shipped;
$LivraisonLigne->fk_product = $expedition->lignes[$i]->fk_product; $LivraisonLigne->fk_product = $expedition->lignes[$i]->fk_product;
$LivraisonLigne->ref = $expedition->lignes[$i]->ref; $LivraisonLigne->ref = $expedition->lignes[$i]->ref;