diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index ead5c59e168..f0c500299d5 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -133,7 +133,7 @@ if ($conf->contrat->enabled) */ if ($conf->propal->enabled && $user->rights->propale->lire) { - $sql = "SELECT p.rowid, p.ref, p.price, s.rowid as socid, s.nom"; + $sql = "SELECT p.rowid, p.ref, p.total_ht, s.rowid as socid, s.nom"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -163,7 +163,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire) $var=!$var; print ''."rowid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.''; print ''.dolibarr_trunc($obj->nom,18).''; - print ''.price($obj->price).''; + print ''.price($obj->total_ht).''; $i++; $total += $obj->price; } diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index 906a35d01dd..34978f5e174 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -192,7 +192,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->MultiCell(18, 5, price($com->lignes[$i]->price), 0, 'R', 0); $pdf->SetXY (174, $curY ); - $total = price($com->lignes[$i]->price * $com->lignes[$i]->qty); + $total = price($com->lignes[$i]->total_ht); $pdf->MultiCell(26, 5, $total, 0, 'R', 0); $pdf->line(10, $curY, 200, $curY ); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 804f3911a28..004cf1a7d17 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -318,7 +318,7 @@ class pdf_einstein extends ModelePDFCommandes // Total HT ligne $pdf->SetXY ($this->postotalht, $curY); - $total = price($com->lignes[$i]->price * $com->lignes[$i]->qty); + $total = price($com->lignes[$i]->total_ht); $pdf->MultiCell(23, 4, $total, 0, 'R', 0); // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index ab6c6057757..77e3d652600 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -327,7 +327,7 @@ class pdf_crabe extends ModelePDFFactures // Total HT ligne $pdf->SetXY ($this->postotalht, $curY); - $total = price($fac->lignes[$i]->price * $fac->lignes[$i]->qty); + $total = price($fac->lignes[$i]->total_ht); $pdf->MultiCell(23, 4, $total, 0, 'R', 0); // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index 0c53bcd2801..4ca041c6932 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -183,7 +183,7 @@ class pdf_huitre extends ModelePDFFactures $pdf->MultiCell(18, 5, price($fac->lignes[$i]->price), 0, 'R', 0); $pdf->SetXY (174, $curY); - $total = price($fac->lignes[$i]->price * $fac->lignes[$i]->qty); + $total = price($fac->lignes[$i]->total_ht); $pdf->MultiCell(26, 5, $total, 0, 'R', 0); if ($nexY > 200 && $i < $nblignes - 1) diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 9164381fb3f..b4758418c44 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -236,7 +236,7 @@ class pdf_oursin extends ModelePDFFactures // Total HT $pdf->SetXY ($this->marges['g']+168, $curY); - $total = price($fac->lignes[$i]->price * $fac->lignes[$i]->qty); + $total = price($fac->lignes[$i]->total_ht); $pdf->MultiCell(21, 5, $total, 0, 'R', 0); diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 928df4a1ef7..b7cd00c010a 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -315,7 +315,7 @@ class pdf_propale_azur extends ModelePDFPropales // Total HT ligne $pdf->SetXY ($this->postotalht, $curY); - $total = price($propale->lignes[$i]->price * $propale->lignes[$i]->qty); + $total = price($propale->lignes[$i]->total_ht); $pdf->MultiCell(23, 4, $total, 0, 'R', 0); // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva @@ -899,8 +899,7 @@ class pdf_propale_azur extends ModelePDFPropales $arrayidcontact=$object->getIdContact('external','CUSTOMER'); if (sizeof($arrayidcontact) > 0) { -print_r($arrayidcontact); - $usecontact=true; + $usecontact=true; $result=$object->fetch_contact($arrayidcontact[0]); } } diff --git a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php index 9838ded2f7f..5507e44b9c9 100644 --- a/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_bleu.modules.php @@ -184,7 +184,7 @@ class pdf_propale_bleu extends ModelePDFPropales $pdf->MultiCell(18, 5, price($propale->lignes[$i]->price), 0, 'R', 0); $pdf->SetXY (174, $curY ); - $total = price($propale->lignes[$i]->price * $propale->lignes[$i]->qty); + $total = price($propale->lignes[$i]->total_ht); $pdf->MultiCell(26, 5, $total, 0, 'R', 0); $pdf->line(10, $curY, 200, $curY ); diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 73c42400fa9..38ca39bdd74 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -164,7 +164,6 @@ class pdf_propale_jaune extends ModelePDFPropales for ($i = 0 ; $i < $nblignes ; $i++) { $curY = $nexY; - $total = price($propale->lignes[$i]->price * $propale->lignes[$i]->qty); $pdf->SetXY (30, $curY ); $pdf->MultiCell(102, 5, $propale->lignes[$i]->desc, 0, 'J', 0); @@ -184,7 +183,7 @@ class pdf_propale_jaune extends ModelePDFPropales $pdf->MultiCell(22, 5, price($propale->lignes[$i]->price), 0, 'R', 0); $pdf->SetXY (176, $curY ); - $pdf->MultiCell(24, 5, $total, 0, 'R', 0); + $pdf->MultiCell(24, 5, price($propale->lignes[$i]->total_ht), 0, 'R', 0); $pdf->line(10, $curY, 200, $curY ); diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php index 9be17ce233d..fc1614762c1 100644 --- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php @@ -182,7 +182,7 @@ class pdf_propale_rouge extends ModelePDFPropales $pdf->MultiCell(18, 5, price($propale->lignes[$i]->price), 0, 'R', 0); $pdf->SetXY (174, $curY ); - $total = price($propale->lignes[$i]->price * $propale->lignes[$i]->qty); + $total = price($propale->lignes[$i]->total_ht); $pdf->MultiCell(26, 5, $total, 0, 'R', 0); $pdf->line(10, $curY, 200, $curY ); diff --git a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php index d44e7717adf..3e0ab092784 100644 --- a/htdocs/includes/modules/propale/pdf_propale_vert.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_vert.modules.php @@ -190,7 +190,7 @@ class pdf_propale_vert extends ModelePDFPropales $pdf->MultiCell(14, 5, $propale->lignes[$i]->remise_percent."%", 0, 'R', 0); $pdf->SetXY (180, $curY ); - $total = price($propale->lignes[$i]->price * $propale->lignes[$i]->qty); + $total = price($propale->lignes[$i]->total_ht); $pdf->MultiCell(20, 5, $total, 0, 'R', 0); $pdf->line(10, $curY, 200, $curY );