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

La recherche raccourci sur les factures regarde aussi dans la description et les notes des lignes

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-24 21:53:38 +00:00
parent b01402bcf0
commit 86e1bfb57a
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/compta/facture.php
View File

@ -38,7 +38,6 @@ accessforbidden();
$langs->load("bills");
require_once "../facture.class.php";
require_once "../paiement.class.php";
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php");
@ -48,6 +47,7 @@ if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande
require_once DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php";
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
if ($_GET["socidp"]) { $socidp=$_GET["socidp"]; }
if (isset($_GET["msg"])) { $msg=urldecode($_GET["msg"]); }
@ -467,7 +467,7 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
if ($_GET["action"] == 'pdf')
{
// Generation de la facture définie dans /includes/modules/facture/modules_facture.php
// Génère également le fichier meta dans le m$eme répertoire (pour faciliter les recherches et indexation)
// Génère également le fichier meta dans le meme répertoire (pour faciliter les recherches et indexation)
facture_pdf_create($db, $_GET["facid"]);
}
@ -860,15 +860,15 @@ if ($_GET["action"] == 'create')
}
}
else
/* *************************************************************************** */
/* */
/* Mode fiche */
/* */
/* *************************************************************************** */
{
if ($_GET["facid"] > 0)
{
/* *************************************************************************** */
/* */
/* Fiche en mode visu */
/* */
/* *************************************************************************** */
if ($msg) print "$msg<br>";
$fac = New Facture($db);
@ -1606,15 +1606,17 @@ else
$sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,";
$sql.= $db->pdate("f.datef")." as df, ".$db->pdate("f.date_lim_reglement")." as datelimite, ";
$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am";
$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut";
if (! $sall) $sql.= " ,sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ",".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
$sql.= " WHERE f.fk_soc = s.idp";
if (! $sall) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
if ($sall) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facturedet as fd ON f.rowid=fd.fk_facture ";
$sql.= " WHERE f.fk_soc = s.idp";
if ($socidp) $sql .= " AND s.idp = $socidp";
if ($month > 0) $sql .= " AND date_format(f.datef, '%m') = $month";
if ($_GET["filtre"])
{
$filtrearr = split(",", $_GET["filtre"]);
@ -1624,41 +1626,37 @@ else
$sql .= " AND " . $filt[0] . " = " . $filt[1];
}
}
if ($_GET["search_ref"])
{
$sql .= " AND f.facnumber like '%".$_GET["search_ref"]."%'";
}
if ($_GET["search_societe"])
{
$sql .= " AND s.nom like '%".$_GET["search_societe"]."%'";
}
if ($_GET["search_montant_ht"])
{
$sql .= " AND f.total = '".$_GET["search_montant_ht"]."'";
}
if ($_GET["search_montant_ttc"])
{
$sql .= " AND f.total_ttc = '".$_GET["search_montant_ttc"]."'";
}
if ($year > 0) $sql .= " AND date_format(f.datef, '%Y') = $year";
if (strlen($_POST["sf_ref"]) > 0)
if ($_POST["sf_ref"])
{
$sql .= " AND f.facnumber like '%".$_POST["sf_ref"] . "%'";
}
if ($sall)
{
$sql .= " AND (f.facnumber like '%".$sall."%' OR f.note like '%".$sall."%' OR fd.description like '%".$sall."%')";
}
$sql .= " GROUP BY f.facnumber";
$sql .= " ORDER BY ";
$listfield=split(',',$sortfield);
foreach ($listfield as $key => $value) {
$sql.="$listfield[$key] $sortorder,";
}
foreach ($listfield as $key => $value) $sql.="$listfield[$key] $sortorder,";
$sql .= " f.rowid DESC ";
$sql .= $db->plimit($limit+1,$offset);
@ -1790,7 +1788,8 @@ else
$i++;
}
if (($offset + $num) <= $limit) {
if (($offset + $num) <= $limit)
{
// Print total
print '<tr class="liste_total">';
print '<td class="liste_total" colspan="3" align="left">'.$langs->trans("Total").'</td>';

7
htdocs/compta/index.php
View File

@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -91,8 +90,10 @@ if ($conf->facture->enabled) {
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">";
print '<td colspan="3">'.$langs->trans("SearchABill").'</td></tr>';
print "<tr $bc[0]><td>";
print $langs->trans("Ref").':</td><td><input type="text" name="sf_ref" class="flat" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "<tr $bc[0]><td>".$langs->trans("Ref").':</td><td><input type="text" name="sf_ref" class="flat" size="18"></td>';
print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "<tr $bc[0]><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
print '</tr>';
print "</table></form><br>";
}