diff --git a/htdocs/facturefourn.class.php b/htdocs/facturefourn.class.php
index 2768049943e..7dfef4ab491 100644
--- a/htdocs/facturefourn.class.php
+++ b/htdocs/facturefourn.class.php
@@ -154,7 +154,7 @@ class FactureFourn
{
$sql = "SELECT fk_soc,libelle,facnumber,amount,remise,".$this->db->pdate(datef)."as df";
$sql .= ", total_ht, total_tva, total_ttc, fk_user_author";
- $sql .= ", fk_statut, paye";
+ $sql .= ", fk_statut, paye, f.note";
$sql .= ", s.nom as socnom, s.idp as socidp";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE f.rowid=$rowid AND f.fk_soc = s.idp ;";
@@ -184,7 +184,7 @@ class FactureFourn
$this->socidp = $obj->socidp;
$this->socnom = $obj->socnom;
-
+ $this->note = $obj->note;
$this->db->free();
/*
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 63452bc7c9c..949cd959ca5 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -68,7 +68,7 @@ if($_GET["action"] == 'deletepaiement')
if ($_POST["action"] == 'modif_libelle')
{
- $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn set libelle = '$form_libelle' WHERE rowid = $facid ;";
+ $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn set libelle = '$form_libelle' WHERE rowid = ".$_GET["facid"]." ;";
$result = $db->query( $sql);
}
@@ -82,7 +82,7 @@ if ($_POST["action"] == 'update')
$sql .= ", libelle='".trim($_POST["libelle"])."'";
$sql .= ", note='".$_POST["note"]."'";
$sql .= ", datef = '$datefacture'";
- $sql .= " WHERE rowid = $facid ;";
+ $sql .= " WHERE rowid = ".$_GET['facid']." ;";
$result = $db->query( $sql);
}
@@ -379,7 +379,7 @@ else
*
*/
- $head[0][0] = DOL_URL_ROOT."fiche.php?facid=".$fac->id;
+ $head[0][0] = "fiche.php?facid=".$fac->id;
$head[0][1] = 'Facture : '.$fac->ref;
$h = 1;
$a = 0;
@@ -537,7 +537,7 @@ else
}
elseif ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{
- print 'Emmettre un paiement';
+ print 'Émettre un paiement';
}
if ($fac->statut == 0 && $user->societe_id == 0)