diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index 25aa8680763..05c1663404f 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -724,7 +724,8 @@ class Expedition extends CommonObject $ligne->desc=$langs->trans("Description")." ".$xnbp; $ligne->libelle=$langs->trans("Description")." ".$xnbp; $ligne->qty=10; - $ligne->qty_expedition=5; + $ligne->qty_asked=5; + $ligne->qty_shipped=4; $prodid = rand(1, $num_prods); $ligne->fk_product=$prodids[$prodid]; $xnbp++; @@ -743,11 +744,11 @@ class ExpeditionLigne // From llx_expeditiondet var $qty; - var $qty_expedition; + var $qty_shipped; var $fk_product; // From llx_commandedet or llx_propaldet - var $qty_asking; + var $qty_asked; var $libelle; // Label produit var $product_desc; // Description produit var $ref; diff --git a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php index 454402cd3f9..a5146cbcea6 100644 --- a/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php +++ b/htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php @@ -243,10 +243,10 @@ Class pdf_expedition_rouget extends ModelePdfExpedition $pdf->writeHTMLCell(150, 3, $this->posxdesc, $curY, $libelleproduitservice, 0, 1); $pdf->SetXY (160, $curY); - $pdf->MultiCell(30, 3, $this->expe->lignes[$i]->qty_commande); + $pdf->MultiCell(30, 3, $this->expe->lignes[$i]->qty_asked); $pdf->SetXY (186, $curY); - $pdf->MultiCell(30, 3, $this->expe->lignes[$i]->qty_expedition); + $pdf->MultiCell(30, 3, $this->expe->lignes[$i]->qty_shipped); } $pdf->AliasNbPages(); diff --git a/htdocs/lib/sendings.lib.php b/htdocs/lib/sendings.lib.php index e7c435558e9..01cb3a7e26e 100644 --- a/htdocs/lib/sendings.lib.php +++ b/htdocs/lib/sendings.lib.php @@ -34,7 +34,7 @@ function show_list_sending_receive($origin='commande',$origin_id,$filter='') { global $db, $conf, $langs, $bc; - $sql = "SELECT obj.rowid, obj.fk_product, obj.description, obj.qty as qty_asking"; + $sql = "SELECT obj.rowid, obj.fk_product, obj.description, obj.qty as qty_asked"; $sql.= ", ed.qty as qty_shipped, ed.fk_expedition as expedition_id"; $sql.= ", e.ref, ".$db->pdate("e.date_expedition")." as date_expedition"; if ($conf->livraison_bon->enabled) $sql .= ", l.rowid as livraison_id, l.ref as livraison_ref"; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index e5ccdad1099..3cd491f680f 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -500,7 +500,7 @@ else } print '