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

New: Add picto on tab titles

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-07 18:39:01 +00:00
parent cf6a5c5feb
commit 45d4abfb8d
13 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 '<table class="border" width="100%">';

6
htdocs/compta/bank/annuel.php
View File

@ -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?"<a href='".$_SERVER["PHP_SELF"]."?account=".$acct->id."&year_start=".($year_start-1)."'>".img_previous()."</a> ".$langs->trans("Year")." <a href='".$_SERVER["PHP_SELF"]."?account=".$acct->id."&year_start=".($year_start+1)."'>".img_next()."</a>":"");
@ -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 '<td align="right" width="10%">&nbsp;';
if ($decaiss[$case]>0)
{

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

@ -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

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

@ -44,6 +44,10 @@ function valeur($sql)
}
/*
* View
*/
llxHeader();
print_titre("Bilan");
@ -51,7 +55,7 @@ print '<br>';
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="2">';
print "<tr class=\"liste_titre\">";
echo '<td colspan="2">R<EFBFBD>sum<EFBFBD></td>';
echo '<td colspan="2">'.$langs->trans("Summary").'</td>';
print "</tr>\n";
$var=!$var;

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

@ -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"));

16
htdocs/compta/bank/categ.php
View File

@ -21,7 +21,7 @@
/**
\file htdocs/compta/bank/categ.php
\ingroup compta
\brief Page ajout de catégories bancaires
\brief Page ajout de cat<EFBFBD>gories bancaires
\version $Id$
*/
@ -33,7 +33,7 @@ if (!$user->rights->banque->configurer)
/*
* Actions ajout catégorie
* Actions ajout cat<EFBFBD>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<EFBFBD>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<EFBFBD>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 "<tr $bc[$var]>";

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

@ -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

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

@ -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.'<br>';

5
htdocs/compta/bank/info.php
View File

@ -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 '<table width="100%"><tr><td>';
dol_print_object_info($line);

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

@ -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,";

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

@ -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 '<table class="border" width="100%">';
@ -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)
{

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

@ -1,6 +1,6 @@
<?php
/* Copytight (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
* Copyright (C) 2008-2009 Laurent Destailleur (Eldy) <eldy@users.sourceforge.net>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
*
* 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<EFBFBD>tail du budget de tr<EFBFBD>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 '<table class="border" width="100%">';
@ -119,7 +119,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$solde = $acct->solde(0);
/*
* Affiche tableau des echeances à venir
* Affiche tableau des echeances <EFBFBD> venir
*/
print '<table class="notopnoleftnoright" width="100% border="1">';

32
htdocs/compta/bank/virement.php
View File

@ -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.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"))."</div>";
}
if (! $amount)
{
$error=1;
$error=1;
$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"))."</div>";
}
if (! $_POST['account_from'])
{
$error=1;
$error=1;
$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferFrom"))."</div>";
}
if (! $_POST['account_to'])
{
$error=1;
$error=1;
$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferTo"))."</div>";
}
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.="<div class=\"ok\">";
@ -130,7 +130,7 @@ if ($_POST["action"] == 'add')
/*
* Affichage
*/
llxHeader();
$html=new Form($db);