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

Qual: Use a more common name of class.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-07 09:57:11 +00:00
parent 831e684cfe
commit e7f94d345b
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/canvas.class.php
View File

@ -17,7 +17,7 @@
*/
/**
* \file htdocs/core/class/canvas.class.php
* \file htdocs/core/class/canvas.class.php
* \ingroup core
* \brief Fichier de la classe de gestion des canvas
* \version $Id$
@ -128,23 +128,23 @@ class Canvas
if (! $conf->$childmodule->enabled || ! $conf->$targetmodule->enabled) accessforbidden();
if (file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->targetmodule.'.'.$this->canvas.'.class.php') &&
file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->card.'.'.$this->canvas.'.class.php'))
if (file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php') &&
file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php'))
{
// Include dataservice class (model)
$modelclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->targetmodule.'.'.$this->canvas.'.class.php';
$modelclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php';
include_once($modelclassfile);
// Include actions class (controller)
$controlclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->card.'.'.$this->canvas.'.class.php';
$controlclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php';
include_once($controlclassfile);
// Instantiate actions class (controller)
$controlclassname = ucfirst($this->card).ucfirst($this->canvas);
$controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
$this->control = new $controlclassname($this->db);
// Instantiate dataservice class (model)
$modelclassname = ucfirst($this->targetmodule).ucfirst($this->canvas);
$modelclassname = 'Dao'.ucfirst($this->targetmodule).ucfirst($this->canvas);
$this->control->object = new $modelclassname($this->db);
// Canvas

20
htdocs/societe/canvas/default/thirdparty.default.class.php → htdocs/societe/canvas/default/dao_thirdparty_default.class.php
View File

@ -24,13 +24,13 @@
*/
/**
* \class ThirdPartyDefault
* \class DaoThirdPartyDefault
* \brief Classe permettant la gestion des tiers par defaut, cette classe surcharge la classe societe
*/
class ThirdPartyDefault extends Societe
class DaoThirdPartyDefault extends Societe
{
var $db;
//! Numero d'erreur Plage 1280-1535
var $errno = 0;
@ -38,7 +38,7 @@ class ThirdPartyDefault extends Societe
* Constructeur de la classe
* @param DB Handler acces base de donnees
*/
function ThirdPartyDefault($DB)
function DaoThirdPartyDefault($DB)
{
$this->db = $DB;
}
@ -54,7 +54,7 @@ class ThirdPartyDefault extends Societe
return $result;
}
/**
* Create third party in database
* @param user Object of user that ask creation
@ -66,7 +66,7 @@ class ThirdPartyDefault extends Societe
return $result;
}
/**
* Update parameters of third party
* @param id id societe
@ -79,10 +79,10 @@ class ThirdPartyDefault extends Societe
function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0)
{
$result = parent::update($id, $user, $call_trigger, $allowmodcodeclient, $allowmodcodefournisseur);
return $result;
}
/**
* Delete third party in database
* @param id id de la societe a supprimer
@ -90,10 +90,10 @@ class ThirdPartyDefault extends Societe
function delete($id)
{
$result = parent::delete($id);
return $result;
}
/**
* Fetch datas list
*/

18
htdocs/societe/canvas/individual/thirdparty.individual.class.php → htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
View File

@ -24,10 +24,10 @@
*/
/**
* \class ThirdPartyIndividual
* \class DaoThirdPartyIndividual
* \brief Classe permettant la gestion des particuliers, cette classe surcharge la classe societe
*/
class ThirdPartyIndividual extends Societe
class DaoThirdPartyIndividual extends Societe
{
//! Numero d'erreur Plage 1280-1535
var $errno = 0;
@ -36,7 +36,7 @@ class ThirdPartyIndividual extends Societe
* Constructeur de la classe
* @param DB Handler acces base de donnees
*/
function ThirdPartyIndividual($DB)
function DaoThirdPartyIndividual($DB)
{
$this->db = $DB;
}
@ -52,7 +52,7 @@ class ThirdPartyIndividual extends Societe
return $result;
}
/**
* Create third party in database
* @param user Object of user that ask creation
@ -64,7 +64,7 @@ class ThirdPartyIndividual extends Societe
return $result;
}
/**
* Update parameters of third party
* @param id id societe
@ -77,10 +77,10 @@ class ThirdPartyIndividual extends Societe
function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0)
{
$result = parent::update($id, $user, $call_trigger, $allowmodcodeclient, $allowmodcodefournisseur);
return $result;
}
/**
* Delete third party in database
* @param id id de la societe a supprimer
@ -88,10 +88,10 @@ class ThirdPartyIndividual extends Societe
function delete($id)
{
$result = parent::delete($id);
return $result;
}
/**
* Fetch datas list
*/