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

Trad: Traduction de la page "Emmettre un paiement"

Browse Source 
Qual: Utilisation de la fonction commune select_compte plutot que code en dur
This commit is contained in:
Laurent Destailleur 2005-09-04 22:39:53 +00:00
parent e2101a8b64
commit 5b12844ee4
2 changed files with 286 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
htdocs/compta/paiement.php
View File

@ -18,7 +18,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
@ -33,6 +32,9 @@ 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("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"];
@ -99,7 +101,16 @@ if ($_POST["action"] == 'add_paiement')
} }
} }
if ($conf->banque->enabled && $_POST["accountid"]) if ($conf->banque->enabled)
{
// Si module bank actif, un compte est obligatoire lors de la saisie
// d'un paiement
if (! $_POST["accountid"])
{
$fiche_erreur_message = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("AccountToCredit")).'</div>';
$error++;
}
else
{ {
// Insertion dans llx_bank // Insertion dans llx_bank
$label = "Règlement facture"; $label = "Règlement facture";
@ -145,6 +156,7 @@ if ($_POST["action"] == 'add_paiement')
$error++; $error++;
} }
} }
}
} }
else else
@ -161,31 +173,28 @@ if ($_POST["action"] == 'add_paiement')
} }
else else
{ {
// Il y a eu erreur
$db->rollback(); $db->rollback();
$fiche_erreur_message = $langs->trans("ErrorUnknown");
} }
} }
else else
{ {
$fiche_erreur_message = '<div class="error">Aucun montants indiqués</div>'; $fiche_erreur_message = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Amount")).'</div>';
} }
} }
else else
{ {
$fiche_erreur_message = '<div class="error">Vous devez sélectionner un mode de paiement</div>'; $fiche_erreur_message = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("PaymentMode")).'</div>';
} }
} }
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
$socidp = $user->societe_id; $socidp = $user->societe_id;
} }
/* /*
* Affichage * Affichage
*/ */
@ -199,7 +208,6 @@ 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);
@ -230,66 +238,28 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
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(); $html->select_date();
print '</td>'; print '</td>';
print '<td>'.$langs->trans("Comments").'</td></tr>'; print '<td>'.$langs->trans("Comments").'</td></tr>';
print '<tr><td>'.$langs->trans("Type").' :</td><td><select name="paiementid">'; print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>';
$html->select_types_paiements('','paiementid');
$sql = "SELECT id, libelle FROM ".MAIN_DB_PREFIX."c_paiement ORDER BY id";
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num)
{
$objopt = $db->fetch_object($resql);
print "<option value=\"$objopt->id\">$objopt->libelle</option>\n";
$i++;
}
}
print "</select>";
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"></textarea></td></tr>';
print "<tr><td>Numéro :</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\"><br><em>Numéro du chèque / virement</em></td></tr>\n";
if ($conf->banque->enabled) if ($conf->banque->enabled)
{ {
print "<tr><td>".$langs->trans("AccountToCredit")."</td><td>";
print "<tr><td>Compte à créditer :</td><td><select name=\"accountid\">\n"; $html->select_comptes('','accountid',0,'',1);
$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."bank_account ORDER BY rowid";
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows();
$i = 0;
while ($i < $num)
{
$objopt = $db->fetch_object($resql);
print '<option value="'.$objopt->rowid.'"';
if (defined("FACTURE_RIB_NUMBER") && FACTURE_RIB_NUMBER == $objopt->rowid)
{
print ' selected';
}
print '>'.$objopt->label.'</option>';
$i++;
}
$db->free($resql);
}
print "</select>";
print "</td></tr>\n"; print "</td></tr>\n";
} }
else else
{ {
@ -299,7 +269,6 @@ 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";
@ -370,7 +339,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
if ($i > 1) if ($i > 1)
{ {
// Print total // Print total
print "<tr ".$bc[!$var].">"; 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>";
@ -386,10 +355,10 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'add_paiement')
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
/* /*
* *
*/ */
print '<tr><td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>'; print '<tr><td colspan="3" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
print "</table>"; print "</table>";
print "</form>\n"; print "</form>\n";

10
htdocs/html.form.class.php
View File

@ -642,20 +642,26 @@ class Form
* \param htmlname Nom de la zone select * \param htmlname Nom de la zone select
* \param statut Statut des comptes recherchés * \param statut Statut des comptes recherchés
* \param filtre Pour filtre sur la liste * \param filtre Pour filtre sur la liste
* \param useempty Affiche valeur vide dans liste
*/ */
function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='') function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0)
{ {
global $langs; global $langs;
$sql = "SELECT rowid, label, bank"; $sql = "SELECT rowid, label, bank";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " WHERE clos = '".$satut."'"; $sql.= " WHERE clos = '".$statut."'";
if ($filtre) $sql.=" AND ".$filtre; if ($filtre) $sql.=" AND ".$filtre;
$sql.= " ORDER BY rowid"; $sql.= " ORDER BY rowid";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
print '<select class="flat" name="'.$htmlname.'">'; print '<select class="flat" name="'.$htmlname.'">';
if ($useempty)
{
print '<option value="'.$obj->rowid.'">&nbsp</option>';
}
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)