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

fix: gestion des montants avec espace et virgule lors de l'emission d'un paiement

Browse Source 
fix: suppression de l'criture bancaire lors de la suppression d'un paiement
This commit is contained in:
marc_ocebo 2005-10-05 01:48:00 +00:00
parent af75a55959
commit ec4818c133
3 changed files with 661 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
htdocs/compta/paiement.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -27,33 +28,33 @@
\version $Revision$ \version $Revision$
*/ */
include_once("./pre.inc.php"); include_once('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php');
include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); include_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); include_once(DOL_DOCUMENT_ROOT.'/compta/bank/account.class.php');
$langs->load("bills"); $langs->load('bills');
$langs->load("banks"); $langs->load('banks');
$facid=isset($_GET["facid"])?$_GET["facid"]:$_POST["facid"]; $facid=isset($_GET['facid'])?$_GET['facid']:$_POST['facid'];
$socname=isset($_GET["socname"])?$_GET["socname"]:$_POST["socname"]; $socname=isset($_GET['socname'])?$_GET['socname']:$_POST['socname'];
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortfield = isset($_GET['sortfield'])?$_GET['sortfield']:$_POST['sortfield'];
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; $sortorder = isset($_GET['sortorder'])?$_GET['sortorder']:$_POST['sortorder'];
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"]; $page=isset($_GET['page'])?$_GET['page']:$_POST['page'];
/* /*
* Actions * Actions
*/ */
if ($_POST["action"] == 'add_paiement') if ($_POST['action'] == 'add_paiement')
{ {
$error = 0; $error = 0;
$datepaye = $db->idate(mktime(12, 0 , 0, $datepaye = $db->idate(mktime(12, 0 , 0,
$_POST["remonth"], $_POST['remonth'],
$_POST["reday"], $_POST['reday'],
$_POST["reyear"])); $_POST['reyear']));
$paiement_id = 0; $paiement_id = 0;
$total = 0; $total = 0;
// Génère tableau des montants amounts // Génère tableau des montants amounts
@ -63,16 +64,15 @@ if ($_POST["action"] == 'add_paiement')
if (substr($key,0,7) == 'amount_') if (substr($key,0,7) == 'amount_')
{ {
$other_facid = substr($key,7); $other_facid = substr($key,7);
$amounts[$other_facid] = $_POST[$key]; $amounts[$other_facid] = $_POST[$key];
$total = $total + $amounts[$other_facid]; $total = $total + $amounts[$other_facid];
} }
} }
// Effectue les vérifications des parametres // Effectue les vérifications des parametres
if ($_POST["paiementid"] <= 0) if ($_POST['paiementid'] <= 0)
{ {
$fiche_erreur_message = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("PaymentMode")).'</div>'; $fiche_erreur_message = '<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->trans('PaymentMode')).'</div>';
$error++; $error++;
} }
@ -80,16 +80,16 @@ if ($_POST["action"] == 'add_paiement')
{ {
// Si module bank actif, un compte est obligatoire lors de la saisie // Si module bank actif, un compte est obligatoire lors de la saisie
// d'un paiement // d'un paiement
if (! $_POST["accountid"]) if (! $_POST['accountid'])
{ {
$fiche_erreur_message = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("AccountToCredit")).'</div>'; $fiche_erreur_message = '<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->trans('AccountToCredit')).'</div>';
$error++; $error++;
} }
} }
if ($total <= 0) if ($total <= 0)
{ {
$fiche_erreur_message = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Amount")).'</div>'; $fiche_erreur_message = '<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->trans('Amount')).'</div>';
$error++; $error++;
} }
@ -101,9 +101,9 @@ if ($_POST["action"] == 'add_paiement')
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->datepaye = $datepaye; $paiement->datepaye = $datepaye;
$paiement->amounts = $amounts; // Tableau de montant $paiement->amounts = $amounts; // Tableau de montant
$paiement->paiementid = $_POST["paiementid"]; $paiement->paiementid = $_POST['paiementid'];
$paiement->num_paiement = $_POST["num_paiement"]; $paiement->num_paiement = $_POST['num_paiement'];
$paiement->note = $_POST["comment"]; $paiement->note = $_POST['comment'];
$paiement_id = $paiement->create($user); $paiement_id = $paiement->create($user);
@ -111,22 +111,16 @@ if ($_POST["action"] == 'add_paiement')
{ {
// On determine le montant total du paiement // On determine le montant total du paiement
$total=0; $total=0;
foreach ($paiement->amounts as $key => $value) foreach ($paiement->amounts as $value)
{ {
$facid = $key; $total += $value;
$value = trim($value);
$amount = round(ereg_replace(",",".",$value), 2);
if (is_numeric($amount))
{
$total += $amount;
}
} }
if ($conf->banque->enabled) if ($conf->banque->enabled)
{ {
// Insertion dans llx_bank // Insertion dans llx_bank
$label = "Règlement facture"; $label = 'Règlement facture';
$acc = new Account($db, $_POST["accountid"]); $acc = new Account($db, $_POST['accountid']);
//paiementid contient "CHQ ou VIR par exemple" //paiementid contient "CHQ ou VIR par exemple"
$bank_line_id = $acc->addline($paiement->datepaye, $bank_line_id = $acc->addline($paiement->datepaye,
$paiement->paiementid, $paiement->paiementid,
@ -141,7 +135,6 @@ if ($_POST["action"] == 'add_paiement')
if ($bank_line_id > 0) if ($bank_line_id > 0)
{ {
$paiement->update_fk_bank($bank_line_id); $paiement->update_fk_bank($bank_line_id);
// Mise a jour liens (pour chaque facture concernées par le paiement) // Mise a jour liens (pour chaque facture concernées par le paiement)
foreach ($paiement->amounts as $key => $value) foreach ($paiement->amounts as $key => $value)
{ {
@ -152,7 +145,7 @@ if ($_POST["action"] == 'add_paiement')
$acc->add_url_line($bank_line_id, $acc->add_url_line($bank_line_id,
$paiement_id, $paiement_id,
DOL_URL_ROOT.'/compta/paiement/fiche.php?id=', DOL_URL_ROOT.'/compta/paiement/fiche.php?id=',
"(paiement)", '(paiement)',
'payment'); 'payment');
$acc->add_url_line($bank_line_id, $acc->add_url_line($bank_line_id,
$fac->client->id, $fac->client->id,
@ -160,14 +153,12 @@ if ($_POST["action"] == 'add_paiement')
$fac->client->nom, $fac->client->nom,
'company'); 'company');
} }
} }
else else
{ {
$error++; $error++;
} }
} }
} }
else else
{ {
@ -175,12 +166,11 @@ if ($_POST["action"] == 'add_paiement')
$error++; $error++;
} }
if ($error == 0) if ($error == 0)
{ {
$loc = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$paiement_id; $loc = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$paiement_id;
$db->commit(); $db->commit();
Header("Location: $loc"); Header('Location: '.$loc);
} }
else else
{ {
@ -210,15 +200,14 @@ if ($fiche_erreur_message)
print '<tr><td colspan="3" align="center">'.$fiche_erreur_message.'</td></tr>'; print '<tr><td colspan="3" align="center">'.$fiche_erreur_message.'</td></tr>';
} }
if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement') if ($_GET['action'] == 'create' || $_POST['action'] == 'add_paiement')
{ {
$facture = new Facture($db); $facture = new Facture($db);
$facture->fetch($facid); $facture->fetch($facid);
$sql = "SELECT s.nom,s.idp, f.amount, f.total_ttc as total, f.facnumber"; $sql = 'SELECT s.nom,s.idp, f.amount, f.total_ttc as total, f.facnumber';
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.idp"; $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture as f WHERE f.fk_soc = s.idp';
$sql .= " AND f.rowid = $facid"; $sql .= ' AND f.rowid = '.$facid;
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
@ -229,38 +218,41 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
$total = $obj->total; $total = $obj->total;
print_titre($langs->trans("DoPayment")); print_titre($langs->trans('DoPayment'));
print '<form action="paiement.php" method="post">'; print '<form action="paiement.php" method="post">';
print '<input type="hidden" name="action" value="add_paiement">'; print '<input type="hidden" name="action" value="add_paiement">';
print "<input type=\"hidden\" name=\"facid\" value=\"$facid\">"; print '<input type="hidden" name="facid" value="'.$facid.'">';
print "<input type=\"hidden\" name=\"facnumber\" value=\"$obj->facnumber\">"; print '<input type="hidden" name="facnumber" value="'.$obj->facnumber.'">';
print "<input type=\"hidden\" name=\"socid\" value=\"$obj->idp\">"; print '<input type="hidden" name="socid" value="'.$obj->idp.'">';
print "<input type=\"hidden\" name=\"societe\" value=\"$obj->nom\">"; print '<input type="hidden" name="societe" value="'.$obj->nom.'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr><td>".$langs->trans("Company")."</td><td colspan=\"2\">$obj->nom</td></tr>\n"; print '<tr><td>'.$langs->trans('Company').'</td><td colspan="2">'.$obj->nom."</td></tr>\n";
print "<tr><td>".$langs->trans("Date")."</td><td>"; print '<tr><td>'.$langs->trans('Date').'</td><td>';
$html->select_date(); if (!empty($_POST['remonth']) && !empty($_POST['reday']) && !empty($_POST['reyear']))
$sel_date=mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
else
$sel_date='';
$html->select_date($sel_date);
print '</td>'; print '</td>';
print '<td>'.$langs->trans("Comments").'</td></tr>'; print '<td>'.$langs->trans('Comments').'</td></tr>';
print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>'; print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
$html->select_types_paiements('','paiementid'); $html->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid');
print "</td>\n"; print "</td>\n";
print '<td rowspan="3" valign="top">'; print '<td rowspan="3" valign="top">';
print '<textarea name="comment" wrap="soft" cols="40" rows="4"></textarea></td></tr>'; print '<textarea name="comment" wrap="soft" cols="40" rows="4">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td></tr>';
print "<tr><td>".$langs->trans("Numero")."</td><td><input name=\"num_paiement\" type=\"text\"><br><em>Numéro du chèque / virement</em></td></tr>\n";
print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement'])?'':$_POST['num_paiement']).'"><br><em>Numéro du chèque / virement</em></td></tr>';
if ($conf->banque->enabled) if ($conf->banque->enabled)
{ {
print "<tr><td>".$langs->trans("AccountToCredit")."</td><td>"; print '<tr><td>'.$langs->trans('AccountToCredit').'</td><td>';
$html->select_comptes('','accountid',0,'',1); $html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',1);
print "</td></tr>\n"; print "</td></tr>\n";
} }
else else
@ -271,32 +263,29 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
/* /*
* Autres factures impayées * Autres factures impayées
*/ */
$sql = "SELECT f.rowid as facid,f.facnumber,f.total_ttc,".$db->pdate("f.datef")." as df"; $sql = 'SELECT f.rowid as facid,f.facnumber,f.total_ttc,'.$db->pdate('f.datef').' as df';
$sql .= ", sum(pf.amount) as am"; $sql .= ', sum(pf.amount) as am';
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON pf.fk_facture = f.rowid"; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
$sql .= " WHERE f.fk_soc = ".$facture->socidp; $sql .= ' WHERE f.fk_soc = '.$facture->socidp;
$sql .= " AND f.paye = 0"; $sql .= ' AND f.paye = 0';
$sql .= " AND f.fk_statut = 1"; // Statut=0 => non validée, Statut=2 => annulée $sql .= ' AND f.fk_statut = 1'; // Statut=0 => non validée, Statut=2 => annulée
$sql .= " GROUP BY f.facnumber"; $sql .= ' GROUP BY f.facnumber';
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
print '<tr><td colspan="3">'; print '<tr><td colspan="3">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Bill").'</td><td align="center">'.$langs->trans("Date").'</td>'; print '<td>'.$langs->trans('Bill').'</td><td align="center">'.$langs->trans('Date').'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td>'; print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
print '<td align="right">'.$langs->trans("Received").'</td>'; print '<td align="right">'.$langs->trans('Received').'</td>';
print '<td align="right">'.$langs->trans("RemainderToPay").'</td>'; print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
print '<td align="center">'.$langs->trans("Amount").'</td>'; print '<td align="center">'.$langs->trans('Amount').'</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -308,31 +297,30 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
$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="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->facnumber; print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans('ShowBill'),'bill').' '.$objp->facnumber;
print "</a></td>\n"; print "</a></td>\n";
if ($objp->df > 0 ) if ($objp->df > 0 )
{ {
print "<td align=\"center\">"; print '<td align="center">';
print strftime("%d %b %Y",$objp->df)."</td>\n"; print dolibarr_print_date($objp->df)."</td>\n";
} }
else else
{ {
print "<td align=\"center\"><b>!!!</b></td>\n"; print '<td align="center"><b>!!!</b></td>';
} }
print '<td align="right">'.price($objp->total_ttc)."</td>"; print '<td align="right">'.price($objp->total_ttc).'</td>';
print '<td align="right">'.price($objp->am)."</td>"; print '<td align="right">'.price($objp->am).'</td>';
print '<td align="right">'.price($objp->total_ttc - $objp->am)."</td>"; print '<td align="right">'.price($objp->total_ttc - $objp->am).'</td>';
print '<td align="center">'; print '<td align="center">';
$namef = 'amount_'.$objp->facid;
$namef = "amount_".$objp->facid;
print '<input type="text" size="8" name="'.$namef.'">'; print '<input type="text" size="8" name="'.$namef.'">';
print "</td></tr>\n"; print "</td></tr>\n";
$total+=$objp->total; $total+=$objp->total;
$total_ttc+=$objp->total_ttc; $total_ttc+=$objp->total_ttc;
$totalrecu+=$objp->am; $totalrecu+=$objp->am;
@ -342,10 +330,10 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
{ {
// Print total // Print total
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="2" align="left">'.$langs->trans("TotalTTC").':</td>'; print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').':</td>';
print "<td align=\"right\"><b>".price($total_ttc)."</b></td>"; print '<td align="right"><b>'.price($total_ttc).'</b></td>';
print "<td align=\"right\"><b>".price($totalrecu)."</b></td>"; print '<td align="right"><b>'.price($totalrecu).'</b></td>';
print "<td align=\"right\"><b>".price($total_ttc - $totalrecu)."</b></td>"; print '<td align="right"><b>'.price($total_ttc - $totalrecu).'</b></td>';
print '<td align="center">&nbsp;</td>'; print '<td align="center">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
} }
@ -361,8 +349,8 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
/* /*
* *
*/ */
print '<tr><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>'; print '<tr><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans('Save').'"></td></tr>';
print "</table>"; print '</table>';
print "</form>\n"; print "</form>\n";
} }
} }
@ -372,27 +360,26 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
/** /**
* \brief Affichage de la liste des paiement * \brief Affichage de la liste des paiement
*/ */
if (! $_GET["action"] && ! $_POST["action"]) if (! $_GET['action'] && ! $_POST['action'])
{ {
if ($page == -1) $page = 0 ; if ($page == -1) $page = 0 ;
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder='DESC';
if (! $sortfield) $sortfield="p.datep"; if (! $sortfield) $sortfield='p.datep';
$sql = "SELECT ".$db->pdate("p.datep")." as dp, p.amount, f.amount as fa_amount, f.facnumber"; $sql = 'SELECT '.$db->pdate('p.datep').' as dp, p.amount, f.amount as fa_amount, f.facnumber';
$sql .=", f.rowid as facid, c.libelle as paiement_type, p.num_paiement"; $sql .=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."c_paiement as c"; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c';
$sql .= " WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id"; $sql .= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id';
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= ' AND f.fk_soc = '.$socidp;
} }
$sql .= " ORDER BY $sortfield $sortorder"; $sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
$sql .= $db->plimit( $limit +1 ,$offset); $sql .= $db->plimit( $limit +1 ,$offset);
$resql = $db->query($sql); $resql = $db->query($sql);
@ -402,34 +389,33 @@ if (! $_GET["action"] && ! $_POST["action"])
$i = 0; $i = 0;
$var=True; $var=True;
print_barre_liste($langs->trans("Payments"), $page, "paiement.php","",$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans('Payments'), $page, 'paiement.php','',$sortfield,$sortorder,'',$num);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Bill"),"paiement.php","facnumber","","","",$sortfield); print_liste_field_titre($langs->trans('Bill'),'paiement.php','facnumber','','','',$sortfield);
print_liste_field_titre($langs->trans("Date"),"paiement.php","dp","","","",$sortfield); print_liste_field_titre($langs->trans('Date'),'paiement.php','dp','','','',$sortfield);
print_liste_field_titre($langs->trans("Type"),"paiement.php","libelle","","","",$sortfield); print_liste_field_titre($langs->trans('Type'),'paiement.php','libelle','','','',$sortfield);
print_liste_field_titre($langs->trans("Amount"),"paiement.php","fa_amount","","",'align="right"',$sortfield); print_liste_field_titre($langs->trans('Amount'),'paiement.php','fa_amount','','','align="right"',$sortfield);
print "<td>&nbsp;</td>"; print '<td>&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$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=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></td>\n"; print '<td><a href="facture.php?facid='.$objp->facid.'">'.$objp->facnumber."</a></td>\n";
print "<td>".strftime("%d %B %Y",$objp->dp)."</td>\n"; print '<td>'.dolibarr_print_date($objp->dp)."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n"; print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>'; print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
print "</tr>"; print '</tr>';
$i++; $i++;
} }
print "</table>"; print '</table>';
} }
} }
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>');
?> ?>

115
htdocs/compta/paiement/fiche.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -27,35 +28,53 @@
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require('./pre.inc.php');
require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
$user->getrights('facture'); $user->getrights('facture');
$langs->load("bills"); $langs->load('bills');
$langs->load("banks"); $langs->load('banks');
$langs->load("companies"); $langs->load('companies');
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes' && $user->rights->facture->creer) if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes' && $user->rights->facture->creer)
{ {
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->id = $_GET["id"]; $paiement->fetch($_GET['id']);
if ( $paiement->delete() ) $bank_line_id = $paiement->bank_line;
$deleted = $paiement->delete();
if ($deleted)
{ {
Header("Location: liste.php"); // Supprimer l'écriture bancaire
if (!empty($bank_line_id))
{
$acc = new Account($db);
$acc->deleteline($bank_line_id);
Header('Location: liste.php');
}
else
{
print 'bank_line_id='.$bank_line_id;
exit;
}
}
else
{
print 'deleted='.$deleted;
exit;
} }
} }
if ($_POST["action"] == 'confirm_valide' && $_POST["confirm"] == 'yes' && $user->rights->facture->creer) if ($_POST['action'] == 'confirm_valide' && $_POST['confirm'] == 'yes' && $user->rights->facture->creer)
{ {
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->id = $_GET["id"]; $paiement->id = $_GET['id'];
if ( $paiement->valide() == 0 ) if ( $paiement->valide() == 0 )
{ {
Header("Location: fiche.php?id=".$paiement->id); Header('Location: fiche.php?id='.$paiement->id);
} }
} }
@ -69,8 +88,8 @@ llxHeader();
print '<div class="tabs">'; print '<div class="tabs">';
print '<a href="fiche.php?id='.$_GET["id"].'" id="active" class="tab">'.$langs->trans("Payment").'</a>'; print '<a href="fiche.php?id='.$_GET['id'].'" id="active" class="tab">'.$langs->trans('Payment').'</a>';
print '<a class="tab" href="info.php?id='.$_GET["id"].'">'.$langs->trans("Info").'</a>'; print '<a class="tab" href="info.php?id='.$_GET['id'].'">'.$langs->trans('Info').'</a>';
print '</div>'; print '</div>';
print '<div class="tabBar">'; print '<div class="tabBar">';
@ -81,43 +100,47 @@ print '<div class="tabBar">';
*/ */
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->fetch($_GET["id"]); $paiement->fetch($_GET['id']);
$html = new Form($db); $html = new Form($db);
/* /*
* Confirmation de la suppression du paiement * Confirmation de la suppression du paiement
*/ */
if ($_GET["action"] == 'delete') if ($_GET['action'] == 'delete')
{ {
$html->form_confirm("fiche.php?id=$paiement->id","Supprimer le paiement","Etes-vous sûr de vouloir supprimer ce paiement ?","confirm_delete"); $html->form_confirm('fiche.php?id='.$paiement->id, 'Supprimer le paiement', 'Etes-vous sûr de vouloir supprimer ce paiement ?', 'confirm_delete');
print '<br>'; print '<br>';
} }
/* /*
* Confirmation de la validation du paiement * Confirmation de la validation du paiement
*/ */
if ($_GET["action"] == 'valide') if ($_GET['action'] == 'valide')
{ {
$html->form_confirm("fiche.php?id=$paiement->id","Valider le paiement","Etes-vous sûr de vouloir valider ce paiment, auncune modification n'est possible une fois le paiement validé ?","confirm_valide"); $html->form_confirm('fiche.php?id='.$paiement->id, 'Valider le paiement', 'Etes-vous sûr de vouloir valider ce paiment, auncune modification n\'est possible une fois le paiement validé ?', 'confirm_valide');
print '<br>'; print '<br>';
} }
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top" width="140">'.$langs->trans("Ref").'</td><td>'.$paiement->id.'</td></tr>'; print '<tr><td valign="top" width="140">'.$langs->trans('Ref').'</td><td>'.$paiement->id.'</td></tr>';
if ($paiement->bank_account) { if ($paiement->bank_account)
{
// Si compte renseigné, on affiche libelle // Si compte renseigné, on affiche libelle
print '<tr><td valign="top" width="140">'; print '<tr><td valign="top" width="140">';
$bank=new Account($db); $bank=new Account($db);
$bank->fetch($paiement->bank_account); $bank->fetch($paiement->bank_account);
print $langs->trans("BankAccount").'</td><td><a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$bank->id.'">'.$bank->label.'</a></td></tr>'; print $langs->trans('BankAccount').'</td><td><a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$bank->id.'">'.$bank->label.'</a></td></tr>';
} }
print '<tr><td valign="top" width="140">'.$langs->trans("Date").'</td><td>'.dolibarr_print_date($paiement->date).'</td></tr>'; print '<tr><td valign="top" width="140">'.$langs->trans('Date').'</td><td>'.dolibarr_print_date($paiement->date).'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>'.$paiement->type_libelle.'</td></tr>'; print '<tr><td valign="top">'.$langs->trans('Type').'</td><td>'.$paiement->type_libelle.'</td></tr>';
if ($paiement->numero) { print '<tr><td valign="top">'.$langs->trans("Numero").'</td><td>'.$paiement->numero.'</td></tr>'; } if ($paiement->numero)
print '<tr><td valign="top">'.$langs->trans("Amount").'</td><td>'.$paiement->montant."&nbsp;".$langs->trans("Currency".$conf->monnaie).'</td></tr>'; {
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td>'.nl2br($paiement->note).'</td></tr>'; print '<tr><td valign="top">'.$langs->trans('Numero').'</td><td>'.$paiement->numero.'</td></tr>';
print "</table>"; }
print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td>'.price($paiement->montant).'&nbsp;'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
print '<tr><td valign="top">'.$langs->trans('Note').'</td><td>'.nl2br($paiement->note).'</td></tr>';
print '</table>';
/* /*
@ -125,10 +148,10 @@ print "</table>";
* *
*/ */
$allow_delete = 1 ; $allow_delete = 1 ;
$sql = "SELECT f.facnumber, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.idp"; $sql = 'SELECT f.facnumber, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.idp';
$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf,".MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."societe as s"; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
$sql .= " WHERE pf.fk_facture = f.rowid AND f.fk_soc = s.idp"; $sql .= ' WHERE pf.fk_facture = f.rowid AND f.fk_soc = s.idp';
$sql .= " AND pf.fk_paiement = ".$paiement->id; $sql .= ' AND pf.fk_paiement = '.$paiement->id;
if ($db->query($sql)) if ($db->query($sql))
{ {
@ -138,8 +161,8 @@ if ($db->query($sql))
$total = 0; $total = 0;
print '<br><table class="noborder" width="100%">'; print '<br><table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Bill").'</td><td>'.$langs->trans("Company").'</td>'; print '<td>'.$langs->trans('Bill').'</td><td>'.$langs->trans('Company').'</td>';
print '<td align="right">'.$langs->trans("AmountTTC").'</td><td align="center">'.$langs->trans("Status").'</td>'; print '<td align="right">'.$langs->trans('AmountTTC').'</td><td align="center">'.$langs->trans('Status').'</td>';
print "</tr>\n"; print "</tr>\n";
if ($num > 0) if ($num > 0)
@ -150,12 +173,11 @@ if ($db->query($sql))
{ {
$objp = $db->fetch_object(); $objp = $db->fetch_object();
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>';
print "<tr $bc[$var]>"; print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.img_object($langs->trans('ShowBill'),'bill').' ';
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill").' ';
print $objp->facnumber; print $objp->facnumber;
print "</a></td>\n"; print "</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->idp.'">'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.'</a></td>';
print '<td align="right">'.price($objp->amount).'</td>'; print '<td align="right">'.price($objp->amount).'</td>';
$fac=new Facture($db); $fac=new Facture($db);
print '<td align="center">'.$fac->LibStatut($objp->paye,$objp->fk_statut).'</td>'; print '<td align="center">'.$fac->LibStatut($objp->paye,$objp->fk_statut).'</td>';
@ -173,11 +195,12 @@ if ($db->query($sql))
print "</table>\n"; print "</table>\n";
$db->free(); $db->free();
} }
else { else
{
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</div>"; print '</div>';
/* /*
@ -186,17 +209,17 @@ print "</div>";
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '') if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET['action'] == '')
{ {
print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&amp;action=valide">'.$langs->trans("Valid").'</a>'; print '<a class="tabAction" href="fiche.php?id='.$_GET['id'].'&amp;action=valide">'.$langs->trans('Valid').'</a>';
} }
if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET["action"] == '') if ($user->societe_id == 0 && $allow_delete && $paiement->statut == 0 && $_GET['action'] == '')
{ {
print '<a class="butDelete" href="fiche.php?id='.$_GET["id"].'&amp;action=delete">'.$langs->trans("Delete").'</a>'; print '<a class="butDelete" href="fiche.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
} }
print "</div>"; print '</div>';
$db->close(); $db->close();

121
htdocs/paiement.class.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -46,6 +47,7 @@ class Paiement
//paiement de llx_c_paiement //paiement de llx_c_paiement
var $num_paiement; // Numéro du CHQ, VIR, etc... var $num_paiement; // Numéro du CHQ, VIR, etc...
var $bank_account; // Id compte bancaire du paiement var $bank_account; // Id compte bancaire du paiement
var $bank_line; // Id de la ligne d'écriture bancaire
var $note; var $note;
// fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...) // fk_paiement dans llx_paiement est l'id du type de paiement (7 pour CHQ, ...)
// fk_paiement dans llx_paiement_facture est le rowid du paiement // fk_paiement dans llx_paiement_facture est le rowid du paiement
@ -54,10 +56,10 @@ class Paiement
/** /**
* \brief Constructeur de la classe * \brief Constructeur de la classe
* \param DB handler accès base de données * \param DB handler accès base de données
* \param soc_idp id societe ("" par defaut) * \param soc_idp id societe ('' par defaut)
*/ */
function Paiement($DB, $soc_idp="") function Paiement($DB, $soc_idp='')
{ {
$this->db = $DB ; $this->db = $DB ;
} }
@ -69,30 +71,28 @@ class Paiement
function fetch($id) function fetch($id)
{ {
$sql = "SELECT p.rowid,".$this->db->pdate("p.datep")." as dp, p.amount, p.statut"; $sql = 'SELECT p.rowid,'.$this->db->pdate('p.datep').' as dp, p.amount, p.statut, p.fk_bank';
$sql .=", c.libelle as paiement_type"; $sql .=', c.libelle as paiement_type';
$sql .= ", p.num_paiement, p.note, b.fk_account"; $sql .= ', p.num_paiement, p.note, b.fk_account';
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as c "; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'c_paiement as c ';
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid "; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid ';
$sql .= " WHERE p.fk_paiement = c.id"; $sql .= ' WHERE p.fk_paiement = c.id';
$sql .= " AND p.rowid = ".$id; $sql .= ' AND p.rowid = '.$id;
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
if ($this->db->num_rows()) if ($this->db->num_rows())
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->date = $obj->dp; $this->date = $obj->dp;
$this->numero = $obj->num_paiement; $this->numero = $obj->num_paiement;
$this->bank_account = $obj->fk_account; $this->bank_account = $obj->fk_account;
$this->bank_line = $obj->fk_bank;
$this->montant = $obj->amount; $this->montant = $obj->amount;
$this->note = $obj->note; $this->note = $obj->note;
$this->type_libelle = $obj->paiement_type; $this->type_libelle = $obj->paiement_type;
$this->statut = $obj->statut; $this->statut = $obj->statut;
return 1; return 1;
} }
else else
@ -116,61 +116,55 @@ class Paiement
function create($user) function create($user)
{ {
$total = 0;
$sql_err = 0; $sql_err = 0;
$this->db->begin(); $this->db->begin();
$total = 0.0;
foreach ($this->amounts as $key => $value) foreach ($this->amounts as $key => $value)
{ {
$facid = $key; $val = $value;
$value = trim($value); $val = str_replace(' ','',$val);
$amount = ereg_replace(",",".",round($value, 2)); $val = str_replace(',','.',$val);
$val = round($val, 2);
if (is_numeric($amount)) $val = str_replace(',','.',$val);
if (is_numeric($val))
{ {
$total += $amount; $total += $val;
} }
$this->amounts[$key] = $val;
} }
$total = str_replace(',','.',$total);
$total = ereg_replace(",",".",$total);
if ($total <> 0) /* On accepte les montants négatifs pour les rejets de prélèvement */ if ($total <> 0) /* On accepte les montants négatifs pour les rejets de prélèvement */
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)"; $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement (datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)';
$sql .= " VALUES (now(), $this->datepaye, '$total', $this->paiementid, '$this->num_paiement', '$this->note', $user->id)"; $sql .= ' VALUES (now(), '.$this->datepaye.', \''.$total.'\', '.$this->paiementid.', \''.$this->num_paiement.'\', \''.$this->note.'\', '.$user->id.')';
$resql = $this->db->query($sql);
if ( $this->db->query($sql) ) if ($resql)
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."paiement"); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'paiement');
foreach ($this->amounts as $key => $amount)
foreach ($this->amounts as $key => $value)
{ {
$facid = $key; $facid = $key;
$value = trim($value);
$amount = ereg_replace(",",".",round($value, 2));
if (is_numeric($amount) && $amount <> 0) if (is_numeric($amount) && $amount <> 0)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount)"; $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)';
$sql .= " VALUES ('".$facid."','". $this->id."','". $amount."')"; $sql .= ' VALUES ('.$facid.','. $this->id.',\''.$amount.'\')';
if (! $this->db->query($sql) ) if (! $this->db->query($sql) )
{ {
dolibarr_syslog("Paiement::Create Erreur INSERT dans paiement_facture ".$facid); dolibarr_syslog('Paiement::Create Erreur INSERT dans paiement_facture '.$facid);
$sql_err++; $sql_err++;
} }
} }
else else
{ {
dolibarr_syslog("Paiement::Create Montant non numérique"); dolibarr_syslog('Paiement::Create Montant non numérique');
} }
} }
} }
else else
{ {
dolibarr_syslog("Paiement::Create Erreur INSERT dans paiement"); dolibarr_syslog('Paiement::Create Erreur INSERT dans paiement');
$sql_err++; $sql_err++;
} }
} }
@ -178,16 +172,15 @@ class Paiement
if ( $total <> 0 && $sql_err == 0 ) // On accepte les montants négatifs if ( $total <> 0 && $sql_err == 0 ) // On accepte les montants négatifs
{ {
$this->db->commit(); $this->db->commit();
dolibarr_syslog("Paiement::Create Ok Total = $total"); dolibarr_syslog('Paiement::Create Ok Total = '.$total);
return $this->id; return $this->id;
} }
else else
{ {
$this->db->rollback(); $this->db->rollback();
dolibarr_syslog("Paiement::Create Erreur"); dolibarr_syslog('Paiement::Create Erreur');
return -1; return -1;
} }
} }
/** /**
@ -202,15 +195,15 @@ class Paiement
if ($filtre == 'CRDT') if ($filtre == 'CRDT')
{ {
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 AND type IN (0,2) ORDER BY libelle"; $sql = 'SELECT id, libelle FROM '.MAIN_DB_PREFIX.'c_paiement WHERE active=1 AND type IN (0,2) ORDER BY libelle';
} }
elseif ($filtre == 'DBIT') elseif ($filtre == 'DBIT')
{ {
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 AND type IN (1,2) ORDER BY libelle"; $sql = 'SELECT id, libelle FROM '.MAIN_DB_PREFIX.'c_paiement WHERE active=1 AND type IN (1,2) ORDER BY libelle';
} }
else else
{ {
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement WHERE active=1 ORDER BY libelle"; $sql = 'SELECT id, libelle FROM '.MAIN_DB_PREFIX.'c_paiement WHERE active=1 ORDER BY libelle';
} }
$form->select($name, $sql, $id); $form->select($name, $sql, $id);
} }
@ -223,21 +216,20 @@ class Paiement
function delete() function delete()
{ {
$sql = "DELETE FROM llx_paiement_facture WHERE fk_paiement = ".$this->id; $this->db->begin();
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement_facture WHERE fk_paiement = '.$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiement WHERE rowid = ".$this->id; $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement WHERE rowid = '.$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
$this->db->commit();
return 1; return 1;
} }
else else
{ {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
$this->db->rollback();
return 0; return 0;
} }
} }
@ -249,7 +241,7 @@ class Paiement
function update_fk_bank($id_bank) function update_fk_bank($id_bank)
{ {
$sql = "UPDATE llx_paiement set fk_bank = ".$id_bank." where rowid = ".$this->id; $sql = 'UPDATE llx_paiement set fk_bank = '.$id_bank.' where rowid = '.$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -267,16 +259,15 @@ class Paiement
*/ */
function valide() function valide()
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."paiement SET statut = 1 WHERE rowid = ".$this->id; $sql = 'UPDATE '.MAIN_DB_PREFIX.'paiement SET statut = 1 WHERE rowid = '.$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
return 0; return 0;
} }
else else
{ {
dolibarr_syslog("Paiement::Valide Error -1"); dolibarr_syslog('Paiement::Valide Error -1');
return -1; return -1;
} }
} }
@ -288,37 +279,33 @@ class Paiement
function info($id) function info($id)
{ {
$sql = "SELECT c.rowid, ".$this->db->pdate("datec")." as datec, fk_user_creat, fk_user_modif"; $sql = 'SELECT c.rowid, '.$this->db->pdate('datec').' as datec, fk_user_creat, fk_user_modif';
$sql .= ", ".$this->db->pdate("tms")." as tms"; $sql .= ', '.$this->db->pdate('tms').' as tms';
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as c"; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as c';
$sql .= " WHERE c.rowid = $id"; $sql .= ' WHERE c.rowid = '.$id;
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
if ($this->db->num_rows()) if ($this->db->num_rows())
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
$this->id = $obj->idp; $this->id = $obj->idp;
if ($obj->fk_user_creat)
if ($obj->fk_user_creat) { {
$cuser = new User($this->db, $obj->fk_user_creat); $cuser = new User($this->db, $obj->fk_user_creat);
$cuser->fetch(); $cuser->fetch();
$this->user_creation = $cuser; $this->user_creation = $cuser;
} }
if ($obj->fk_user_modif)
if ($obj->fk_user_modif) { {
$muser = new User($this->db, $obj->fk_user_modif); $muser = new User($this->db, $obj->fk_user_modif);
$muser->fetch(); $muser->fetch();
$this->user_modification = $muser; $this->user_modification = $muser;
} }
$this->date_creation = $obj->datec; $this->date_creation = $obj->datec;
$this->date_modification = $obj->tms; $this->date_modification = $obj->tms;
} }
$this->db->free(); $this->db->free();
} }
else else
{ {