- La modif d'une facture fournisseur ne marche pas
- les commentaires de la facture ne sont pas affichés - le lien de l'onglet ne pointe pas au bon endroit - + une petite faute d'orthographe Emmettre -> Émettre
This commit is contained in:
parent
a68a832ac0
commit
b4c0df018b
@ -154,7 +154,7 @@ class FactureFourn
|
|||||||
{
|
{
|
||||||
$sql = "SELECT fk_soc,libelle,facnumber,amount,remise,".$this->db->pdate(datef)."as df";
|
$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 .= ", 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 .= ", s.nom as socnom, s.idp as socidp";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."societe as s";
|
$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 ;";
|
$sql .= " WHERE f.rowid=$rowid AND f.fk_soc = s.idp ;";
|
||||||
@ -184,7 +184,7 @@ class FactureFourn
|
|||||||
|
|
||||||
$this->socidp = $obj->socidp;
|
$this->socidp = $obj->socidp;
|
||||||
$this->socnom = $obj->socnom;
|
$this->socnom = $obj->socnom;
|
||||||
|
$this->note = $obj->note;
|
||||||
$this->db->free();
|
$this->db->free();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -68,7 +68,7 @@ if($_GET["action"] == 'deletepaiement')
|
|||||||
|
|
||||||
if ($_POST["action"] == 'modif_libelle')
|
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);
|
$result = $db->query( $sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,7 +82,7 @@ if ($_POST["action"] == 'update')
|
|||||||
$sql .= ", libelle='".trim($_POST["libelle"])."'";
|
$sql .= ", libelle='".trim($_POST["libelle"])."'";
|
||||||
$sql .= ", note='".$_POST["note"]."'";
|
$sql .= ", note='".$_POST["note"]."'";
|
||||||
$sql .= ", datef = '$datefacture'";
|
$sql .= ", datef = '$datefacture'";
|
||||||
$sql .= " WHERE rowid = $facid ;";
|
$sql .= " WHERE rowid = ".$_GET['facid']." ;";
|
||||||
$result = $db->query( $sql);
|
$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;
|
$head[0][1] = 'Facture : '.$fac->ref;
|
||||||
$h = 1;
|
$h = 1;
|
||||||
$a = 0;
|
$a = 0;
|
||||||
@ -537,7 +537,7 @@ else
|
|||||||
}
|
}
|
||||||
elseif ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
|
elseif ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
|
||||||
{
|
{
|
||||||
print '<a class="tabAction" href="paiement.php?facid='.$fac->id.'&action=create">Emmettre un paiement</a>';
|
print '<a class="tabAction" href="paiement.php?facid='.$fac->id.'&action=create">Émettre un paiement</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($fac->statut == 0 && $user->societe_id == 0)
|
if ($fac->statut == 0 && $user->societe_id == 0)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user