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

New: Ajout proprit url sur les comptes bancaires

Browse Source
This commit is contained in:
Laurent Destailleur 2006-07-01 14:37:19 +00:00
parent a17bebed7a
commit 8c343297d1
6 changed files with 123 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,6 +632,26 @@ class Account
} }
} }
/**
* \brief Renvoie nom clicable (avec eventuellement le picto)
* \param withpicto Inclut le picto dans le lien
* \return string Chaine avec URL
*/
function getNomUrl($withpicto=0)
{
global $langs;
$result='';
$lien = '<a href="'.DOL_URL_ROOT.'/compta/bank/fiche.php?id='.$this->id.'">';
$lienfin='</a>';
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAccount"),'account').$lienfin.' ');
$result.=$lien.$this->label.$lienfin;
return $result;
}
} }

11
htdocs/compta/bank/budget.php
View File

@ -51,7 +51,10 @@ if ($_GET["bid"] == 0)
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("Description").'</td><td align="center">'.$langs->trans("Nb").'</td><td align="right">'.$langs->trans("Total").'</td><td align="right">'.$langs->trans("Average").'</td>'; print '<td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Nb").'</td>';
print '<td align="right">'.$langs->trans("Total").'</td>';
print '<td align="right">'.$langs->trans("Average").'</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT sum(d.amount) as somme, count(*) as nombre, c.label, c.rowid "; $sql = "SELECT sum(d.amount) as somme, count(*) as nombre, c.label, c.rowid ";
@ -71,9 +74,9 @@ if ($_GET["bid"] == 0)
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print "<td><a href=\"budget.php?bid=$objp->rowid\">$objp->label</a></td>"; print "<td><a href=\"budget.php?bid=$objp->rowid\">$objp->label</a></td>";
print '<td align="center">'.$objp->nombre.'</td>'; print '<td align="right">'.$objp->nombre.'</td>';
print "<td align=\"right\">".price(abs($objp->somme))."</td>"; print '<td align="right">'.price(abs($objp->somme))."</td>";
print "<td align=\"right\">".price(abs($objp->somme / $objp->nombre))."</td>"; print '<td align="right">'.price(abs($objp->somme / $objp->nombre))."</td>";
print "</tr>"; print "</tr>";
$i++; $i++;
$total = $total + abs($objp->somme); $total = $total + abs($objp->somme);

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

@ -1,6 +1,6 @@
<?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-2006 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
@ -21,10 +21,10 @@
*/ */
/** /**
\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$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -42,7 +42,7 @@ print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref")."</td><td>".$langs->trans("Type")."</td><td>".$langs->trans("Bank").'</td>'; print '<td>'.$langs->trans("Ref")."</td><td>".$langs->trans("Type")."</td><td>".$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("AccountIdShort").'</a></td>'; print '<td align="left">'.$langs->trans("AccountIdShort").'</a></td>';
print '<td align="center">'.$langs->trans("Conciliable").'</a></td>'; print '<td align="center">'.$langs->trans("Conciliable").'</a></td>';
print '<td align="center">'.$langs->trans("Status").'</a></td>'; print '<td align="right">'.$langs->trans("Status").'</a></td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT rowid, label, number, bank, courant as type, clos, rappro"; $sql = "SELECT rowid, label, number, bank, courant as type, clos, rappro";
@ -53,27 +53,31 @@ $result = $db->query($sql);
$var=false; $var=false;
if ($result) if ($result)
{ {
$account=new Account($db); $accountstatic=new Account($db);
$var=True; $var=True;
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $total = 0; $i = 0; $total = 0;
$sep = 0; $sep = 0;
while ($i < $num) { while ($i < $num)
$objp = $db->fetch_object($result); {
$objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td><a href="fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</td>'; print '<tr '.$bc[$var].'>';
print '<td>'.$account->type_lib[$objp->type].'</td>'; $accountstatic->id=$objp->rowid;
print '<td>'.$objp->bank.'&nbsp;</td><td>'.$objp->number.'&nbsp;</td>'; $accountstatic->label=$objp->label;
print '<td align="center">'.yn($objp->rappro).'</td>'; print '<td>'.$accountstatic->getNomUrl(1).'</td>';
print '<td align="center">'.$account->status[$objp->clos].'</td></tr>'; print '<td>'.$accountstatic->type_lib[$objp->type].'</td>';
print '<td>'.$objp->bank.'&nbsp;</td><td>'.$objp->number.'&nbsp;</td>';
print '<td align="center">'.yn($objp->rappro).'</td>';
print '<td align="right">'.$accountstatic->LibStatut($objp->clos,5).'</td></tr>';
$i++; $i++;
} }
$db->free($result); $db->free($result);
} }
print "</table>"; print "</table>";

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

@ -326,7 +326,7 @@ else
} }
print '<tr><td valign="top">'.$langs->trans("Web").'</td><td colspan="3">'; print '<tr><td valign="top">'.$langs->trans("Web").'</td><td colspan="3">';
print '<a href="'.$account->url.'">'.$account->url.'</a>'; print '<a href="'.$account->url.'" target="_gobank">'.$account->url.'</a>';
print "</td></tr>\n"; print "</td></tr>\n";
print '</table>'; print '</table>';

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

@ -1,6 +1,6 @@
<?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-2006 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
@ -87,7 +87,7 @@ print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CurrentAccounts").'</td>'; print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CurrentAccounts").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</td>'; print '<td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("AccountIdShort").'</td>'; print '<td align="left">'.$langs->trans("AccountIdShort").'</td>';
print '<td align="center" width="100">'.$langs->trans("Conciliable").'</a></td>'; print '<td align="center" width="100">'.$langs->trans("Conciliable").'</td>';
print '<td align="center" width="70">'.$langs->trans("Status").'</td>'; print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";
@ -96,24 +96,27 @@ $total = 0;
$var=true; $var=true;
foreach ($accounts as $key=>$type) foreach ($accounts as $key=>$type)
{ {
if ($type == 1) if ($type == 1)
{ {
$acc = new Account($db); $acc = new Account($db);
$acc->fetch($key); $acc->fetch($key);
$var = !$var; $var = !$var;
$solde = $acc->solde(); $solde = $acc->solde();
print '<tr '.$bc[$var].'><td width="30%">'; print '<tr '.$bc[$var].'>';
print '<a href="account.php?account='.$acc->id.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$acc->label.'</a>'; print '<td width="30%">'.$acc->getNomUrl(1).'</td>';
print '</td><td>'.$acc->bank."</td><td>$acc->number</td>"; print '<td>'.$acc->bank.'</td>';
print '<td align="center">'.yn($acc->rappro).'</td>'; print '<td>'.$acc->number.'</td>';
print '<td align="center">'.$acc->status[$acc->clos].'</td>'; print '<td align="center">'.yn($acc->rappro).'</td>';
print '<td align="right">'.price($solde).'</td>'; print '<td align="center">'.$acc->getLibStatut(2).'</td>';
print '</tr>'; print '<td align="right">';
print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';
print '</td>';
print '</tr>';
$total += $solde; $total += $solde;
} }
} }
// Total // Total
@ -126,10 +129,11 @@ print '<tr><td colspan="5">&nbsp;</td></tr>';
/* /*
* Comptes placements * Comptes placements
*/ */
print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("SavingAccounts").'</td><td width="20%">'.$langs->trans("Bank").'</td>'; print '<td width="30%">'.$langs->trans("SavingAccounts").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("Numero").'</td>'; print '<td align="left">'.$langs->trans("Numero").'</td>';
print '<td align="center" width="100">'.$langs->trans("Conciliable").'</a></td>'; print '<td align="center" width="100">'.$langs->trans("Conciliable").'</td>';
print '<td align="center" width="70">'.$langs->trans("Status").'</td>'; print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";
@ -138,24 +142,27 @@ $total = 0;
$var=true; $var=true;
foreach ($accounts as $key=>$type) foreach ($accounts as $key=>$type)
{ {
if ($type == 0) if ($type == 0)
{ {
$acc = new Account($db); $acc = new Account($db);
$acc->fetch($key); $acc->fetch($key);
$var = !$var; $var = !$var;
$solde = $acc->solde(); $solde = $acc->solde();
print "<tr ".$bc[$var]."><td>"; print "<tr ".$bc[$var].">";
print '<a href="account.php?account='.$acc->id.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$acc->label.'</a>'; print '<td width="30%">'.$acc->getNomUrl(1).'</td>';
print "</td><td>$acc->bank</td><td>$acc->number</td>"; print '<td>'.$acc->bank.'</td>';
print '<td align="center">'.yn($acc->rappro).'</td>'; print '<td>'.$acc->number.'</td>';
print '<td align="center">'.$acc->status[$acc->clos].'</td>'; print '<td align="center">'.yn($acc->rappro).'</td>';
print '<td align="right">'.price($solde).'</td>'; print '<td align="center">'.$acc->getLibStatut(2).'</td>';
print '</tr>'; print '<td align="right">';
print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';
print '</td>';
print '</tr>';
$total += $solde; $total += $solde;
} }
} }
// Total // Total
@ -168,7 +175,6 @@ print '<tr><td colspan="5">&nbsp;</td></tr>';
/* /*
* Comptes caisse/liquide * Comptes caisse/liquide
*/ */
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CashAccounts").'</td><td width="20%">&nbsp;</td>'; print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CashAccounts").'</td><td width="20%">&nbsp;</td>';
print '<td align="left">&nbsp;</td>'; print '<td align="left">&nbsp;</td>';
print '<td align="left" width="100">&nbsp;</td>'; print '<td align="left" width="100">&nbsp;</td>';
@ -188,13 +194,15 @@ foreach ($accounts as $key=>$type)
$var = !$var; $var = !$var;
$solde = $acc->solde(); $solde = $acc->solde();
print "<tr ".$bc[$var]."><td>"; print "<tr ".$bc[$var].">";
print '<a href="account.php?account='.$acc->id.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$acc->label.'</a>'; print '<td width="30%">'.$acc->getNomUrl(1).'</td>';
print '</td><td>'.$acc->bank.'</td>'; print '<td>'.$acc->bank.'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td align="center">'.$acc->status[$acc->clos].'</td>'; print '<td align="center">'.$acc->getLibStatut(2).'</td>';
print '<td align="right">'.price($solde).'</td>'; print '<td align="right">';
print '<a href="account.php?account='.$acc->id.'">'.price($solde).'</a>';
print '</td>';
print '</tr>'; print '</tr>';
$total += $solde; $total += $solde;
@ -205,41 +213,6 @@ foreach ($accounts as $key=>$type)
print '<tr class="liste_total"><td colspan="4">&nbsp;</td><td align="center"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td></tr>'; print '<tr class="liste_total"><td colspan="4">&nbsp;</td><td align="center"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td></tr>';
/*
* Dettes
*/
print '<tr><td colspan="5">&nbsp;</td></tr>';
print '<tr class="liste_titre"><td colspan="7">'.$langs->trans("Debts").'</td></tr>';
// TVA
if ($conf->compta->tva)
{
$var=true;
$var = !$var;
$tva = new Tva($db);
$tva_solde = $tva->solde();
$total = $total + $tva_solde;
print "<tr ".$bc[$var].">".'<td colspan="5">'.$langs->trans("VAT").'</td><td align="right">'.price($tva_solde).'</td></tr>';
}
// Charges sociales
$var = !$var;
$chs = new ChargeSociales($db);
$chs_a_payer = $chs->solde();
$total = $total - $chs_a_payer;
print "<tr ".$bc[$var].">".'<td colspan="5">'.$langs->trans("SocialContributions").'</td><td align="right">'.price($chs_a_payer).'</td></tr>';
// Total
print '<tr class="liste_total"><td colspan="4">&nbsp;</td><td align="center"><b>'.$langs->trans("Total").'</b></td><td align="right"><b>'.price($total).'</b></td></tr>';
print "</table>"; print "</table>";

14
htdocs/compta/bank/search.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 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
@ -92,16 +92,18 @@ print '</tr>';
// Compte le nombre total d'écritures // Compte le nombre total d'écritures
$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."bank"; $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."bank";
if ($account) { $sql .= " WHERE b.fk_account=$account"; } if ($account) { $sql .= " WHERE b.fk_account=".$account; }
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$nbline = $db->result (0, 0); $obj = $db->fetch_object($resql);
$nbline = $obj->nb;
$db->free($resql); $db->free($resql);
} }
else { else
{
dolibarr_print_error($db); dolibarr_print_error($db);
} }
@ -164,7 +166,7 @@ if ($result)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>".strftime("%d %b %y",$objp->do)."</td>\n"; print "<td>".dolibarr_print_date($objp->do,"%d %b %y")."</td>\n";
print "<td><a href=\"ligne.php?rowid=$objp->rowid&amp;account=$objp->fk_account\">$objp->label</a>&nbsp;"; print "<td><a href=\"ligne.php?rowid=$objp->rowid&amp;account=$objp->fk_account\">$objp->label</a>&nbsp;";