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

Fix: Affiche message erreur sur creation prelevement

Browse Source
This commit is contained in:
Laurent Destailleur 2005-12-08 23:53:43 +00:00
parent 27c1c42eea
commit 96f925150f
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/compta/prelevement/create.php
View File

@ -40,6 +40,14 @@ if ($_GET["action"] == 'create')
{ {
$bprev = new BonPrelevement($db); $bprev = new BonPrelevement($db);
$result=$bprev->create($_GET["banque"],$_GET["guichet"]); $result=$bprev->create($_GET["banque"],$_GET["guichet"]);
if ($result < 0)
{
$mesg='<div class="error">'.$bprev->error.'</div>';
}
if ($result == 0)
{
$mesg='<div class="error">Aucune facture prélevable, prélevé avec succès</div>';
}
} }
@ -57,7 +65,10 @@ $bprev = new BonPrelevement($db);
$nb=$bprev->NbFactureAPrelever(); $nb=$bprev->NbFactureAPrelever();
$nb1=$bprev->NbFactureAPrelever(1); $nb1=$bprev->NbFactureAPrelever(1);
$nb11=$bprev->NbFactureAPrelever(1,1); $nb11=$bprev->NbFactureAPrelever(1,1);
if ($nb < 0 || $nb1 < 0 || $nb11 < 0)
{
dolibarr_print_error($bprev->error);
}
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>Nb de facture à prélever :</td>'; print '<tr><td>Nb de facture à prélever :</td>';
print '<td align="right">'; print '<td align="right">';
@ -78,6 +89,7 @@ print '</tr></table>';
print '</div>'; print '</div>';
if ($mesg) print $mesg;
if ($nb) if ($nb)
{ {

18
htdocs/compta/prelevement/demandes.php
View File

@ -58,17 +58,19 @@ if (! $sortfield) $sortfield="f.facnumber";
/* /*
* Demandes en attente * Liste de demandes
* *
*/ */
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp"; $sql= "SELECT f.facnumber, f.rowid, s.nom, s.idp";
$sql .= " , ".$db->pdate("pfd.date_demande")." as date_demande"; $sql.= " , ".$db->pdate("pfd.date_demande")." as date_demande";
$sql .= " , pfd.fk_user_demande"; $sql.= " , pfd.fk_user_demande";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd"; $sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
$sql .= " WHERE s.idp = f.fk_soc"; $sql.= " WHERE s.idp = f.fk_soc";
$sql .= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid"; if (! $statut) $sql.= " AND pfd.traite = 0";
if ($statut) $sql.= " AND pfd.traite = ".$statut;
$sql.= " AND pfd.fk_facture = f.rowid";
if (strlen(trim($_GET["search_societe"]))) if (strlen(trim($_GET["search_societe"])))
{ {
$sql .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'"; $sql .= " AND s.nom LIKE '%".$_GET["search_societe"]."%'";

10
htdocs/compta/prelevement/pre.inc.php
View File

@ -18,13 +18,12 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/compta/prelevement/pre.inc.php \file htdocs/compta/prelevement/pre.inc.php
\ingroup prelevement \ingroup prelevement
\brief Fichier gestionnaire du menu prelevement \brief Fichier gestionnaire du menu prelevement
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -36,6 +35,7 @@ $langs->load("bills");
$user->getrights("prelevement"); $user->getrights("prelevement");
function llxHeader($head = "", $title="", $help_url='') function llxHeader($head = "", $title="", $help_url='')
{ {
global $user, $conf, $langs; global $user, $conf, $langs;
@ -65,7 +65,7 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("Demandes")); $menu->add(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("Demandes"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrderToProcess")); $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php",$langs->trans("StandingOrderToProcess"));
$menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandestraitees.php",$langs->trans("StandingOrderProcessed")); $menu->add_submenu(DOL_URL_ROOT."/compta/prelevement/demandes.php?statut=1",$langs->trans("StandingOrderProcessed"));
} }
} }