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

Fix: Do not show a total of amount if currencies differs.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-06-08 19:11:19 +00:00
parent e3e4148669
commit cd1c9e7ffa
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
htdocs/includes/boxes/box_comptes.php
View File

@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/includes/boxes/box_comptes.php * \file htdocs/includes/boxes/box_comptes.php
\ingroup banque * \ingroup banque
\brief Module de génération de l'affichage de la box comptes * \brief Module de generation de l'affichage de la box comptes
\version $Id$ * \version $Id$
*/ */
include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
@ -34,7 +34,7 @@ class box_comptes extends ModeleBoxes {
var $boxcode="currentaccounts"; var $boxcode="currentaccounts";
var $boximg="object_bill"; var $boximg="object_bill";
var $boxlabel; var $boxlabel;
var $depends = array("banque"); // Box active si module banque actif var $depends = array("banque"); // Box active if module banque active
var $db; var $db;
var $param; var $param;
@ -44,8 +44,8 @@ class box_comptes extends ModeleBoxes {
/** /**
* \brief Constructeur de la classe * \brief Constructor for class
*/ */
function box_comptes() function box_comptes()
{ {
global $langs; global $langs;
@ -55,24 +55,24 @@ class box_comptes extends ModeleBoxes {
} }
/** /**
* \brief Charge les données en mémoire pour affichage ultérieur * \brief Load data into info_box_contents array to show array later.
* \param $max Nombre maximum d'enregistrements à charger * \param $max Maximum number of records to load
*/ */
function loadBox($max=5) function loadBox($max=5)
{ {
global $user, $langs, $db, $conf; global $user, $langs, $db, $conf;
$this->max=$max; $this->max=$max;
$this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts")); $this->info_box_head = array('text' => $langs->trans("BoxTitleCurrentAccounts"));
if ($user->rights->banque->lire) if ($user->rights->banque->lire)
{ {
$sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,"; $sql = "SELECT rowid, ref, label, bank, number, courant, clos, rappro, url,";
$sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,"; $sql.= " code_banque, code_guichet, cle_rib, bic, iban_prefix,";
$sql.= " domiciliation, proprio, adresse_proprio,"; $sql.= " domiciliation, proprio, adresse_proprio,";
$sql.= " account_number, currency_code,"; $sql.= " account_number, currency_code,";
$sql.= " min_allowed, min_desired, comment"; $sql.= " min_allowed, min_desired, comment";
$sql.= " FROM ".MAIN_DB_PREFIX."bank_account"; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
$sql.= " WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
$sql.= " AND clos = 0"; $sql.= " AND clos = 0";
@ -89,20 +89,21 @@ class box_comptes extends ModeleBoxes {
$i = 0; $i = 0;
$solde_total = 0; $solde_total = 0;
$listofcurrencies=array();
$account_static = new Account($db); $account_static = new Account($db);
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$account_static->id = $objp->rowid; $account_static->id = $objp->rowid;
$solde=$account_static->solde(0); $solde=$account_static->solde(0);
$solde_total += $solde; $solde_total += $solde;
$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
'logo' => $this->boximg, 'logo' => $this->boximg,
'url' => DOL_URL_ROOT."/compta/bank/account.php?account=".$objp->rowid); 'url' => DOL_URL_ROOT."/compta/bank/account.php?account=".$objp->rowid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"', $this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' => $objp->label, 'text' => $objp->label,
'url' => DOL_URL_ROOT."/compta/bank/account.php?account=".$objp->rowid); 'url' => DOL_URL_ROOT."/compta/bank/account.php?account=".$objp->rowid);
@ -115,17 +116,21 @@ class box_comptes extends ModeleBoxes {
'text' => price($solde).' '.$langs->trans("Currency".$objp->currency_code) 'text' => price($solde).' '.$langs->trans("Currency".$objp->currency_code)
); );
$listofcurrencies[$objp->currency_code]=1;
$i++; $i++;
} }
// Total // Total
$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="right" colspan="3" class="liste_total"', if (sizeof($listofcurrencies) < 1)
'text' => $langs->trans('Total') {
); $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="right" colspan="3" class="liste_total"',
$this->info_box_contents[$i][1] = array('td' => 'align="right" class="liste_total"', 'text' => $langs->trans('Total')
'text' => price($solde_total).' '.$langs->trans("Currency".$conf->monnaie) );
); $totalamount=price($solde_total).' '.$langs->trans("Currency".$conf->monnaie);
$this->info_box_contents[$i][1] = array('td' => 'align="right" class="liste_total"',
'text' => $totalamount
);
}
} }
else { else {
dol_print_error($db); dol_print_error($db);