Fix: Missing translation

This commit is contained in:
Laurent Destailleur 2008-10-23 18:09:06 +00:00
parent 8134ced717
commit fab9a7ff17

View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* 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
@ -16,16 +16,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/compta/bank/bankid_fr.php * \file htdocs/compta/bank/bankid_fr.php
\ingroup banque * \ingroup banque
\brief Fiche création compte bancaire * \brief Fiche création compte bancaire
\version $Revision$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
@ -33,54 +31,57 @@ require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php");
$langs->load("banks"); $langs->load("banks");
if (!$user->admin && !$user->rights->banque) if (!$user->admin && !$user->rights->banque)
accessforbidden(); accessforbidden();
/* /*
* Actions * Actions
*/ */
if ($_POST["action"] == 'update' && ! $_POST["cancel"]) if ($_POST["action"] == 'update' && ! $_POST["cancel"])
{ {
// Modification // Modification
$account = new Account($db, $_POST["id"]); $account = new Account($db, $_POST["id"]);
$account->fetch($_POST["id"]); $account->fetch($_POST["id"]);
$account->bank = trim($_POST["bank"]); $account->bank = trim($_POST["bank"]);
$account->code_banque = trim($_POST["code_banque"]); $account->code_banque = trim($_POST["code_banque"]);
$account->code_guichet = trim($_POST["code_guichet"]); $account->code_guichet = trim($_POST["code_guichet"]);
$account->number = trim($_POST["number"]); $account->number = trim($_POST["number"]);
$account->cle_rib = trim($_POST["cle_rib"]); $account->cle_rib = trim($_POST["cle_rib"]);
$account->bic = trim($_POST["bic"]); $account->bic = trim($_POST["bic"]);
$account->iban_prefix = trim($_POST["iban_prefix"]); $account->iban_prefix = trim($_POST["iban_prefix"]);
$account->domiciliation = trim($_POST["domiciliation"]); $account->domiciliation = trim($_POST["domiciliation"]);
$account->proprio = trim($_POST["proprio"]); $account->proprio = trim($_POST["proprio"]);
$account->adresse_proprio = trim($_POST["adresse_proprio"]); $account->adresse_proprio = trim($_POST["adresse_proprio"]);
if ($account->id) if ($account->id)
{ {
$result = $account->update_rib($user); $result = $account->update_rib($user);
if ($result >= 0) if ($result >= 0)
{ {
$_GET["id"]=$_POST["id"]; // Force chargement page en mode visu $_GET["id"]=$_POST["id"]; // Force chargement page en mode visu
} }
else else
{ {
$message='<div class="error">'.$account->error().'</div>'; $message='<div class="error">'.$account->error().'</div>';
$_GET["action"]='edit'; // Force chargement page edition $_GET["action"]='edit'; // Force chargement page edition
} }
} }
} }
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer) if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
{ {
// Modification // Modification
$account = new Account($db, $_GET["id"]); $account = new Account($db, $_GET["id"]);
$account->delete($_GET["id"]); $account->delete($_GET["id"]);
header("Location: ".DOL_URL_ROOT."/compta/bank/index.php"); header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
exit; exit;
} }
/*
* View
*/
llxHeader(); llxHeader();
@ -92,204 +93,204 @@ $form = new Form($db);
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
if (($_GET["id"] || $_GET["ref"]) && $_GET["action"] != 'edit') if (($_GET["id"] || $_GET["ref"]) && $_GET["action"] != 'edit')
{
$account = new Account($db);
if ($_GET["id"])
{ {
$account = new Account($db); $result=$account->fetch($_GET["id"]);
if ($_GET["id"]) }
{ if ($_GET["ref"])
$result=$account->fetch($_GET["id"]); {
} $result=$account->fetch(0,$_GET["ref"]);
if ($_GET["ref"]) $_GET["id"]=$account->id;
{ }
$result=$account->fetch(0,$_GET["ref"]);
$_GET["id"]=$account->id;
}
/* /*
* Affichage onglets * Affichage onglets
*/ */
// Onglets // Onglets
$head=bank_prepare_head($account); $head=bank_prepare_head($account);
dolibarr_fiche_head($head, 'bankid', $langs->trans("FinancialAccount")); dolibarr_fiche_head($head, 'bankid', $langs->trans("FinancialAccount"));
/* /*
* Confirmation de la suppression * Confirmation de la suppression
*/ */
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
{ {
$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete"); $form->form_confirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
print '<br />'; print '<br />';
} }
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // Ref
print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>'; print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showrefnav($account,'ref','',1,'ref'); print $form->showrefnav($account,'ref','',1,'ref');
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Label").'</td>'; print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
print '<td colspan="3">'.$account->label.'</td></tr>'; print '<td colspan="3">'.$account->label.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>'; print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>'; print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Status").'</td>'; print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
print '<td colspan="3">'.$account->getLibStatut(4).'</td></tr>'; print '<td colspan="3">'.$account->getLibStatut(4).'</td></tr>';
if ($account->type == 0 || $account->type == 1) if ($account->type == 0 || $account->type == 1)
{ {
print '<tr><td valign="top">'.$langs->trans("BankName").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankName").'</td>';
print '<td colspan="3">'.$account->bank.'</td></tr>'; print '<td colspan="3">'.$account->bank.'</td></tr>';
print '<tr><td>Code Banque</td>'; print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td colspan="3">'.$account->code_banque.'</td>'; print '<td colspan="3">'.$account->code_banque.'</td>';
print '</tr>'; print '</tr>';
print '<tr><td>Code Guichet</td>'; print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td colspan="3">'.$account->code_guichet.'</td>'; print '<td colspan="3">'.$account->code_guichet.'</td>';
print '</tr>'; print '</tr>';
print '<tr><td>Numéro</td>'; print '<tr><td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td colspan="3">'.$account->number.'</td>'; print '<td colspan="3">'.$account->number.'</td>';
print '</tr>'; print '</tr>';
print '<tr><td>Clé RIB</td>'; print '<tr><td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td colspan="3">'.$account->cle_rib.'</td>'; print '<td colspan="3">'.$account->cle_rib.'</td>';
print '</tr>'; print '</tr>';
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>'; print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="3">'.$account->iban_prefix.'</td></tr>'; print '<td colspan="3">'.$account->iban_prefix.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>'; print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3">'.$account->bic.'</td></tr>'; print '<td colspan="3">'.$account->bic.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print nl2br($account->domiciliation); print nl2br($account->domiciliation);
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">';
print $account->proprio; print $account->proprio;
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
print nl2br($account->adresse_proprio); print nl2br($account->adresse_proprio);
print "</td></tr>\n"; print "</td></tr>\n";
} }
print '</table>'; print '</table>';
print "\n</div>\n"; print "\n</div>\n";
/* /*
* Barre d'actions * Barre d'actions
* *
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($user->rights->banque->configurer)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$account->id.'">'.$langs->trans("Modify").'</a>';
}
print '</div>';
if ($user->rights->banque->configurer)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$account->id.'">'.$langs->trans("Modify").'</a>';
} }
/* ************************************************************************** */ print '</div>';
/* */
/* Edition */
/* */
/* ************************************************************************** */
if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configurer) }
{
$account = new Account($db, $_GET["id"]);
$account->fetch($_GET["id"]);
print_titre($langs->trans("EditFinancialAccount")); /* ************************************************************************** */
print "<br>"; /* */
/* Edition */
/* */
/* ************************************************************************** */
if ($message) { print "$message<br>\n"; } if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configurer)
{
$account = new Account($db, $_GET["id"]);
$account->fetch($_GET["id"]);
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post">'; print_titre($langs->trans("EditFinancialAccount"));
print '<input type="hidden" name="action" value="update">'; print "<br>";
print '<input type="hidden" name="id" value="'.$_GET["id"].'">'."\n\n";
print '<table class="border" width="100%">'; if ($message) { print "$message<br>\n"; }
// Ref print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post">';
print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>'; print '<input type="hidden" name="action" value="update">';
print '<td colspan="3">'.$account->ref; print '<input type="hidden" name="id" value="'.$_GET["id"].'">'."\n\n";
print '<table class="border" width="100%">';
// Ref
print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">'.$account->ref;
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
print '<td colspan="3">'.$account->label;
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
print '<td colspan="3">'.$account->type_lib[$account->type];
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
print '<td colspan="3">'.$account->getLibStatut(4);
print '</td></tr>';
if ($account->type == 0 || $account->type == 1)
{
// If bank account
print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>';
print '</tr>';
print '<tr><td>'.$langs->trans("BankCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>';
print '<tr><td>'.$langs->trans("DeskCode").'</td>';
print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
print '</tr>';
print '<td>'.$langs->trans("BankAccountNumber").'</td>';
print '<td><input size="15" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
print '</tr>';
print '<td>'.$langs->trans("BankAccountNumberKey").'</td>';
print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
print '</tr>';
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="3"><input size="24" type="text" class="flat" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3"><input size="24" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
print $account->domiciliation;
print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">';
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Label").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
print '<td colspan="3">'.$account->label; print "<textarea class=\"flat\" name=\"adresse_proprio\" rows=\"2\" cols=\"40\">";
print '</td></tr>'; print $account->adresse_proprio;
print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
print '<td colspan="3">'.$account->type_lib[$account->type];
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
print '<td colspan="3">'.$account->getLibStatut(4);
print '</td></tr>';
if ($account->type == 0 || $account->type == 1)
{
// If bank account
print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<td colspan="3"><input size="30" type="text" class="flat" name="bank" value="'.$account->bank.'"></td>';
print '</tr>';
print '<tr><td>Code Banque</td>';
print '<td><input size="8" type="text" class="flat" name="code_banque" value="'.$account->code_banque.'"></td>';
print '</tr>';
print '<tr><td>Code Guichet</td>';
print '<td><input size="8" type="text" class="flat" name="code_guichet" value="'.$account->code_guichet.'"></td>';
print '</tr>';
print '<td>Numéro</td>';
print '<td><input size="15" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
print '</tr>';
print '<td>Clé RIB</td>';
print '<td><input size="3" type="text" class="flat" name="cle_rib" value="'.$account->cle_rib.'"></td>';
print '</tr>';
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="3"><input size="24" type="text" class="flat" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3"><input size="24" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print "<textarea class=\"flat\" name=\"domiciliation\" rows=\"2\" cols=\"40\">";
print $account->domiciliation;
print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
print '<td colspan="3"><input size="30" type="text" class="flat" name="proprio" value="'.$account->proprio.'">';
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
print "<textarea class=\"flat\" name=\"adresse_proprio\" rows=\"2\" cols=\"40\">";
print $account->adresse_proprio;
print "</textarea></td></tr>";
}
print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Save").'" type="submit" class="button">';
print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
print '</td></tr>';
print '</table>';
print '</form>';
} }
print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Save").'" type="submit" class="button">';
print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
print '</td></tr>';
print '</table>';
print '</form>';
}
$db->close(); $db->close();