Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qual: Removed some deprecated/duplicated functions

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-04 11:33:22 +00:00
parent 0693391519
commit 03c7579beb
7 changed files with 23 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@
* \file htdocs/compta/bank/account.php
* \ingroup banque
* \brief List of details of bank transactions for an account
* \version $Id$
* \version $Id: account.php,v 1.154 2011/07/04 11:33:22 eldy Exp $
*/
require("./pre.inc.php"); // We use pre.inc.php to have a dynamic menu
@ -491,7 +491,7 @@ if ($account || $_GET["ref"])
if ($result)
{
$now=dol_now();
$nows=dol_date('Ymd',$now);
$nows=dol_print_date($now,'%Y%m%d');
//$html->load_cache_types_paiements();
//$html->cache_types_paiements
@ -510,7 +510,7 @@ if ($account || $_GET["ref"])
$var=!$var;
// Is it a transaction in future ?
$dos=dol_date('Ymd',$db->jdate($objp->do));
$dos=dol_print_date($db->jdate($objp->do),'%Y%m%d');
//print "dos=".$dos." nows=".$nows;
if ($dos > $nows && !$sep) // Yes, we show a subtotal
{
@ -786,5 +786,5 @@ else
$db->close();
llxFooter('$Date$ - $Revision$');
llxFooter('$Date: 2011/07/04 11:33:22 $ - $Revision: 1.154 $');
?>

11
htdocs/compta/bank/pre.inc.php
View File

@ -23,7 +23,7 @@
* \file htdocs/compta/bank/pre.inc.php
* \ingroup compta
* \brief Fichier gestionnaire du menu compta banque
* \version $Id$
* \version $Id: pre.inc.php,v 1.51 2011/07/04 11:33:22 eldy Exp $
*/
require_once("../../main.inc.php");
@ -73,16 +73,11 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
while ($i < $numr)
{
$objp = $db->fetch_object($resql);
$menu->add_submenu('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
$menu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
if ($objp->rappro && $objp->courant != 2 && ! $objp->clos) // If not cash account and not closed and can be reconciliate
{
$menu->add_submenu('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
$menu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
}
/*
$menu->add_submenu("/compta/bank/annuel.php?account=".$objp->rowid ,$langs->trans("IOMonthlyReporting"));
$menu->add_submenu("/compta/bank/graph.php?account=".$objp->rowid ,$langs->trans("Graph"));
if ($objp->courant != 2) $menu->add_submenu("/compta/bank/releve.php?account=".$objp->rowid ,$langs->trans("AccountStatements"));
*/
$i++;
}
}

11
htdocs/compta/paiement/cheque/pre.inc.php
View File

@ -22,7 +22,7 @@
* \file htdocs/compta/paiement/cheque/pre.inc.php
* \ingroup compta
* \brief Fichier gestionnaire du menu cheques
* \version $Id$
* \version $Id: pre.inc.php,v 1.19 2011/07/04 11:33:23 eldy Exp $
*/
require_once("../../../main.inc.php");
@ -72,16 +72,11 @@ function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0
while ($i < $numr)
{
$objp = $db->fetch_object($resql);
$menu->add_submenu('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
$menu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
if ($objp->rappro && $objp->courant != 2) // If not cash account and can be reconciliate
{
$menu->add_submenu('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
$menu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
}
/*
$menu->add_submenu("/compta/bank/annuel.php?account=".$objp->rowid ,$langs->trans("IOMonthlyReporting"));
$menu->add_submenu("/compta/bank/graph.php?account=".$objp->rowid ,$langs->trans("Graph"));
if ($objp->courant != 2) $menu->add_submenu("/compta/bank/releve.php?account=".$objp->rowid ,$langs->trans("AccountStatements"));
*/
$i++;
}
}

13
htdocs/core/class/html.form.class.php
View File

@ -31,7 +31,7 @@
* \file htdocs/core/class/html.form.class.php
* \ingroup core
* \brief File of class with all html predefined components
* \version $Id: html.form.class.php,v 1.185 2011/07/04 07:28:11 eldy Exp $
* \version $Id: html.form.class.php,v 1.186 2011/07/04 11:33:22 eldy Exp $
*/
@ -134,15 +134,6 @@ class Form
return $ret;
}
/**
* Old version of textwithtooltip. Kept for backward compatibility with modules for 2.6.
* @deprecated
*/
function textwithhelp($text,$htmltext,$tooltipon=1)
{
return $this->textwithtooltip($text,$htmltext,$tooltipon);
}
/**
* Show a text and picto with tooltip on text or picto
* @param text Text to show
@ -2507,7 +2498,7 @@ class Form
}
}
}
/**
* \brief Affiche formulaire de selection des tiers
* \param page Page

16
htdocs/core/class/menu.class.php
View File

@ -21,7 +21,7 @@
* \file htdocs/core/class/menu.class.php
* \ingroup core
* \brief Fichier de la classe de gestion du menu gauche
* \version $Id$
* \version $Id: menu.class.php,v 1.4 2011/07/04 11:33:22 eldy Exp $
*/
@ -76,18 +76,4 @@ class Menu {
if (sizeof($this->liste) > 1) array_pop($this->liste);
}
/**
* \brief Add a menu entry
* \param url Url to follown on click
* \param titre Menu label to show
* \param level Level of menu to show (0=First level, 1=Second...)
* \param enabled Menu active or not
* \param target Target lien
* \deprecated
*/
function add_submenu($url, $titre, $level=1, $enabled=1, $target='')
{
$this->add($url, $titre, $level, $enabled, $target);
}
}

8
htdocs/imports/import.php
View File

@ -21,7 +21,7 @@
* \file htdocs/imports/import.php
* \ingroup import
* \brief Pages of import Wizard
* \version $Id: import.php,v 1.66 2011/07/04 08:53:01 eldy Exp $
* \version $Id: import.php,v 1.67 2011/07/04 11:33:23 eldy Exp $
*/
require_once("../main.inc.php");
@ -195,8 +195,8 @@ if ($step == 3 && $datatoimport)
if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
create_exdir($conf->import->dir_temp);
$nowyearmonth=dol_date('YmdHis',dol_now(),0);
dol_mkdir($conf->import->dir_temp);
$nowyearmonth=dol_print_date(dol_now(),'%Y%m%d%H%M%S');
$fullpath=$conf->import->dir_temp . "/" . $nowyearmonth . '-'.$_FILES['userfile']['name'];
if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $fullpath,1) > 0)
@ -1669,7 +1669,7 @@ print '<br>';
$db->close();
llxFooter('$Date: 2011/07/04 08:53:01 $ - $Revision: 1.66 $');
llxFooter('$Date: 2011/07/04 11:33:23 $ - $Revision: 1.67 $');
/*

12
htdocs/includes/menus/standard/eldy.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/includes/menus/standard/eldy.lib.php
* \brief Library for file eldy menus
* \version $Id: eldy.lib.php,v 1.54 2011/07/03 16:00:18 eldy Exp $
* \version $Id: eldy.lib.php,v 1.55 2011/07/04 11:33:22 eldy Exp $
*/
@ -1012,13 +1012,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
{
$newmenu->add("/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire);
$newmenu->add_submenu("/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
$newmenu->add_submenu("/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer);
$newmenu->add("/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
$newmenu->add("/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer);
$newmenu->add_submenu("/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
$newmenu->add_submenu("/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire);
$newmenu->add("/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
$newmenu->add("/compta/bank/budget.php",$langs->trans("ListTransactionsByCategory"),1,$user->rights->banque->lire);
$newmenu->add_submenu("/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer);
$newmenu->add("/compta/bank/virement.php",$langs->trans("BankTransfers"),1,$user->rights->banque->transfer);
}
// Prelevements