';
@@ -194,49 +207,51 @@ else
$h = 0;
$head[$h][0] = "fiche.php?id=$account->id";
- $head[$h][1] = "Compte bancaire $account->number";
+ $head[$h][1] = $langs->trans("FinancialAccount")." ".$account->number;
$h++;
dolibarr_fiche_head($head, $hselected);
print '';
- print '| Banque | ';
- print ''.$account->bank.' |
';
-
print '| '.$langs->trans("Label").' | ';
print ''.$account->label.' |
';
- print '| Code Banque | Code Guichet | Numéro | Clé RIB |
';
- print '| '.$account->code_banque.' | ';
- print ''.$account->code_guichet.' | ';
- print ''.$account->number.' | ';
- print ''.$account->cle_rib.' |
';
+ print '| '.$langs->trans("AccountType").' | ';
+ print ''.$account->type_lib[$account->type].' |
';
- print '| '.$langs->trans("IBAN").' | ';
- print ''.$account->iban_prefix.' |
';
-
- print '| '.$langs->trans("BIC").' | ';
- print ''.$account->bic.' |
';
-
- print '| Compte Courant | ';
- print ''.yn($account->courant).' |
';
-
- print '| '.$langs->trans("Closed").' | ';
- print ''.yn($account->clos).' |
';
-
- print '| '.$langs->trans("BankAccountDomiciliation").' | ';
- print $account->domiciliation;
- print " |
\n";
-
- print '| '.$langs->trans("BankAccountOwner").' | ';
- print $account->proprio;
- print " |
\n";
-
- print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
- print $account->adresse_proprio;
- print " |
\n";
+ print '| '.$langs->trans("Status").' | ';
+ print ''.($account->clos?$langs->trans("Closed"):$langs->trans("Opened")).' |
';
+
+ if ($account->type == 0 || $account->type == 1) {
+ print '| '.$langs->trans("Bank").' | ';
+ print ''.$account->bank.' |
';
+ print '| Code Banque | Code Guichet | Numéro | Clé RIB |
';
+ print '| '.$account->code_banque.' | ';
+ print ''.$account->code_guichet.' | ';
+ print ''.$account->number.' | ';
+ print ''.$account->cle_rib.' |
';
+
+ print '| '.$langs->trans("IBAN").' | ';
+ print ''.$account->iban_prefix.' |
';
+
+ print '| '.$langs->trans("BIC").' | ';
+ print ''.$account->bic.' |
';
+
+ print '| '.$langs->trans("BankAccountDomiciliation").' | ';
+ print $account->domiciliation;
+ print " |
\n";
+
+ print '| '.$langs->trans("BankAccountOwner").' | ';
+ print $account->proprio;
+ print " |
\n";
+
+ print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
+ print $account->adresse_proprio;
+ print " |
\n";
+ }
+
print '
';
print '';
- print '| '.$langs->trans("Bank").' | ';
- print ' |
';
-
print '| '.$langs->trans("Label").' | ';
print ' |
';
- print '| Code Banque | Code Guichet | Numéro | Clé RIB |
';
- print ' | ';
- print ' | ';
- print ' | ';
- print ' |
';
-
- print '| '.$langs->trans("IBAN").' | ';
- print ' |
';
-
- print '| '.$langs->trans("BIC").' | ';
- print ' |
';
+ print '| '.$langs->trans("AccountType").' | ';
+ print ''.$account->type_lib[$account->type].' |
';
+ print '';
- print '| Compte Courant | ';
- print '';
- $form->selectyesnonum("courant",$account->courant);
- print ' |
';
-
print '| '.$langs->trans("Closed").' | ';
print '';
$form->selectyesnonum("clos",$account->clos);
print ' |
';
- print '| '.$langs->trans("BankAccountDomiciliation").' | ';
- print " |
";
-
- print '| '.$langs->trans("BankAccountOwner").' | ';
- print ' |
';
- print "\n";
-
- print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
- print " |
";
+ if ($account->type == 0 || $account->type == 1) {
+ print '| '.$langs->trans("Bank").' | ';
+ print ' |
';
+
+ print '| Code Banque | Code Guichet | Numéro | Clé RIB |
';
+ print ' | ';
+ print ' | ';
+ print ' | ';
+ print ' |
';
+
+ print '| '.$langs->trans("IBAN").' | ';
+ print ' |
';
+
+ print '| '.$langs->trans("BIC").' | ';
+ print ' |
';
+
+ print '| '.$langs->trans("BankAccountDomiciliation").' | ';
+ print " |
";
+
+ print '| '.$langs->trans("BankAccountOwner").' | ';
+ print ' |
';
+ print "\n";
+
+ print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
+ print " |
";
+ }
+
print '| ';
print ' ';
print ' |
';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 930c8016a40..997c1fd6c86 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -48,66 +48,143 @@ if (!$user->rights->banque->lire)
llxHeader();
-print_titre($langs->trans("BankAccounts"));
+print_titre($langs->trans("AccountsArea"));
print '
';
-$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);
if ($result)
{
- $accounts = array();
-
- $num = $db->num_rows();
+ $num = $db->num_rows($result);
$i = 0;
while ($i < $num) {
$objp = $db->fetch_object($result);
- $accounts[$i] = $objp->rowid;
-
+ $accounts[$objp->rowid] = $objp->courant;
$i++;
}
- $db->free();
+ $db->free($result);
}
+
/*
- * Comptes
+ * Comptes courants
*/
print '';
-print '| Comptes courants | '.$langs->trans("Bank").' | ';
-print ''.$langs->trans("Numero").' | Solde | '.$langs->trans("Closed").' | ';
+print '
| '.$langs->trans("CurrentAccounts").' | '.$langs->trans("Bank").' | ';
+print ''.$langs->trans("Numero").' | '.$langs->trans("BankBalance").' | '.$langs->trans("Closed").' | ';
print "
\n";
+
$total = 0;
-$var=True;
-for ($i = 0 ; $i < sizeof($accounts) ; $i++)
+$var=true;
+foreach ($accounts as $key=>$type)
{
- $var = !$var;
- $acc = new Account($db);
- $acc->fetch($accounts[$i]);
- if ($acc->courant)
+ if ($type == 1)
{
+ $acc = new Account($db);
+ $acc->fetch($key);
+
+ $var = !$var;
$solde = $acc->solde();
print "| ";
print ''.$acc->label.'';
-
print " | $acc->bank | $acc->number | ";
-
print ''.price($solde).' | '.$yn[$acc->clos].' |
';
$total += $solde;
}
}
-$var = !$var;
-print "".'| '.$langs->trans("Total").' | '.price($total).' | |
';
+// Total
+print '| '.$langs->trans("Total").' | '.price($total).' | |
';
-print '| Dettes |
';
+print '| |
';
/*
- * TVA
+ * Comptes placements
*/
+print '';
+print '| '.$langs->trans("SavingAccounts").' | '.$langs->trans("Bank").' | ';
+print ''.$langs->trans("Numero").' | '.$langs->trans("BankBalance").' | '.$langs->trans("Closed").' | ';
+print "
\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 "| ";
+ print ''.$acc->label.'';
+ print " | $acc->bank | $acc->number | ";
+ print ''.price($solde).' | '.$yn[$acc->clos].' |
';
+
+ $total += $solde;
+ }
+}
+
+// Total
+print '| '.$langs->trans("Total").' | '.price($total).' | |
';
+
+
+print '| |
';
+
+
+/*
+ * Comptes caisse/liquide
+ */
+print '';
+print '| '.$langs->trans("CashAccounts").' | | ';
+print ' | '.$langs->trans("BankBalance").' | '.$langs->trans("Closed").' | ';
+print "
\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 "| ";
+ print ''.$acc->label.'';
+ print " | $acc->bank | | ";
+ print ''.price($solde).' | '.$yn[$acc->clos].' |
';
+
+ $total += $solde;
+ }
+}
+
+// Total
+print '| '.$langs->trans("Total").' | '.price($total).' | |
';
+
+
+/*
+ * Dettes
+ */
+print '| |
';
+print '| '.$langs->trans("Debts").' |
';
+
+// TVA
if ($conf->compta->tva)
{
$var=true;
@@ -121,9 +198,8 @@ if ($conf->compta->tva)
print "".'| '.$langs->trans("VAT").' | '.price($tva_solde).' | |
';
}
-/*
- * Charges sociales
- */
+
+// Charges sociales
$var = !$var;
$chs = new ChargeSociales($db);
@@ -131,39 +207,11 @@ $chs_a_payer = $chs->solde();
$total = $total - $chs_a_payer;
-print "".'| URSSAF | '.price($chs_a_payer).' | |
';
+print "".'| '.$langs->trans("SocialContributions").' | '.price($chs_a_payer).' | |
';
+// Total
+print '| '.$langs->trans("Total").' | '.price($total).' | |
';
-/*
- * Total
- */
-print "".'| '.$langs->trans("Total").' | '.price($total).' | |
';
-
-
-/*
- * Comptes placements
- */
-print '| Comptes placements |
';
-
-for ($i = 0 ; $i < sizeof($accounts) ; $i++) {
- $var = !$var;
- $acc = new Account($db);
- $acc->fetch($accounts[$i]);
-
- if (!$acc->courant) {
-
- $solde = $acc->solde();
-
- print "| ";
- print ''.$acc->label.'';
-
- print " | $acc->bank | $acc->number | ";
-
- print ''.price($solde).' | |
';
-
- $total += $solde;
- }
-}
print "
";
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index ddb553d1c9b..e49be6fb2ac 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -1,9 +1,18 @@
# Dolibarr language file - en_US - banks
Bank=Bank
Banks=Banks
+FinancialAccount=Financial account
+FinancialAccounts=Financial accounts
BankAccount=Bank account
BankAccounts=Bank accounts
+CashAccount=Cash account
+CashAccounts=Cash accounts
MainAccount=Main account
+CurrentAccount=Current account
+CurrentAccounts=Current accounts
+SavingAccount=Saving account
+SavingAccounts=Saving accounts
+BankBalance=Balance
RIB=RIB
IBAN=IBAN number
BIC=BIC number
@@ -20,11 +29,22 @@ IOMonthlyReporting=Monthly reporting
BankAccountDomiciliation=Account address
BankAccountOwner=Account owner name
BankAccountOwnerAddress=Account owner address
-NewBankAccount=New bank account
CreateAccount=Create account
StandingOrderToProcess=To process
StandingOrderProcessed=Processed
NewAccount=New account
+NewBankAccount=New bank account
NewFinancialAccount=New financial account
+NewCurrentAccount=New current account
+NewSavingAccount=New saving account
+NewCashAccount=New cash account
AccountSetup=Account setup
-SearchBankMovement=search bank movement
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 24a938c0f3f..954d957797c 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -1,9 +1,18 @@
# Dolibarr language file - fr_FR - banks
Bank=Banque
Banks=Banques
+FinancialAccount=Compte financier
+FinancialAccounts=Comptes financiers
BankAccount=Compte bancaire
BankAccounts=Comptes bancaires
+CashAccount=Compte caisse/liquide
+CashAccounts=Comptes caisses/liquides
MainAccount=Compte courant
+CurrentAccount=Compte courant
+CurrentAccounts=Comptes courants
+SavingAccount=Compte épargne
+SavingAccounts=Comptes épargnes/placements
+BankBalance=Solde
RIB=RIB
IBAN=Identifiant IBAN
BIC=Identifiant BIC
@@ -20,11 +29,22 @@ IOMonthlyReporting=Rapport mensuel E/S
BankAccountDomiciliation=Domiciliation du compte
BankAccountOwner=Nom du propriétaire du compte
BankAccountOwnerAddress=Adresse du propriétaire du compte
-NewBankAccount=Nouveau compte bancaire
CreateAccount=Créer compte
StandingOrderToProcess=À traiter
StandingOrderProcessed=Traités
NewAccount=Nouveau compte
+NewBankAccount=Nouveau compte bancaire
NewFinancialAccount=Nouveau compte financier
+NewCurrentAccount=Nouveau compte courant
+NewSavingAccount=Nouveau compte épargne
+NewCashAccount=Nouveau compte caisse
AccountSetup=Configuration des comptes
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
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 3478eed961a..812723497da 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -11,7 +11,7 @@ BillsForSuppliers=Factures des fournisseurs
Income=Recettes
Outcome=Dépenses
Profit=Bénéfice
-Balance=Balance
+Balance=Solde
Debit=Débit
Credit=Crédit
Withdrawl=Prélèvement