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

Fix: Corrige quelques problmes avec factures de remplacement

Browse Source
This commit is contained in:
Laurent Destailleur 2006-11-11 15:06:52 +00:00
parent 74608799f7
commit c533227062
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/compta/fiche.php
View File

@ -242,9 +242,10 @@ if ($socid > 0)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
$sql = "SELECT s.nom, s.idp, f.rowid as facid, f.facnumber, f.amount, f.total, f.total_ttc,"; $sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
$sql.= " ".$db->pdate("f.datef")." as df, f.paye as paye, f.fk_statut as statut"; $sql.= ' '.$db->pdate("f.datef").' as df, f.paye as paye, f.fk_statut as statut,';
$sql.= ' ,sum(pf.amount) as am'; $sql.= ' s.nom, s.idp,';
$sql.= ' sum(pf.amount) as am';
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
$sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id; $sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id;
@ -270,7 +271,12 @@ if ($socid > 0)
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"../compta/facture.php?facid=$objp->facid\">".img_object($langs->trans("ShowBill"),"bill")." ".$objp->facnumber."</a></td>\n"; print '<td>';
$facturestatic->id=$objp->facid;
$facturestatic->ref=$objp->facnumber;
$facturestatic->type=$objp->type;
print $facturestatic->getNomUrl(1);
print '</td>';
if ($objp->df > 0) if ($objp->df > 0)
{ {
print "<td align=\"right\">".dolibarr_print_date($objp->df)."</td>\n"; print "<td align=\"right\">".dolibarr_print_date($objp->df)."</td>\n";

12
htdocs/facture.class.php
View File

@ -1012,7 +1012,7 @@ class Facture extends CommonObject
} }
// Controle que facture source non deja remplacee par une autre // Controle que facture source non deja remplacee par une autre
$idreplacement=$facreplaced->getIdReplacingInvoice(); $idreplacement=$facreplaced->getIdReplacingInvoice('validated');
if ($idreplacement && $idreplacement != $rowid) if ($idreplacement && $idreplacement != $rowid)
{ {
$facreplacement=new Facture($this->db); $facreplacement=new Facture($this->db);
@ -1791,14 +1791,20 @@ class Facture extends CommonObject
/** /**
* \brief Renvoie l'id de la facture qui la remplace * \brief Renvoie l'id de la facture qui la remplace
* \return int <0 si ko, 0 si aucune facture ne remplace, id facture sinon * \param option filtre sur statut ('', 'validated', ...)
* \return int <0 si ko, 0 si aucune facture ne remplace, id facture sinon
*/ */
function getIdReplacingInvoice() function getIdReplacingInvoice($option='')
{ {
$sql = 'SELECT rowid'; $sql = 'SELECT rowid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture';
$sql.= ' WHERE fk_facture_source = '.$this->id; $sql.= ' WHERE fk_facture_source = '.$this->id;
$sql.= ' AND type < 2'; $sql.= ' AND type < 2';
if ($option == 'validated') $sql.= ' AND fk_statut = 1';
$sql.= ' ORDER BY fk_statut DESC'; // Au cas ou base corrompu et qu'il y a une
// facture de remplacement validee et une autre non
// on donne priorité à la validée. Ne devrait pas arriver
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {