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

Define a default module is not defined

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-20 22:53:59 +00:00
parent 4917ba31a2
commit 8fd2f8a577
5 changed files with 61 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/admin/contract.php
View File

@ -35,9 +35,16 @@ $langs->load("contracts");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
if (empty($conf->global->CONTRACT_ADDON))
{
$conf->global->CONTRACT_ADDON='mod_contract_serpis';
}
/* /*
* Actions * Actions
*/ */
if ($_POST["action"] == 'updateMask') if ($_POST["action"] == 'updateMask')
{ {
$maskconst=$_POST['maskconstcontract']; $maskconst=$_POST['maskconstcontract'];
@ -56,9 +63,11 @@ if ($_POST["action"] == 'updatePrefix') dolibarr_set_const($db, "CONTRACT_NUM_PR
if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "CONTRACT_NUM_DELTA",$_POST["offset"],'chaine',0,'',$conf->entity); if ($_POST["action"] == 'setOffset') dolibarr_set_const($db, "CONTRACT_NUM_DELTA",$_POST["offset"],'chaine',0,'',$conf->entity);
if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "CONTRACT_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"],'chaine',0,'',$conf->entity); if ($_POST["action"] == 'setNumRestart') dolibarr_set_const($db, "CONTRACT_NUM_RESTART_BEGIN_YEAR",$_POST["numrestart"],'chaine',0,'',$conf->entity);
/* /*
* View * View
*/ */
llxHeader(); llxHeader();
$dir=DOL_DOCUMENT_ROOT."/includes/modules/contract/"; $dir=DOL_DOCUMENT_ROOT."/includes/modules/contract/";

5
htdocs/admin/expedition.php
View File

@ -41,6 +41,11 @@ $langs->load("deliveries");
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
if (empty($conf->global->EXPEDITION_ADDON_NUMBER))
{
$conf->global->EXPEDITION_ADDON_NUMBER='mod_expedition_safor';
}
/* /*
* Actions * Actions

39
htdocs/contrat/class/contrat.class.php
View File

@ -100,33 +100,30 @@ class Contrat extends CommonObject
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/contract"; $dir = DOL_DOCUMENT_ROOT . "/includes/modules/contract";
if (! empty($conf->global->CONTRACT_ADDON)) if (empty($conf->global->CONTRACT_ADDON))
{ {
$file = $conf->global->CONTRACT_ADDON.".php"; $conf->global->CONTRACT_ADDON='mod_contract_serpis';
}
// Chargement de la classe de numerotation $file = $conf->global->CONTRACT_ADDON.".php";
$classname = $conf->global->CONTRACT_ADDON;
$result=include_once($dir.'/'.$file); // Chargement de la classe de numerotation
if ($result) $classname = $conf->global->CONTRACT_ADDON;
$result=include_once($dir.'/'.$file);
if ($result)
{
$obj = new $classname();
$numref = "";
$numref = $obj->getNextValue($soc,$this);
if ( $numref != "")
{ {
$obj = new $classname(); return $numref;
$numref = "";
$numref = $obj->getNextValue($soc,$this);
if ( $numref != "")
{
return $numref;
}
else
{
dol_print_error($db,"Contract::getNextNumRef ".$obj->error);
return "";
}
} }
else else
{ {
print $langs->trans("Error")." ".$langs->trans("Error_CONTRACT_ADDON_NotDefined"); dol_print_error($db,"Contract::getNextNumRef ".$obj->error);
return ""; return "";
} }
} }
@ -134,7 +131,7 @@ class Contrat extends CommonObject
{ {
print $langs->trans("Error")." ".$langs->trans("Error_CONTRACT_ADDON_NotDefined"); print $langs->trans("Error")." ".$langs->trans("Error_CONTRACT_ADDON_NotDefined");
return ""; return "";
} }
} }
/** /**

39
htdocs/expedition/class/expedition.class.php
View File

@ -98,33 +98,30 @@ class Expedition extends CommonObject
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition"; $dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition";
if (! empty($conf->global->EXPEDITION_ADDON_NUMBER)) if (empty($conf->global->EXPEDITION_ADDON_NUMBER))
{
$conf->global->EXPEDITION_ADDON_NUMBER='mod_expedition_safor';
}
$file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
// Chargement de la classe de numerotation
$classname = $conf->global->EXPEDITION_ADDON_NUMBER;
$result=include_once($dir.'/'.$file);
if ($result)
{ {
$file = $conf->global->EXPEDITION_ADDON_NUMBER.".php"; $obj = new $classname();
$numref = "";
$numref = $obj->getNextValue($soc,$this);
// Chargement de la classe de numerotation if ( $numref != "")
$classname = $conf->global->EXPEDITION_ADDON_NUMBER;
$result=include_once($dir.'/'.$file);
if ($result)
{ {
$obj = new $classname(); return $numref;
$numref = "";
$numref = $obj->getNextValue($soc,$this);
if ( $numref != "")
{
return $numref;
}
else
{
dol_print_error($db,"Expedition::getNextNumRef ".$obj->error);
return "";
}
} }
else else
{ {
print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined"); dol_print_error($db,"Expedition::getNextNumRef ".$obj->error);
return ""; return "";
} }
} }

2
htdocs/includes/modules/expedition/mod_expedition_safor.php
View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition
class mod_expedition_safor extends ModelNumRefExpedition class mod_expedition_safor extends ModelNumRefExpedition
{ {
var $version='dolibarr'; var $version='dolibarr';
var $prefix='BE'; var $prefix='SH';
var $error=''; var $error='';
var $nom='Safor'; var $nom='Safor';