';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 74322cce40a..b3dda1a5ad0 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -64,10 +64,20 @@ $pagenext = $page + 1;
llxHeader();
+$html = new Form($db);
+
// Récupère info du compte
$acct = new Account($db);
-$acct->fetch($_GET["account"]);
+if ($_GET["account"])
+{
+ $acct->fetch($_GET["account"]);
+}
+if ($_GET["ref"])
+{
+ $acct->fetch(0,$_GET["ref"]);
+ $_GET["account"]=$acct->id;
+}
if (! isset($_GET["num"]))
{
@@ -91,8 +101,25 @@ if (! isset($_GET["num"]))
$head=bank_prepare_head($acct);
dolibarr_fiche_head($head,'statement',$langs->trans("FinancialAccount"),0);
- $titre=$langs->trans("FinancialAccount")." : ".$acct->label;
- print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], "&account=".$_GET["account"], $sortfield, $sortorder,'',$numrows);
+ print '';
+
+ // Ref
+ print '| '.$langs->trans("Ref").' | ';
+ print '';
+ print $html->showrefnav($acct,'ref','',1,'ref');
+ print ' | ';
+
+ // Label
+ print '| '.$langs->trans("Label").' | ';
+ print ''.$acct->label.' | ';
+
+ print ' ';
+
+ print '
';
+
+
+
+ print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$_GET["account"], $sortfield, $sortorder,'',$numrows);
print '';
print "";
@@ -173,6 +200,7 @@ else
}
$ve=$_GET["ve"];
+
$mesprevnext ="id\">".img_previous()." ";
$mesprevnext.= $langs->trans("AccountStatement")." $num";
$mesprevnext.=" id\">".img_next()."";
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index a97e8572707..58a20167c53 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
@@ -52,13 +51,14 @@ $mesg='';
*/
llxHeader();
+
$societestatic = new Societe($db);
$facturestatic=new Facture($db);
$facturefournstatic=new FactureFournisseur($db);
$html = new Form($db);
-if ($account > 0)
+if ($_REQUEST["account"] || $_REQUEST["ref"])
{
if ($vline)
{
@@ -68,8 +68,19 @@ if ($account > 0)
{
$viewline = 20;
}
+
$acct = new Account($db);
- $result=$acct->fetch($account);
+ if ($_GET["account"])
+ {
+ $result=$acct->fetch($_GET["account"]);
+ }
+ if ($_GET["ref"])
+ {
+ $result=$acct->fetch(0,$_GET["ref"]);
+ $_GET["account"]=$acct->id;
+ }
+
+
/*
*
*
@@ -78,7 +89,23 @@ if ($account > 0)
$head=bank_prepare_head($acct);
dolibarr_fiche_head($head,'cash',$langs->trans("FinancialAccount"),0);
+ print '';
+ // Ref
+ print '| '.$langs->trans("Ref").' | ';
+ print '';
+ print $html->showrefnav($acct,'ref','',1,'ref');
+ print ' | ';
+
+ // Label
+ print '| '.$langs->trans("Label").' | ';
+ print ''.$acct->label.' | ';
+
+ print ' ';
+
+ print '
';
+
+
if ($mesg) print ''.$mesg.' ';
diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php
index 94527da8457..7e734bddc54 100644
--- a/htdocs/contact.class.php
+++ b/htdocs/contact.class.php
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
@@ -30,17 +29,20 @@
\version $Revision$
*/
+require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
+
/**
\class Contact
\brief Classe permettant la gestion des contacts
*/
-
-class Contact
+class Contact extends CommonObject
{
var $db;
var $error;
-
+ var $element='contact';
+ var $table_element='socpeople';
+
var $id;
var $civilite_id;
var $name;
@@ -385,6 +387,7 @@ class Contact
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
+ $this->ref = $obj->rowid;
$this->civilite_id = $obj->civilite_id;
$this->name = $obj->name;
$this->firstname = $obj->firstname;
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index a9d7e6597e5..20eb4578f4e 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -366,7 +366,7 @@ if ($user->rights->societe->contact->creer)
// Ref
print ' | '.$langs->trans("Ref").' | ';
- print $contact->id;
+ print $contact->ref;
print ' | ';
// Name
diff --git a/htdocs/dolgraph.class.php b/htdocs/dolgraph.class.php
index a82eff456e9..42ef8da032f 100644
--- a/htdocs/dolgraph.class.php
+++ b/htdocs/dolgraph.class.php
@@ -1,6 +1,6 @@
- * Copyright (c) 2004-2006 Laurent Destailleur
+ * Copyright (c) 2004-2007 Laurent Destailleur
*
* 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
@@ -17,7 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
@@ -305,15 +304,15 @@ class DolGraph
if (defined('TOTY')) $phplotversion=5;
// Create graph
- $this->graph = new PHPlot($this->width, $this->height);
- $this->graph->SetIsInline(1);
- $this->graph->SetPlotType($this->type);
- $this->graph->SetDataValues($this->data);
+ $graph = new PHPlot($this->width, $this->height);
+ $graph->SetIsInline(1);
+ $graph->SetPlotType($this->type);
+ $graph->SetDataValues($this->data);
// Precision axe y (pas de decimal si 3 chiffres ou plus)
if ($this->PrecisionY > -1)
{
- $this->graph->SetPrecisionY($this->PrecisionY);
+ $graph->SetPrecisionY($this->PrecisionY);
if ($this->PrecisionY == 0) // Si precision de 0
{
// Determine un nombre de ticks qui permet decoupage qui tombe juste
@@ -352,15 +351,15 @@ class DolGraph
$maxticks=min(9,$plage);
}
}
- $this->graph->SetNumVertTicks($maxticks);
+ $graph->SetNumVertTicks($maxticks);
// print 'minval='.$minval.' - maxval='.$maxval.' - plage='.$plage.' - maxticks='.$maxticks.'
';
}
}
else
{
- $this->graph->SetPrecisionY(3-strlen(round($this->GetMaxValueInData())));
+ $graph->SetPrecisionY(3-strlen(round($this->GetMaxValueInData())));
}
- $this->graph->SetPrecisionX(0);
+ $graph->SetPrecisionX(0);
// Set areas
$top_space=40;
@@ -380,52 +379,52 @@ class DolGraph
}
}
- $this->graph->SetNewPlotAreaPixels($left_space, $top_space, $this->width - $right_space, $this->height-40);
+ $graph->SetNewPlotAreaPixels($left_space, $top_space, $this->width - $right_space, $this->height-40);
if (isset($this->MaxValue))
{
- $this->graph->SetPlotAreaWorld(0,$this->MinValue,sizeof($this->data),$this->MaxValue);
+ $graph->SetPlotAreaWorld(0,$this->MinValue,sizeof($this->data),$this->MaxValue);
}
// Define title
- if (isset($this->title)) $this->graph->SetTitle($this->title);
+ if (isset($this->title)) $graph->SetTitle($this->title);
// Défini position du graphe (et legende) au sein de l'image
if (isset($this->Legend) && sizeof($this->Legend))
{
- $this->graph->SetLegendPixels($this->width - $right_space+8,40,'');
- $this->graph->SetLegend($this->Legend);
+ $graph->SetLegendPixels($this->width - $right_space+8,40,'');
+ $graph->SetLegend($this->Legend);
}
if (isset($this->SetShading))
{
- $this->graph->SetShading($this->SetShading);
+ $graph->SetShading($this->SetShading);
}
- $this->graph->SetTickLength(6);
+ $graph->SetTickLength(6);
- $this->graph->SetBackgroundColor($this->bgcolor);
- $this->graph->SetDataColors($this->datacolor, $this->bordercolor);
+ $graph->SetBackgroundColor($this->bgcolor);
+ $graph->SetDataColors($this->datacolor, $this->bordercolor);
if ($this->SetNumXTicks > -1)
{
if ($phplotversion >= 5) // If PHPlot 5, for compatibility
{
- $this->graph->SetXLabelType('');
- $this->graph->SetNumXTicks($this->SetNumXTicks);
+ $graph->SetXLabelType('');
+ $graph->SetNumXTicks($this->SetNumXTicks);
}
else
{
- $this->graph->SetNumHorizTicks($this->SetNumXTicks);
+ $graph->SetNumHorizTicks($this->SetNumXTicks);
}
}
if ($this->SetHorizTickIncrement > -1)
{
// Les ticks sont en mode forc
- $this->graph->SetHorizTickIncrement($this->SetHorizTickIncrement);
+ $graph->SetHorizTickIncrement($this->SetHorizTickIncrement);
if ($phplotversion >= 5) // If PHPlot 5, for compatibility
{
- $this->graph->SetXLabelType('');
- $this->graph->SetXTickLabelPos('none');
+ $graph->SetXLabelType('');
+ $graph->SetXTickLabelPos('none');
}
}
else
@@ -433,23 +432,25 @@ class DolGraph
// Les ticks sont en mode automatique
if ($phplotversion >= 5) // If PHPlot 5, for compatibility
{
- $this->graph->SetXDataLabelPos('none');
+ $graph->SetXDataLabelPos('none');
}
}
if ($phplotversion >= 5)
{
// Ne gere la transparence qu'en phplot >= 5
- // $this->graph->SetBgImage(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_2.png','tile');
- $this->graph->SetDrawPlotAreaBackground(array(255,255,255));
+ // $graph->SetBgImage(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo_2.png','tile');
+ $graph->SetDrawPlotAreaBackground(array(255,255,255));
}
- $this->graph->SetPlotBorderType("left"); // Affiche axe y a gauche uniquement
- $this->graph->SetVertTickPosition('plotleft'); // Affiche tick axe y a gauche uniquement
- $this->graph->SetOutputFile($file);
+ $graph->SetPlotBorderType("left"); // Affiche axe y a gauche uniquement
+ $graph->SetVertTickPosition('plotleft'); // Affiche tick axe y a gauche uniquement
+ $graph->SetOutputFile($file);
// Generate file
- $this->graph->DrawGraph();
+ $graph->DrawGraph();
+
+ unset($graph);
}
diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index 198d771ad9b..0e241880c20 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -23,7 +23,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
@@ -44,8 +43,11 @@ require_once(DOL_DOCUMENT_ROOT ."/client.class.php");
class Facture extends CommonObject
{
- var $db;
- var $element='facture';
+ var $db;
+ var $error;
+ var $element='facture';
+ var $table_element='facture';
+
var $table;
var $tabledetail;
var $id;
@@ -94,7 +96,6 @@ class Facture extends CommonObject
var $nbtodo;
var $nbtodolate;
var $specimen;
- var $error;
//! Numero d'erreur de 512 à 1023
var $errno = 0;
/**
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index a5b1eb80588..1938b34a368 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -3518,14 +3518,15 @@ class Form
* \param object Objet a afficher
* \param paramid Nom du parametre a utiliser pour nommer id dans liens URL
* \param morehtml Code html supplementaire a afficher avant barre nav
- * \param shownav Show Condirion
+ * \param shownav Show Condition
+ * \param fieldid Nom du champ a utiliser pour select next et previous
* \return string Portion HTML avec ref + boutons nav
*/
- function showrefnav($object,$paramid,$morehtml='',$shownav=1)
+ function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid')
{
$ret='';
- $object->load_previous_next_ref($object->next_prev_filter);
+ $object->load_previous_next_ref($object->next_prev_filter,$fieldid);
$previous_ref = $object->ref_previous?''.img_previous().'':'';
$next_ref = $object->ref_next?''.img_next().'':'';
diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 4bf1baa0df7..e7aafcdd18b 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -2129,7 +2129,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
if ($page > 0 || $num > $conf->liste_limit)
{
- print ''.$titre.' - '.$langs->trans('page').' '.($page+1);
+ print ' '.$titre.($titre?' - ':'').$langs->trans('page').' '.($page+1);
print ' | ';
}
else
diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index 1c8829caa57..bd56465d197 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
@@ -30,15 +29,21 @@
\version $Revision$
*/
+require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
+
+
/**
\class Product
\brief Classe permettant la gestion des produits prédéfinis
*/
-
-class Product
+class Product extends CommonObject
{
- var $db ;
- //! Identifiant unique
+ var $db;
+ var $error;
+ var $element='product';
+ var $table_element='product';
+
+ //! Identifiant unique
var $id ;
//! Référence
var $ref;
@@ -91,8 +96,6 @@ class Product
var $imgWidth;
var $imgHeight;
- //! Intitule de l'erreur
- var $error;
//! Numero de l'erreur
//! Numero d'erreur Plage 0256-0511
var $errno = 0;
@@ -975,43 +978,6 @@ class Product
}
- /**
- * \brief Charge les propriétés ref_previous et ref_next
- * \param filter filtre
- * \return int <0 si ko, >0 si ok
- */
- function load_previous_next_ref($filter='')
- {
- $sql = "SELECT MAX(ref)";
- $sql.= " FROM ".MAIN_DB_PREFIX."product";
- $sql.= " WHERE ref < '".addslashes($this->ref)."'";
- if (isset($filter)) $sql.=" AND ".$filter;
- $result = $this->db->query($sql) ;
- if (! $result)
- {
- $this->error=$this->db->error();
- return -1;
- }
- $row = $this->db->fetch_row($result);
- $this->ref_previous = $row[0];
-
- $sql = "SELECT MIN(ref)";
- $sql.= " FROM ".MAIN_DB_PREFIX."product";
- $sql.= " WHERE ref > '".addslashes($this->ref)."'";
- if (isset($filter)) $sql.=" AND ".$filter;
- $result = $this->db->query($sql) ;
- if (! $result)
- {
- $this->error=$this->db->error();
- return -2;
- }
- $row = $this->db->fetch_row($result);
- $this->ref_next = $row[0];
-
- return 1;
- }
-
-
/**
* \brief Charge tableau des stats propale pour le produit/service
* \param socid Id societe
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index bb892d6f51e..a4ae7adb2f9 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -761,7 +761,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print ''.$langs->trans("Ref").' | ';
- print $html->showrefnav($product,'ref');
+ print $html->showrefnav($product,'ref','',1,'ref');
print ' | ';
$nblignes=6;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 6364f95972c..a93b13ff720 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2005 Laurent Destailleur
+ * Copyright (C) 2004-2007 Laurent Destailleur
* Copyright (C) 2005 Eric Seigne
* Copyright (C) 2005-2007 Regis Houssin
* Copyright (C) 2006 Andre Cianfarani
@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
- * $Source$
*/
/**
diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index 682b61fcefb..291f11301b2 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -37,14 +37,19 @@
\version $Revision$
*/
+require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php");
+
/**
\class User
\brief Classe permettant la gestion d'un utilisateur
*/
-class User
+class User extends CommonObject
{
- var $db;
+ var $db;
+ var $error;
+ var $element='user';
+ var $table_element='user';
var $id;
var $ldap_sid;
@@ -81,7 +86,6 @@ class User
var $statut;
var $lang;
- var $error;
var $userpref_limite_liste;
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */
//! Liste des entrepots auquel a acces l'utilisateur
@@ -1733,41 +1737,7 @@ class User
dolibarr_print_error($this->db);
}
}
-
- /**
- * \brief Charge les propriétés id_previous et id_next
- * \param filter filtre
- * \return int <0 si ko, >0 si ok
- */
- function load_previous_next_ref($filter='')
- {
- $sql = "SELECT MAX(rowid)";
- $sql.= " FROM ".MAIN_DB_PREFIX."user";
- $sql.= " WHERE rowid < '".addslashes($this->id)."'";
- if (isset($filter)) $sql.=" AND ".$filter;
- $result = $this->db->query($sql) ;
- if (! $result)
- {
- $this->error=$this->db->error();
- return -1;
- }
- $row = $this->db->fetch_row($result);
- $this->ref_previous = $row[0];
-
- $sql = "SELECT MIN(rowid)";
- $sql.= " FROM ".MAIN_DB_PREFIX."user";
- $sql.= " WHERE rowid > '".addslashes($this->id)."'";
- if (isset($filter)) $sql.=" AND ".$filter;
- $result = $this->db->query($sql) ;
- if (! $result)
- {
- $this->error=$this->db->error();
- return -2;
- }
- $row = $this->db->fetch_row($result);
- $this->ref_next = $row[0];
- }
}
| |