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

Dbut gestion des caisses

Browse Source 
Trad: Traduction espaces comptes
This commit is contained in:
Laurent Destailleur 2005-05-07 21:56:12 +00:00
parent de3afed54b
commit 29b8d54340
9 changed files with 343 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/compta/bank/account.class.php
View File

@ -38,9 +38,9 @@ class Account
{ {
var $rowid; var $rowid;
var $bank;
var $label; var $label;
var $courant; var $type;
var $bank;
var $clos; var $clos;
var $code_banque; var $code_banque;
var $code_guichet; var $code_guichet;
@ -50,15 +50,22 @@ class Account
var $iban_prefix; var $iban_prefix;
var $proprio; var $proprio;
var $adresse_proprio; var $adresse_proprio;
var $type_lib=array();
function Account($DB, $rowid=0) function Account($DB, $rowid=0)
{ {
global $langs;
$this->db = $DB; $this->db = $DB;
$this->rowid = $rowid; $this->rowid = $rowid;
$this->clos = 0; $this->clos = 0;
$this->solde = 0; $this->solde = 0;
$this->type_lib[0]=$langs->trans("BankType0");
$this->type_lib[1]=$langs->trans("BankType1");
$this->type_lib[2]=$langs->trans("BankType2");
return 1; return 1;
} }
@ -189,6 +196,8 @@ class Account
*/ */
function create() function create()
{ {
global $langs;
// Chargement librairie pour acces fonction controle RIB // Chargement librairie pour acces fonction controle RIB
require_once DOL_DOCUMENT_ROOT . '/compta/bank/bank.lib.php'; require_once DOL_DOCUMENT_ROOT . '/compta/bank/bank.lib.php';
@ -209,7 +218,7 @@ class Account
if ( $this->update() ) if ( $this->update() )
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, label, amount, fk_account,datev,dateo,fk_type,rappro) "; $sql = "INSERT INTO ".MAIN_DB_PREFIX."bank (datec, label, amount, fk_account,datev,dateo,fk_type,rappro) ";
$sql .= " VALUES (now(),'Solde','" . ereg_replace(',','.',$this->solde) . "','$this->id','".$this->db->idate($this->date_solde)."','".$this->db->idate($this->date_solde)."','SOLD',1);"; $sql .= " VALUES (now(),'".$langs->trans("Balance")."','" . ereg_replace(',','.',$this->solde) . "','$this->id','".$this->db->idate($this->date_solde)."','".$this->db->idate($this->date_solde)."','SOLD',1);";
$this->db->query($sql); $this->db->query($sql);
} }
return $this->id; return $this->id;
@ -288,9 +297,10 @@ class Account
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$this->bank = $obj->bank;
$this->label = $obj->label; $this->label = $obj->label;
$this->type = $obj->courant;
$this->courant = $obj->courant; $this->courant = $obj->courant;
$this->bank = $obj->bank;
$this->clos = $obj->clos; $this->clos = $obj->clos;
$this->code_banque = $obj->code_banque; $this->code_banque = $obj->code_banque;
$this->code_guichet = $obj->code_guichet; $this->code_guichet = $obj->code_guichet;

2
htdocs/compta/bank/account.php
View File

@ -204,7 +204,7 @@ if ($account > 0)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Value").'</td><td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Description").'</td>'; print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Value").'</td><td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Debit").'</td><td align="right">'.$langs->trans("Credit").'</td><td align="right">Solde</td>'; print '<td align="right">'.$langs->trans("Debit").'</td><td align="right">'.$langs->trans("Credit").'</td><td align="right">'.$langs->trans("BankBalance").'</td>';
print '<td align="center">'.$langs->trans("AccountStatement").'</td></tr>'; print '<td align="center">'.$langs->trans("AccountStatement").'</td></tr>';
print '<form method="post" action="account.php">'; print '<form method="post" action="account.php">';

4
htdocs/compta/bank/bilan.php
View File

@ -69,12 +69,12 @@ print "<tr $bc[$var]><td>Somme des debits</td><td align=\"right\">".price($debit
$var=!$var; $var=!$var;
$sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank "; $sql = "SELECT sum(amount) FROM ".MAIN_DB_PREFIX."bank ";
$solde = valeur($sql); $solde = valeur($sql);
print "<tr $bc[$var]><td>Solde compte</td><td align=\"right\">".price($solde)."</td></tr>"; print "<tr $bc[$var]><td>".$langs->trans("BankBalance")."</td><td align=\"right\">".price($solde)."</td></tr>";
print "</table>"; print "</table>";
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

21
htdocs/compta/bank/config.php
View File

@ -20,7 +20,8 @@
* $Source$ * $Source$
*/ */
/** \file htdocs/compta/bank/config.php /**
\file htdocs/compta/bank/config.php
\ingroup banque \ingroup banque
\brief Page de configuration des comptes bancaires \brief Page de configuration des comptes bancaires
\version $Revision$ \version $Revision$
@ -35,6 +36,7 @@ $user->getrights('banque');
if (!$user->admin && !$user->rights->compta->bank) if (!$user->admin && !$user->rights->compta->bank)
accessforbidden(); accessforbidden();
llxHeader(); llxHeader();
print_titre($langs->trans("AccountSetup")); print_titre($langs->trans("AccountSetup"));
@ -42,19 +44,23 @@ print '<br>';
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("Ref")."</td><td>".$langs->trans("Label")."</td><td>".$langs->trans("Description")."</td>"; print "<td>".$langs->trans("Ref")."</td><td>".$langs->trans("Label")."</td><td>".$langs->trans("Type")."</td><td>".$langs->trans("Bank")."</td>";
print "<td align=\"left\">".$langs->trans("Numero")."</a></td>"; print "<td align=\"left\">".$langs->trans("Numero")."</a></td>";
print "<td align=\"center\">".$langs->trans("Closed")."</a></td>"; print "<td align=\"center\">".$langs->trans("Closed")."</a></td>";
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT rowid, label,number,bank,clos from ".MAIN_DB_PREFIX."bank_account"; $sql = "SELECT rowid, label, number, bank, courant as type, clos";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " ORDER BY label";
$result = $db->query($sql); $result = $db->query($sql);
$var=false; $var=false;
if ($result) if ($result)
{ {
$account=new Account($db);
$var=True; $var=True;
$num = $db->num_rows(); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $total = 0;
$sep = 0; $sep = 0;
@ -64,11 +70,12 @@ if ($result)
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td>$objp->rowid</td><td><a href=\"fiche.php?id=$objp->rowid\">$objp->label</a></td>"; print "<tr $bc[$var]><td>$objp->rowid</td><td><a href=\"fiche.php?id=$objp->rowid\">$objp->label</a></td>";
print '<td>'.$account->type_lib[$objp->type].'</td>';
print "<td>$objp->bank&nbsp;</td><td>$objp->number&nbsp;</td><td align=\"center\">".yn($objp->clos)."</td></tr>"; print "<td>$objp->bank&nbsp;</td><td>$objp->number&nbsp;</td><td align=\"center\">".yn($objp->clos)."</td></tr>";
$i++; $i++;
} }
$db->free(); $db->free($result);
} }
print "</table>"; print "</table>";
@ -78,7 +85,7 @@ print "</table>";
*/ */
print "<br><div class=\"tabsAction\">\n"; print "<br><div class=\"tabsAction\">\n";
if ($user->rights->banque->configurer) { if ($user->rights->banque->configurer) {
print '<a class="tabAction" href="fiche.php?action=create">'.$langs->trans("NewAccount").'</a>'; print '<a class="tabAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
print '<a class="tabAction" href="categ.php">'.$langs->trans("Categories").'</a>'; print '<a class="tabAction" href="categ.php">'.$langs->trans("Categories").'</a>';
} }
print "</div>"; print "</div>";
@ -86,5 +93,5 @@ print "</div>";
$db->close(); $db->close();
llxFooter(strftime("%H:%M",time()). " - <em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

277
htdocs/compta/bank/fiche.php
View File

@ -43,69 +43,79 @@ llxHeader();
if ($_POST["action"] == 'add') if ($_POST["action"] == 'add')
{ {
// Creation compte // Creation compte
$account = new Account($db,0); $account = new Account($db,0);
$account->bank = $_POST["bank"]; $account->label = trim($_POST["label"]);
$account->label = $_POST["label"]; $account->courant = $_POST["type"];
$account->clos = $_POST["clos"];
$account->courant = $_POST["courant"]; $account->bank = trim($_POST["bank"]);
$account->clos = $_POST["clos"]; $account->code_banque = $_POST["code_banque"];
$account->code_guichet = $_POST["code_guichet"];
$account->number = $_POST["number"];
$account->cle_rib = $_POST["cle_rib"];
$account->bic = $_POST["bic"];
$account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->code_banque = $_POST["code_banque"]; $account->proprio = $_POST["proprio"];
$account->code_guichet = $_POST["code_guichet"]; $account->adresse_proprio = $_POST["adresse_proprio"];
$account->number = $_POST["number"];
$account->cle_rib = $_POST["cle_rib"];
$account->bic = $_POST["bic"];
$account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->proprio = $_POST["proprio"]; $account->solde = $_POST["solde"];
$account->adresse_proprio = $_POST["adresse_proprio"]; $account->date_solde = mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
$account->solde = $_POST["solde"]; if ($account->label) {
$account->date_solde = mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]); $id = $account->create($user->id);
if (! $id) {
$id = $account->create($user->id); $message=$account->error();
if (! $id) { $_GET["action"]='create'; // Force chargement page en mode creation
$message=$account->error(); }
$_GET["action"]='create'; // Force chargement page en mode creation else {
} $_GET["id"]=$id; // Force chargement page en mode visu
else { }
$_GET["id"]=$id; // Force chargement page en mode visu } else {
} $message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("LabelBankCashAccount")).'</div>';
$_GET["action"]='create'; // Force chargement page en mode creation
}
} }
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 = $_POST["bank"]; $account->label = trim($_POST["label"]);
$account->label = $_POST["label"]; $account->courant = $_POST["type"];
$account->courant = $_POST["courant"]; $account->clos = $_POST["clos"];
$account->clos = $_POST["clos"];
$account->code_banque = $_POST["code_banque"];
$account->code_guichet = $_POST["code_guichet"];
$account->number = $_POST["number"];
$account->cle_rib = $_POST["cle_rib"];
$account->bic = $_POST["bic"];
$account->iban_prefix = $_POST["iban_prefix"];
$account->domiciliation = $_POST["domiciliation"];
$account->proprio = $_POST["proprio"];
$account->adresse_proprio = $_POST["adresse_proprio"];
$result = $account->update($user); $account->bank = $_POST["bank"];
if (! $result) { $account->code_banque = $_POST["code_banque"];
$message=$account->error(); $account->code_guichet = $_POST["code_guichet"];
$_GET["action"]='edit'; // Force chargement page edition $account->number = $_POST["number"];
} $account->cle_rib = $_POST["cle_rib"];
else { $account->bic = $_POST["bic"];
$_GET["id"]=$_POST["id"]; // Force chargement page en mode visu $account->iban_prefix = $_POST["iban_prefix"];
} $account->domiciliation = $_POST["domiciliation"];
$account->proprio = $_POST["proprio"];
$account->adresse_proprio = $_POST["adresse_proprio"];
} if ($account->label) {
$result = $account->update($user);
if (! $result) {
$message=$account->error();
$_GET["action"]='edit'; // Force chargement page edition
}
else {
$_GET["id"]=$_POST["id"]; // Force chargement page en mode visu
}
} else {
$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("LabelBankCashAccount")).'</div>';
$_GET["action"]='create'; // Force chargement page en mode creation
}
}
@ -117,9 +127,10 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"])
if ($_GET["action"] == 'create') if ($_GET["action"] == 'create')
{ {
print_titre($langs->trans("NewBankAccount")); print_titre($langs->trans("NewFinancialAccount"));
print '<br>';
if ($message) { print "<br>$message<br><br>\n"; } if ($message) { print "$message<br>\n"; }
print '<form action="fiche.php" method="post">'; print '<form action="fiche.php" method="post">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
@ -127,12 +138,30 @@ if ($_GET["action"] == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top">'.$langs->trans("LabelBankCashAccount").'</td>';
print '<td colspan="3"><input size="30" type="text" name="label" value="'.$_POST["label"].'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
print '<td colspan="3">';
$form=new Form($db);
print $form->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankBalance").'</td>';
print '<td colspan="3"><input size="12" type="text" name="solde" value="0.00"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("Date").'</td>';
print '<td colspan="3">'; $now=time();
print '<input type="text" size="2" maxlength="2" name="reday" value="'.strftime("%d",$now).'">/';
print '<input type="text" size="2" maxlength="2" name="remonth" value="'.strftime("%m",$now).'">/';
print '<input type="text" size="4" maxlength="4" name="reyear" value="'.strftime("%Y",$now).'">';
print '</td></tr>';
print '<tr><td colspan="4"><b>'.$langs->trans("IfBankAccount").'...</b></td></tr>';
print '<tr><td valign="top">'.$langs->trans("Bank").'</td>'; print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<td colspan="3"><input size="30" type="text" name="bank" value="'.$_POST["bank"].'"></td></tr>'; print '<td colspan="3"><input size="30" type="text" name="bank" value="'.$_POST["bank"].'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
print '<td colspan="3"><input size="30" type="text" name="label" value="'.$_POST["label"].'"></td></tr>';
print '<tr><td>Code Banque</td><td>Code Guichet</td><td>Numéro</td><td>Clé RIB</td></tr>'; print '<tr><td>Code Banque</td><td>Code Guichet</td><td>Numéro</td><td>Clé RIB</td></tr>';
print '<tr><td><input size="8" type="text" name="code_banque" value="'.$_POST["code_banque"].'"></td>'; print '<tr><td><input size="8" type="text" name="code_banque" value="'.$_POST["code_banque"].'"></td>';
print '<td><input size="8" type="text" name="code_guichet" value="'.$_POST["code_guichet"].'"></td>'; print '<td><input size="8" type="text" name="code_guichet" value="'.$_POST["code_guichet"].'"></td>';
@ -145,33 +174,17 @@ if ($_GET["action"] == 'create')
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>'; print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3"><input size="12" type="text" name="bic" value="'.$_POST["bic"].'"></td></tr>'; print '<td colspan="3"><input size="12" type="text" name="bic" value="'.$_POST["bic"].'"></td></tr>';
print '<tr><td valign="top">Compte Courant</td>';
print '<td colspan="3">';
$form=new Form($db);
print $form->selectyesnonum("courant",isset($_POST["courant"])?$_POST["courant"]:1);
print '</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 "<textarea name=\"domiciliation\" rows=\"4\" cols=\"40\">".$_POST["domiciliation"]; print "<textarea name=\"domiciliation\" rows=\"3\" cols=\"40\">".$_POST["domiciliation"];
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>'; print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>';
print '<td colspan="3"><input size="12" type="text" name="proprio" value="'.$_POST["proprio"].'"></td></tr>'; print '<td colspan="3"><input size="12" type="text" name="proprio" value="'.$_POST["proprio"].'"></td></tr>';
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 "<textarea name=\"adresse_proprio\" rows=\"4\" cols=\"40\">".$_POST["adresse_proprio"]; print "<textarea name=\"adresse_proprio\" rows=\"3\" cols=\"40\">".$_POST["adresse_proprio"];
print "</textarea></td></tr>"; print "</textarea></td></tr>";
print '<tr><td valign="top">Solde</td>';
print '<td colspan="3"><input size="30" type="text" name="solde" value="0.00"></td></tr>';
print '<tr><td valign="top">Date Solde</td>';
print '<td colspan="3">'; $now=time();
print '<input type="text" size="2" maxlength="2" name="reday" value="'.strftime("%d",$now).'">/';
print '<input type="text" size="2" maxlength="2" name="remonth" value="'.strftime("%m",$now).'">/';
print '<input type="text" size="4" maxlength="4" name="reyear" value="'.strftime("%Y",$now).'">';
print '</td></tr>';
print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("CreateAccount").'" type="submit"></td></tr>'; print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("CreateAccount").'" type="submit"></td></tr>';
print '</form>'; print '</form>';
print '</table>'; print '</table>';
@ -194,48 +207,50 @@ else
$h = 0; $h = 0;
$head[$h][0] = "fiche.php?id=$account->id"; $head[$h][0] = "fiche.php?id=$account->id";
$head[$h][1] = "Compte bancaire $account->number"; $head[$h][1] = $langs->trans("FinancialAccount")." ".$account->number;
$h++; $h++;
dolibarr_fiche_head($head, $hselected); dolibarr_fiche_head($head, $hselected);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top">Banque</td>';
print '<td colspan="3">'.$account->bank.'</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>Code Banque</td><td>Code Guichet</td><td>Numéro</td><td>Clé RIB</td></tr>'; print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
print '<tr><td>'.$account->code_banque.'</td>'; print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>';
print '<td>'.$account->code_guichet.'</td>';
print '<td>'.$account->number.'</td>';
print '<td>'.$account->cle_rib.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>'; print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
print '<td colspan="3">'.$account->iban_prefix.'</td></tr>'; print '<td colspan="3">'.($account->clos?$langs->trans("Closed"):$langs->trans("Opened")).'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>'; if ($account->type == 0 || $account->type == 1) {
print '<td colspan="3">'.$account->bic.'</td></tr>'; print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<td colspan="3">'.$account->bank.'</td></tr>';
print '<tr><td valign="top">Compte Courant</td>'; print '<tr><td>Code Banque</td><td>Code Guichet</td><td>Numéro</td><td>Clé RIB</td></tr>';
print '<td colspan="3">'.yn($account->courant).'</td></tr>'; print '<tr><td>'.$account->code_banque.'</td>';
print '<td>'.$account->code_guichet.'</td>';
print '<td>'.$account->number.'</td>';
print '<td>'.$account->cle_rib.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Closed").'</td>'; print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="3">'.yn($account->clos).'</td></tr>'; print '<td colspan="3">'.$account->iban_prefix.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print $account->domiciliation; print '<td colspan="3">'.$account->bic.'</td></tr>';
print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print $account->proprio; print $account->domiciliation;
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("BankAccountOwner").'</td><td colspan="3">';
print $account->adresse_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 $account->adresse_proprio;
print "</td></tr>\n";
}
print '</table>'; print '</table>';
print '<br>'; print '<br>';
@ -282,47 +297,49 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<td colspan="3"><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("Label").'</td>'; print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
print '<td colspan="3"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>'; print '<td colspan="3"><input size="30" type="text" name="label" value="'.$account->label.'"></td></tr>';
print '<tr><td>Code Banque</td><td>Code Guichet</td><td>Numéro</td><td>Clé RIB</td></tr>'; print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
print '<tr><td><input size="8" type="text" name="code_banque" value="'.$account->code_banque.'"></td>'; print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>';
print '<td><input size="8" type="text" name="code_guichet" value="'.$account->code_guichet.'"></td>'; print '<input type="hidden" name="type" value="'.$account->type.'">';
print '<td><input size="15" type="text" name="number" value="'.$account->number.'"></td>';
print '<td><input size="3" type="text" name="cle_rib" value="'.$account->cle_rib.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="3"><input size="5" type="text" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
print '<tr><td valign="top">Compte Courant</td>';
print '<td colspan="3">';
$form->selectyesnonum("courant",$account->courant);
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Closed").'</td>'; print '<tr><td valign="top">'.$langs->trans("Closed").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
$form->selectyesnonum("clos",$account->clos); $form->selectyesnonum("clos",$account->clos);
print '</td></tr>'; print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">'; if ($account->type == 0 || $account->type == 1) {
print "<textarea name=\"domiciliation\" rows=\"4\" cols=\"40\">";
print $account->domiciliation;
print "</textarea></td></tr>";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwner").'</td>'; print '<tr><td valign="top">'.$langs->trans("Bank").'</td>';
print '<td colspan="3"><input size="30" type="text" name="proprio" value="'.$account->proprio.'"></td></tr>'; print '<td colspan="3"><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">'; print '<tr><td>Code Banque</td><td>Code Guichet</td><td>Numéro</td><td>Clé RIB</td></tr>';
print "<textarea name=\"adresse_proprio\" rows=\"4\" cols=\"40\">"; print '<tr><td><input size="8" type="text" name="code_banque" value="'.$account->code_banque.'"></td>';
print $account->adresse_proprio; print '<td><input size="8" type="text" name="code_guichet" value="'.$account->code_guichet.'"></td>';
print "</textarea></td></tr>"; print '<td><input size="15" type="text" name="number" value="'.$account->number.'"></td>';
print '<td><input size="3" type="text" name="cle_rib" value="'.$account->cle_rib.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
print '<td colspan="3"><input size="5" type="text" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
print '<td colspan="3"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="3">';
print "<textarea name=\"domiciliation\" rows=\"3\" 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" name="proprio" value="'.$account->proprio.'"></td></tr>';
print "</td></tr>\n";
print '<tr><td valign="top">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="3">';
print "<textarea name=\"adresse_proprio\" rows=\"3\" cols=\"40\">";
print $account->adresse_proprio;
print "</textarea></td></tr>";
}
print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Modify").'" type="submit">'; print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Modify").'" type="submit">';
print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit">'; print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';

162
htdocs/compta/bank/index.php
View File

@ -48,66 +48,143 @@ if (!$user->rights->banque->lire)
llxHeader(); llxHeader();
print_titre($langs->trans("BankAccounts")); print_titre($langs->trans("AccountsArea"));
print '<br>'; print '<br>';
$sql = "SELECT rowid, label,number,bank FROM ".MAIN_DB_PREFIX."bank_account";
// On charge tableau des comptes financiers
$accounts = array();
$sql = "SELECT rowid, courant";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " ORDER BY label";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$accounts = array(); $num = $db->num_rows($result);
$num = $db->num_rows();
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$accounts[$i] = $objp->rowid; $accounts[$objp->rowid] = $objp->courant;
$i++; $i++;
} }
$db->free(); $db->free($result);
} }
/* /*
* Comptes * Comptes courants
*/ */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>Comptes courants</td><td>'.$langs->trans("Bank").'</td>'; print '<tr class="liste_titre"><td>'.$langs->trans("CurrentAccounts").'</td><td>'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("Numero").'</td><td align="right">Solde</td><td align="center">'.$langs->trans("Closed").'</td>'; print '<td align="left">'.$langs->trans("Numero").'</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="80">'.$langs->trans("Closed").'</td>';
print "</tr>\n"; print "</tr>\n";
$total = 0; $total = 0;
$var=True; $var=true;
for ($i = 0 ; $i < sizeof($accounts) ; $i++) foreach ($accounts as $key=>$type)
{ {
$var = !$var; if ($type == 1)
$acc = new Account($db);
$acc->fetch($accounts[$i]);
if ($acc->courant)
{ {
$acc = new Account($db);
$acc->fetch($key);
$var = !$var;
$solde = $acc->solde(); $solde = $acc->solde();
print "<tr ".$bc[$var]."><td>"; print "<tr ".$bc[$var]."><td>";
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>'; print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>$acc->number</td>"; print "</td><td>$acc->bank</td><td>$acc->number</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>'; print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>';
$total += $solde; $total += $solde;
} }
} }
$var = !$var; // Total
print "<tr>".'<td colspan="3" align="right"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td></tr>'; print '<tr class="liste_total"><td colspan="3" align="right"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td></tr>';
print '<tr class="liste_titre"><td colspan="5">Dettes</td></tr>'; print '<tr><td colspan="5">&nbsp;</td></tr>';
/* /*
* TVA * Comptes placements
*/ */
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("SavingAccounts").'</td><td>'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("Numero").'</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="80">'.$langs->trans("Closed").'</td>';
print "</tr>\n";
$total = 0;
$var=true;
foreach ($accounts as $key=>$type)
{
if ($type == 0)
{
$acc = new Account($db);
$acc->fetch($key);
$var = !$var;
$solde = $acc->solde();
print "<tr ".$bc[$var]."><td>";
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>$acc->number</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>';
$total += $solde;
}
}
// Total
print '<tr class="liste_total"><td colspan="3" align="right"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td></tr>';
print '<tr><td colspan="5">&nbsp;</td></tr>';
/*
* Comptes caisse/liquide
*/
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("CashAccounts").'</td><td>&nbsp;</td>';
print '<td align="left">&nbsp;</td><td align="right" width="120">'.$langs->trans("BankBalance").'</td><td align="center" width="80">'.$langs->trans("Closed").'</td>';
print "</tr>\n";
$total = 0;
$var=true;
foreach ($accounts as $key=>$type)
{
if ($type == 2)
{
$acc = new Account($db);
$acc->fetch($key);
$var = !$var;
$solde = $acc->solde();
print "<tr ".$bc[$var]."><td>";
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>&nbsp;</td>";
print '<td align="right">'.price($solde).'</td><td align="center">'.$yn[$acc->clos].'</td></tr>';
$total += $solde;
}
}
// Total
print '<tr class="liste_total"><td colspan="3" align="right"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td></tr>';
/*
* Dettes
*/
print '<tr><td colspan="5">&nbsp;</td></tr>';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("Debts").'</td></tr>';
// TVA
if ($conf->compta->tva) if ($conf->compta->tva)
{ {
$var=true; $var=true;
@ -121,9 +198,8 @@ if ($conf->compta->tva)
print "<tr ".$bc[$var].">".'<td colspan="3">'.$langs->trans("VAT").'</td><td align="right">'.price($tva_solde).'</td><td>&nbsp;</td></tr>'; print "<tr ".$bc[$var].">".'<td colspan="3">'.$langs->trans("VAT").'</td><td align="right">'.price($tva_solde).'</td><td>&nbsp;</td></tr>';
} }
/*
* Charges sociales // Charges sociales
*/
$var = !$var; $var = !$var;
$chs = new ChargeSociales($db); $chs = new ChargeSociales($db);
@ -131,39 +207,11 @@ $chs_a_payer = $chs->solde();
$total = $total - $chs_a_payer; $total = $total - $chs_a_payer;
print "<tr ".$bc[$var].">".'<td colspan="3">URSSAF</td><td align="right">'.price($chs_a_payer).'</td><td>&nbsp;</td></tr>'; print "<tr ".$bc[$var].">".'<td colspan="3">'.$langs->trans("SocialContributions").'</td><td align="right">'.price($chs_a_payer).'</td><td>&nbsp;</td></tr>';
// Total
print '<tr class="liste_total"><td colspan="3" align="right"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td></tr>';
/*
* Total
*/
print "<tr>".'<td colspan="3" align="right"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td><td>&nbsp;</td></tr>';
/*
* Comptes placements
*/
print '<tr class="liste_titre"><td colspan="5">Comptes placements</td></tr>';
for ($i = 0 ; $i < sizeof($accounts) ; $i++) {
$var = !$var;
$acc = new Account($db);
$acc->fetch($accounts[$i]);
if (!$acc->courant) {
$solde = $acc->solde();
print "<tr ".$bc[$var]."><td>";
print '<a href="account.php?account='.$acc->id.'">'.$acc->label.'</a>';
print "</td><td>$acc->bank</td><td>$acc->number</td>";
print '<td align="right">'.price($solde).'</td><td>&nbsp;</td></tr>';
$total += $solde;
}
}
print "</table>"; print "</table>";

22
htdocs/langs/en_US/banks.lang
View File

@ -1,9 +1,18 @@
# Dolibarr language file - en_US - banks # Dolibarr language file - en_US - banks
Bank=Bank Bank=Bank
Banks=Banks Banks=Banks
FinancialAccount=Financial account
FinancialAccounts=Financial accounts
BankAccount=Bank account BankAccount=Bank account
BankAccounts=Bank accounts BankAccounts=Bank accounts
CashAccount=Cash account
CashAccounts=Cash accounts
MainAccount=Main account MainAccount=Main account
CurrentAccount=Current account
CurrentAccounts=Current accounts
SavingAccount=Saving account
SavingAccounts=Saving accounts
BankBalance=Balance
RIB=RIB RIB=RIB
IBAN=IBAN number IBAN=IBAN number
BIC=BIC number BIC=BIC number
@ -20,11 +29,22 @@ IOMonthlyReporting=Monthly reporting
BankAccountDomiciliation=Account address BankAccountDomiciliation=Account address
BankAccountOwner=Account owner name BankAccountOwner=Account owner name
BankAccountOwnerAddress=Account owner address BankAccountOwnerAddress=Account owner address
NewBankAccount=New bank account
CreateAccount=Create account CreateAccount=Create account
StandingOrderToProcess=To process StandingOrderToProcess=To process
StandingOrderProcessed=Processed StandingOrderProcessed=Processed
NewAccount=New account NewAccount=New account
NewBankAccount=New bank account
NewFinancialAccount=New financial account NewFinancialAccount=New financial account
NewCurrentAccount=New current account
NewSavingAccount=New saving account
NewCashAccount=New cash account
AccountSetup=Account setup AccountSetup=Account setup
SearchBankMovement=search bank movement SearchBankMovement=search bank movement
Debts=Debts
LabelBankCashAccount=Bank or cash label
AccountType=Account type
BankType0=Saving account
BankType1=Current account
BankType2=Cash account
IfBankAccount=If bank account
AccountsArea=Accounts area

22
htdocs/langs/fr_FR/banks.lang
View File

@ -1,9 +1,18 @@
# Dolibarr language file - fr_FR - banks # Dolibarr language file - fr_FR - banks
Bank=Banque Bank=Banque
Banks=Banques Banks=Banques
FinancialAccount=Compte financier
FinancialAccounts=Comptes financiers
BankAccount=Compte bancaire BankAccount=Compte bancaire
BankAccounts=Comptes bancaires BankAccounts=Comptes bancaires
CashAccount=Compte caisse/liquide
CashAccounts=Comptes caisses/liquides
MainAccount=Compte courant MainAccount=Compte courant
CurrentAccount=Compte courant
CurrentAccounts=Comptes courants
SavingAccount=Compte épargne
SavingAccounts=Comptes épargnes/placements
BankBalance=Solde
RIB=RIB RIB=RIB
IBAN=Identifiant IBAN IBAN=Identifiant IBAN
BIC=Identifiant BIC BIC=Identifiant BIC
@ -20,11 +29,22 @@ IOMonthlyReporting=Rapport mensuel E/S
BankAccountDomiciliation=Domiciliation du compte BankAccountDomiciliation=Domiciliation du compte
BankAccountOwner=Nom du propriétaire du compte BankAccountOwner=Nom du propriétaire du compte
BankAccountOwnerAddress=Adresse du propriétaire du compte BankAccountOwnerAddress=Adresse du propriétaire du compte
NewBankAccount=Nouveau compte bancaire
CreateAccount=Créer compte CreateAccount=Créer compte
StandingOrderToProcess=À traiter StandingOrderToProcess=À traiter
StandingOrderProcessed=Traités StandingOrderProcessed=Traités
NewAccount=Nouveau compte NewAccount=Nouveau compte
NewBankAccount=Nouveau compte bancaire
NewFinancialAccount=Nouveau compte financier NewFinancialAccount=Nouveau compte financier
NewCurrentAccount=Nouveau compte courant
NewSavingAccount=Nouveau compte épargne
NewCashAccount=Nouveau compte caisse
AccountSetup=Configuration des comptes AccountSetup=Configuration des comptes
SearchBankMovement=Recherche écriture bancaire SearchBankMovement=Recherche écriture bancaire
Debts=Dettes
LabelBankCashAccount=Libellé compte ou caisse
AccountType=Type de compte
BankType0=Compte bancaire épargne/placement
BankType1=Compte bancaire courant
BankType2=Compte caisse/liquide
IfBankAccount=Si compte bancaire
AccountsArea=Espace comptes

2
htdocs/langs/fr_FR/compta.lang
View File

@ -11,7 +11,7 @@ BillsForSuppliers=Factures des fournisseurs
Income=Recettes Income=Recettes
Outcome=Dépenses Outcome=Dépenses
Profit=Bénéfice Profit=Bénéfice
Balance=Balance Balance=Solde
Debit=Débit Debit=Débit
Credit=Crédit Credit=Crédit
Withdrawl=Prélèvement Withdrawl=Prélèvement