diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 74ff851d7a5..37efa577191 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -260,7 +260,7 @@ if ($account || $_GET["ref"]) // Onglets $head=bank_prepare_head($acct); - dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0); + dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account'); print ''; diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 461d4c42f20..39c1d3e6584 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -128,7 +128,7 @@ else // Onglets $head=bank_prepare_head($acct); -dol_fiche_head($head,'annual',$langs->trans("FinancialAccount"),0); +dol_fiche_head($head,'annual',$langs->trans("FinancialAccount"),0,'account'); $title=$langs->trans("FinancialAccount")." : ".$acct->label; $lien=($year_start?"".img_previous()." ".$langs->trans("Year")." ".img_next()."":""); @@ -152,7 +152,7 @@ if ($_GET["account"]) { $bankaccount->fetch($id); $bankaccount->label=$bankaccount->ref; - print $bankaccount->getNomUrl(1); + print $bankaccount->getNomUrl(1); if ($key < (sizeof($listid)-1)) print ', '; } } @@ -206,7 +206,7 @@ for ($mois = 1 ; $mois < 13 ; $mois++) for ($annee = $year_start ; $annee <= $year_end ; $annee++) { $case = sprintf("%04s-%02s",$annee,$mois); - + print '
 '; if ($decaiss[$case]>0) { diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index fe99f64b8ce..89f775b21a3 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -120,7 +120,7 @@ if (($_GET["id"] || $_GET["ref"]) && $_GET["action"] != 'edit') */ // Onglets $head=bank_prepare_head($account); - dol_fiche_head($head, 'bankid', $langs->trans("FinancialAccount")); + dol_fiche_head($head, 'bankid', $langs->trans("FinancialAccount"),0,'account'); /* * Confirmation de la suppression diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index 54eda825a59..cfbd6ec876f 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -44,6 +44,10 @@ function valeur($sql) } +/* + * View + */ + llxHeader(); print_titre("Bilan"); @@ -51,7 +55,7 @@ print '
'; print ''; print ""; -echo ''; +echo ''; print "\n"; $var=!$var; diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 7cb9adf5a0c..d6e74b4e467 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -35,15 +35,13 @@ $result=restrictedArea($user,'banque'); /* - * Affichage page - * + * View */ $companystatic=new Societe($db); llxHeader(); - // List movements bu category for bank transactions print_fiche_titre($langs->trans("BankTransactionByCategories")); diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index a9f6ace57e3..28b9bba30cf 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -21,7 +21,7 @@ /** \file htdocs/compta/bank/categ.php \ingroup compta - \brief Page ajout de catégories bancaires + \brief Page ajout de cat�gories bancaires \version $Id$ */ @@ -33,7 +33,7 @@ if (!$user->rights->banque->configurer) /* -* Actions ajout catégorie +* Actions ajout cat�gorie */ if ($_POST["action"] == 'add') { @@ -46,7 +46,7 @@ if ($_POST["action"] == 'add') $sql.= "'".addslashes($_POST["label"])."'"; $sql.= ", ".$conf->entity; $sql.= ")"; - + $result = $db->query($sql); if (!$result) @@ -57,7 +57,7 @@ if ($_POST["action"] == 'add') } /* -* Action suppression catégorie +* Action suppression cat�gorie */ if ( $_REQUEST['action'] == 'delete' ) { @@ -66,7 +66,7 @@ if ( $_REQUEST['action'] == 'delete' ) $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ"; $sql.= " WHERE rowid = '".$_REQUEST['categid']."'"; $sql.= " AND entity = ".$conf->entity; - + $result = $db->query($sql); if (!$result) @@ -79,7 +79,7 @@ if ( $_REQUEST['action'] == 'delete' ) /* - * Affichage liste des catégories + * Affichage liste des cat�gories */ llxHeader(); @@ -106,7 +106,7 @@ if ($result) { $num = $db->num_rows(); $i = 0; $total = 0; - + $var=True; while ($i < $num) { @@ -123,7 +123,7 @@ if ($result) } /* - * Affichage ligne ajout de catégorie + * Affichage ligne ajout de categorie */ $var=!$var; print ""; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index b8a78feae3a..f72d5adbdde 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -286,7 +286,7 @@ else // Onglets $head=bank_prepare_head($account); - dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount")); + dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"),0,'account'); /* * Confirmation to delete diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 351a677d7d5..2b1b623655b 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -728,7 +728,7 @@ else // Onglets $head=bank_prepare_head($acct); -dol_fiche_head($head,'graph',$langs->trans("FinancialAccount"),0); +dol_fiche_head($head,'graph',$langs->trans("FinancialAccount"),0,'account'); if ($mesg) print $mesg.'
'; diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php index dcfe4aba58f..30b772c8c0b 100644 --- a/htdocs/compta/bank/info.php +++ b/htdocs/compta/bank/info.php @@ -32,8 +32,7 @@ $langs->load("companies"); /* - * Visualisation de la fiche - * + * View */ llxHeader(); @@ -55,7 +54,7 @@ $hselected = $h; $h++; -dol_fiche_head($head, $hselected, $langs->trans("LineRecord")); +dol_fiche_head($head, $hselected, $langs->trans("LineRecord"),0,'account'); print '
R�sum�'.$langs->trans("Summary").'
'; dol_print_object_info($line); diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 039cb5f4477..3004d934c88 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -200,7 +200,7 @@ $head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$_GET["rowid"]; $head[$h][1] = $langs->trans("Info"); $h++; -dol_fiche_head($head, $hselected, $langs->trans('LineRecord')); +dol_fiche_head($head, $hselected, $langs->trans('LineRecord'),0,'account'); $sql = "SELECT b.rowid,".$db->pdate("b.dateo")." as do,".$db->pdate("b.datev")." as dv, b.amount, b.label, b.rappro,"; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 9d0046eb8d7..69468fa0c7b 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -96,7 +96,7 @@ if (! isset($_GET["num"])) $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= " WHERE b.fk_account = ".$_GET["account"]; $sql.= " ORDER BY numr DESC"; - + $sql.= $db->plimit($conf->liste_limit+1,$offset); $result = $db->query($sql); @@ -108,7 +108,7 @@ if (! isset($_GET["num"])) // Onglets $head=bank_prepare_head($acct); - dol_fiche_head($head,'statement',$langs->trans("FinancialAccount"),0); + dol_fiche_head($head,'statement',$langs->trans("FinancialAccount"),0,'account'); print ''; @@ -174,7 +174,7 @@ else $sql.= " WHERE b.num_releve < '".$_GET["num"]."'"; $sql.= " AND b.fk_account = ".$_GET["account"]; $sql.= " ORDER BY b.num_releve DESC"; - + dol_syslog("htdocs/compta/bank/releve.php sql=".$sql); $resql = $db->query($sql); if ($resql) @@ -196,7 +196,7 @@ else $sql.= " WHERE b.num_releve > '".$_GET["num"]."'"; $sql.= " AND b.fk_account = ".$_GET["account"]; $sql.= " ORDER BY b.num_releve ASC"; - + dol_syslog("htdocs/compta/bank/releve.php sql=".$sql); $resql = $db->query($sql); if ($resql) @@ -244,7 +244,7 @@ else $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= " WHERE b.num_releve < '".$num."'"; $sql.= " AND b.fk_account = ".$acct->id; - + $resql=$db->query($sql); if ($resql) { @@ -261,7 +261,7 @@ else if (!isset($num)) $sql.= " OR b.num_releve is null"; $sql.= " AND b.fk_account = ".$acct->id; $sql.= " ORDER BY b.datev ASC"; - + $result = $db->query($sql); if ($result) @@ -382,7 +382,7 @@ else $sql.= " WHERE ct.rowid = cl.fk_categ"; $sql.= " AND ct.entity = ".$conf->entity; $sql.= " AND cl.lineid = ".$objp->rowid; - + $resc = $db->query($sql); if ($resc) { diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index a829fad4bb3..dd841becfcf 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -1,6 +1,6 @@ - * Copyright (C) 2008 Laurent Destailleur (Eldy) + * Copyright (C) 2008-2009 Laurent Destailleur (Eldy) * Copyright (C) 2008 Raphael Bertrand (Resultic) * * This program is free software; you can redistribute it and/or modify @@ -19,10 +19,10 @@ */ /** - \file htdocs/compta/bank/treso.php - \ingroup banque - \brief Page de détail du budget de trésorerie - \version $Id$ + * \file htdocs/compta/bank/treso.php + * \ingroup banque + * \brief Page de d�tail du budget de tr�sorerie + * \version $Id$ */ require("./pre.inc.php"); @@ -94,7 +94,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) */ // Onglets $head=bank_prepare_head($acct); - dol_fiche_head($head,'cash',$langs->trans("FinancialAccount"),0); + dol_fiche_head($head,'cash',$langs->trans("FinancialAccount"),0,'account'); print '
'; @@ -119,7 +119,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) $solde = $acct->solde(0); /* - * Affiche tableau des echeances à venir + * Affiche tableau des echeances � venir */ print '
'; diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index b9916f1f3c1..69aa526b980 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -19,11 +19,11 @@ */ /** - \file htdocs/compta/bank/virement.php - \ingroup banque - \brief Page de saisie d'un virement - \version $Id$ -*/ + * \file htdocs/compta/bank/virement.php + * \ingroup banque + * \brief Page de saisie d'un virement + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); @@ -40,7 +40,7 @@ if (! $user->rights->banque->transfer) if ($_POST["action"] == 'add') { $langs->load("errors"); - + $mesg=''; $dateo = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]); $label = $_POST["label"]; @@ -48,22 +48,22 @@ if ($_POST["action"] == 'add') if (! $label) { - $error=1; + $error=1; $mesg.="
".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"))."
"; } if (! $amount) { - $error=1; + $error=1; $mesg.="
".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"))."
"; } if (! $_POST['account_from']) { - $error=1; + $error=1; $mesg.="
".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferFrom"))."
"; } if (! $_POST['account_to']) { - $error=1; + $error=1; $mesg.="
".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferTo"))."
"; } if (! $error) @@ -79,12 +79,12 @@ if ($_POST["action"] == 'add') if ($accountto->id != $accountfrom->id) { $db->begin(); - + $error=0; $bank_line_id_from=0; $bank_line_id_to=0; $result=0; - + // By default, electronic transfert from bank to bank $typefrom='PRE'; $typeto='VIR'; @@ -94,17 +94,17 @@ if ($_POST["action"] == 'add') $typefrom='LIQ'; $typeto='LIQ'; } - + if (! $error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, -1*price2num($amount), '', '', $user); if (! ($bank_line_id_from > 0)) $error++; if (! $error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amount), '', '', $user); if (! ($bank_line_id_to > 0)) $error++; - + if (! $error) $result=$accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/ligne.php?rowid=', '(banktransfert)', 'banktransfert'); if (! ($result > 0)) $error++; if (! $error) $result=$accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/ligne.php?rowid=', '(banktransfert)', 'banktransfert'); if (! ($result > 0)) $error++; - + if (! $error) { $mesg.="
"; @@ -130,7 +130,7 @@ if ($_POST["action"] == 'add') /* * Affichage */ - + llxHeader(); $html=new Form($db);