From ed543bc7892097c0aa575cd9ac4c384e87d2507d Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Tue, 1 Mar 2005 16:06:16 +0000 Subject: [PATCH] Ajout statut --- htdocs/compta/prelevement/fiche.php | 4 + htdocs/compta/prelevement/ligne.php | 368 +++++++++++++++------------- 2 files changed, 196 insertions(+), 176 deletions(-) diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 2d4e3ac9479..bb4903d002b 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -124,6 +124,10 @@ if ($_GET["id"]) print ''; + print 'Statut'; + print ' '; + print $lipre->statuts[$lipre->statut].''; + if($bon->date_trans <> 0) { $muser = new User($db, $bon->user_trans); diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 54d7cd5249c..032a371b777 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -20,7 +20,7 @@ * */ require("./pre.inc.php"); - +require_once DOL_DOCUMENT_ROOT."/compta/prelevement/ligne-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/compta/prelevement/rejet-prelevement.class.php"; require_once DOL_DOCUMENT_ROOT."/paiement.class.php"; require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php"; @@ -34,22 +34,29 @@ if ($_POST["action"] == 'confirm_rejet') { if ( $_POST["confirm"] == 'yes') { - if ($_POST["motif"] > 0) + + $lipre = new LignePrelevement($db, $user); + + if ($lipre->fetch($_GET["id"]) == 0) { - $rej = new RejetPrelevement($db, $user); - $rej->create($user, $_GET["id"], $_GET["socid"], $_GET["previd"], $_POST["motif"]); - - Header("Location: lignes.php?id=".$_GET["id"]); - } - else - { - Header("Location: lignes.php?id=".$_GET["id"]."&action=rejet&socid=".$_GET["socid"]."&previd=".$_GET["previd"]); + if ($_POST["motif"] > 0) + { + $rej = new RejetPrelevement($db, $user); + + $rej->create($user, $_GET["id"], $_POST["motif"], $lipre->bon_rowid); + + Header("Location: ligne.php?id=".$_GET["id"]); + } + else + { + Header("Location: ligne.php?id=".$_GET["id"]."&action=rejet&socid=".$_GET["socid"]."&previd=".$_GET["previd"]); + } } } else { - Header("Location: lignes.php?id=".$_GET["id"]); + Header("Location: ligne.php?id=".$_GET["id"]); } } @@ -57,185 +64,194 @@ if ($_POST["action"] == 'confirm_rejet') llxHeader('','Prélèvement'); $h = 0; -$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"]; +$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$_GET["id"]; $head[$h][1] = $langs->trans("Fiche"); $hselected = $h; $h++; if ($_GET["id"]) { - dolibarr_fiche_head($head, $hselected, 'Prélèvement : '. $bon->ref); + $lipre = new LignePrelevement($db, $user); - - print ''; - - print ''; - - print '
Référence'.$bon->ref.'

'; - -} - -if ($_GET["action"] == 'rejet') -{ - $html = new Form($db); - - $soc = new Societe($db); - $soc->fetch($_GET["socid"]); - - //$html->form_confirm("factures.php"."?id=".$_GET["id"]."&socid=".$_GET["socid"]."&previd=".$_GET["previd"],"Rejet de prélèvement","Etes-vous sûr de vouloir saisir un rejet de prélèvement pour la société ".$soc->nom." ?","confirm_rejet"); - - $rej = new RejetPrelevement($db, $user); - - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - - print '
Rejet de prélèvement
Etes-vous sûr de vouloir saisir un rejet de prélèvement pour la société '.$soc->nom.' ?'; - print ''; - print '
Motif du rejet'; - print ''; + + print ''; + print ''; + print ''; + + print '
Bons de prélèvement'; + print ''.$lipre->bon_ref.'
Montant'.price($lipre->amount).'
Statut'; + print ' '; + print $lipre->statuts[$lipre->statut].'

'; } - print ''; - print '		'; - print '
'; - - - - - print ''; - - print ''; - - print '
Référence'.$bon->ref.'

'; -} - -$page = $_GET["page"]; -$sortorder = $_GET["sortorder"]; -$sortfield = $_GET["sortfield"]; - -if ($page == -1) { $page = 0 ; } - -$offset = $conf->liste_limit * $page ; -$pageprev = $page - 1; -$pagenext = $page + 1; - -if ($sortorder == "") { - $sortorder="DESC"; -} -if ($sortfield == "") { - $sortfield="pl.fk_soc"; -} - -/* - * Liste des factures - * - * - */ -$sql = "SELECT pf.rowid"; -$sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc"; -$sql .= " , s.idp, s.nom"; -$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; -$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; -$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf"; -$sql .= " , ".MAIN_DB_PREFIX."facture as f"; -$sql .= " , ".MAIN_DB_PREFIX."societe as s"; -$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid"; -$sql .= " AND pl.fk_prelevement_bons = p.rowid"; -$sql .= " AND f.fk_soc = s.idp"; -$sql .= " AND pf.fk_facture = f.rowid"; -$sql .= " AND pl.rowid=".$_GET["id"]; - -if ($_GET["socid"]) -{ - $sql .= " AND s.idp = ".$_GET["socid"]; -} - -$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); - -$result = $db->query($sql); - -if ($result) -{ - $num = $db->num_rows(); - $i = 0; - - $urladd = "&id=".$_GET["id"]; - - print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num); - print"\n\n"; - print ''; - print ''; - print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd); - print_liste_field_titre("Société","factures.php","s.nom",'',$urladd); - print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"'); - print ''; - - $var=True; - - $total = 0; - - while ($i < min($num,$conf->liste_limit)) + else { - $obj = $db->fetch_object($i); - - print "\n"; - - print '\n"; - - print '\n"; - - print '\n"; - - $i++; + print "Erreur"; } - print "
 
"; - - print ''; - print img_object($langs->trans("ShowBill"),"bill"); - print ' '; - - print ''.$obj->ref."'; - print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."'.price($obj->total_ttc)."'; - - if ($obj->statut == 0) - { - print '-'; - } - elseif ($obj->statut == 1) - { - print 'Crédité'; - } - elseif ($obj->statut == 2) - { - print 'Rejeté'; - } - - print "
"; - $db->free(); -} -else -{ - print $db->error() . ' ' . $sql; -} -$db->close(); + if ($_GET["action"] == 'rejet') + { + $html = new Form($db); + + $soc = new Societe($db); + $soc->fetch($lipre->socid); + + $rej = new RejetPrelevement($db, $user); + + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + + print ''; + print ''; + print ''; + + print '
Rejet de prélèvement
Etes-vous sûr de vouloir saisir un rejet de prélèvement pour la société '.$soc->nom.' ?'; + print ''; + print '
Motif du rejet'; + print ''; + print ''; + print '
'; + + } + + $page = $_GET["page"]; + $sortorder = $_GET["sortorder"]; + $sortfield = $_GET["sortfield"]; + + if ($page == -1) { $page = 0 ; } + + $offset = $conf->liste_limit * $page ; + $pageprev = $page - 1; + $pagenext = $page + 1; + + if ($sortorder == "") $sortorder="DESC"; + if ($sortfield == "") $sortfield="pl.fk_soc"; + + /* + * Liste des factures + * + * + */ + $sql = "SELECT pf.rowid"; + $sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc"; + $sql .= " , s.idp, s.nom"; + $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p"; + $sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl"; + $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf"; + $sql .= " , ".MAIN_DB_PREFIX."facture as f"; + $sql .= " , ".MAIN_DB_PREFIX."societe as s"; + $sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid"; + $sql .= " AND pl.fk_prelevement_bons = p.rowid"; + $sql .= " AND f.fk_soc = s.idp"; + $sql .= " AND pf.fk_facture = f.rowid"; + $sql .= " AND pl.rowid=".$_GET["id"]; + + if ($_GET["socid"]) + { + $sql .= " AND s.idp = ".$_GET["socid"]; + } + + $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset); + + $result = $db->query($sql); + + if ($result) + { + $num = $db->num_rows(); + $i = 0; + + $urladd = "&id=".$_GET["id"]; + + print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num); + print"\n\n"; + print ''; + print ''; + print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd); + print_liste_field_titre("Société","factures.php","s.nom",'',$urladd); + print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"'); + print ''; + + $var=True; + + $total = 0; + + while ($i < min($num,$conf->liste_limit)) + { + $obj = $db->fetch_object($i); + + print "\n"; + + print '\n"; + + print '\n"; + + + print "\n"; + + $i++; + } + + print "
 
"; + + print ''; + print img_object($langs->trans("ShowBill"),"bill"); + print ' '; + + print ''.$obj->ref."'; + print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."'.price($obj->total_ttc)."
"; + + $db->free(); + } + else + { + print $db->error() . ' ' . $sql; + } + + $db->close(); + + + /* ************************************************************************** */ + /* */ + /* Barre d'action */ + /* */ + /* ************************************************************************** */ + + print "\n\n
\n"; + + if ($_GET["action"] == '') + { + + if ($bon->credite == 1 && $lipre->statut == 2) + { + print "id\">".$langs->trans("Emmetre un rejet").""; + } + } + + print "
"; +} llxFooter("Dernière modification $Date$ révision $Revision$"); ?>