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

Merge pull request #1786 from atm-maxime/develop

Browse Source 
Fix on class not extending commonobject
This commit is contained in:
Laurent Destailleur 2014-08-04 08:58:54 +02:00
commit 3024d82536
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/class/categorie.class.php
View File

@ -87,7 +87,7 @@ class Categorie extends CommonObject
else
{
if ($label) $sql.= " WHERE label = '".$this->db->escape($label)."' AND entity=".$conf->entity;;
if ($label) $sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category',1).")";
}
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);

28
htdocs/core/class/commonobjectline.class.php
View File

@ -28,6 +28,34 @@
*/
abstract class CommonObjectLine
{
/**
* Call trigger based on this instance
* NB: Error from trigger are stacked in interface->errors
* NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
*
* @param string $trigger_name trigger's name to execute
* @param User $user Object user
* @return int Result of run_triggers
*/
function call_trigger($trigger_name, $user)
{
global $langs,$conf;
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db);
$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
if ($result < 0)
{
if (!empty($this->errors))
{
$this->errors=array_merge($this->errors,$interface->errors);
}
else
{
$this->errors=$interface->errors;
}
}
return $result;
}
}

3
htdocs/fichinter/class/fichinter.class.php
View File

@ -24,6 +24,7 @@
* \brief Fichier de la classe des gestion des fiches interventions
*/
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
/**
@ -998,7 +999,7 @@ class Fichinter extends CommonObject
/**
* Classe permettant la gestion des lignes d'intervention
*/
class FichinterLigne
class FichinterLigne extends CommonObjectLine
{
var $db;
var $error;

2
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -28,7 +28,7 @@
/**
* Class to manage stock movements
*/
class MouvementStock
class MouvementStock extends CommonObject
{
var $error;
var $db;

2
htdocs/projet/tasks/task.php
View File

@ -116,7 +116,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
if ($object->delete($user) > 0)
{
header("Location: index.php");
header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id);
exit;
}
else