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

Fix: Duplicate class

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-21 13:18:36 +00:00
parent 79d50f7284
commit e79d22e15f
5 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/boutique/commande/class/boutiquecommande.class.php
View File

@ -24,7 +24,7 @@
* \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/address.class.php");
require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php");
include_once(DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php');

6
htdocs/comm/address.php
View File

@ -27,7 +27,7 @@
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/class/address.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/address.class.php");
$langs->load("companies");
$langs->load("commercial");
@ -199,7 +199,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
$sql = "SELECT code, libelle";
$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
$sql.= " WHERE rowid = ".$address->pays_id;
$resql=$db->query($sql);
if ($resql)
{
@ -307,7 +307,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
$sql = "SELECT code, libelle";
$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
$sql.= "WHERE rowid = ".$address->pays_id;
$resql=$db->query($sql);
if ($resql)
{

45
htdocs/core/class/address.class.php
View File

@ -1,45 +0,0 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
\file htdocs/core/class/address.class.php
\brief Fichier de la classe des adresses postales
\version $Id$
*/
/** \class Address
\brief Classe permettant la gestion des adresses postales
\todo Classe non utilisee. L'implementer dans les objets qui gerent des adresses
*/
class Address {
var $name;
var $street;
var $cp;
var $city;
var $country;
function Address() {
}
}
?>

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

@ -2120,7 +2120,7 @@ class Form
{
if ($selected)
{
require_once(DOL_DOCUMENT_ROOT ."/comm/class/address.class.php");
require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php");
$address=new Address($this->db);
$result=$address->fetch_address($selected);
print '<a href='.DOL_URL_ROOT.'/comm/address.php?socid='.$address->socid.'&id='.$address->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$address->label.'</a>';

2
htdocs/comm/class/address.class.php → htdocs/societe/class/address.class.php
View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/comm/class/address.class.php
* \file htdocs/societe/class/address.class.php
* \ingroup societe
* \brief Fichier de la classe des adresses des tiers
* \version $Id$