diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 065886d402b..07912e8759c 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -190,23 +190,6 @@ else if ($action == 'set_CONTRAT_DRAFT_WATERMARK')
}
}
-elseif ($action == 'set_CONTRAT_PRINT_PRODUCTS')
-{
- $val = GETPOST('CONTRAT_PRINT_PRODUCTS','alpha');
- $res = dolibarr_set_const($db, "CONTRAT_PRINT_PRODUCTS",($val == 'on'),'bool',0,'',$conf->entity);
-
- if (! $res > 0) $error++;
-
- if (! $error)
- {
- setEventMessage($langs->trans("SetupSaved"));
- }
- else
- {
- setEventMessage($langs->trans("Error"),'errors');
- }
-}
-
/*
* View
*/
@@ -215,7 +198,6 @@ $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
llxHeader();
-$dir=DOL_DOCUMENT_ROOT."/core/modules/contract/";
$form=new Form($db);
$linkback=''.$langs->trans("BackToModuleList").' ';
@@ -244,84 +226,90 @@ print "\n";
clearstatcache();
-$dir = "../core/modules/contract/";
-$handle = opendir($dir);
-if (is_resource($handle))
+foreach ($dirmodels as $reldir)
{
- $var=true;
+ $dir = dol_buildpath($reldir."core/modules/contract/");
- while (($file = readdir($handle))!==false)
- {
- if (substr($file, 0, 13) == 'mod_contract_' && substr($file, dol_strlen($file)-3, 3) == 'php')
- {
- $file = substr($file, 0, dol_strlen($file)-4);
+ if (is_dir($dir))
+ {
+ $handle = opendir($dir);
+ if (is_resource($handle))
+ {
+ $var=true;
- require_once DOL_DOCUMENT_ROOT ."/core/modules/contract/".$file.'.php';
+ while (($file = readdir($handle))!==false)
+ {
+ if (substr($file, 0, 13) == 'mod_contract_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+ {
+ $file = substr($file, 0, dol_strlen($file)-4);
- $module = new $file;
+ require_once $dir.$file.'.php';
- // Show modules according to features level
- if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
- if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+ $module = new $file($db);
- if ($module->isEnabled())
- {
- $var=!$var;
- print ''.$module->nom." \n";
- print '';
- print $module->info();
- print ' ';
+ // Show modules according to features level
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
- // Show example of numbering model
- print '';
- $tmp=$module->getExample();
- if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; }
- elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
- else print $tmp;
- print ' '."\n";
+ if ($module->isEnabled())
+ {
+ $var=!$var;
+ print ''.$module->nom." \n";
+ print $module->info();
+ print ' ';
- print '';
- if ($conf->global->CONTRACT_ADDON == "$file")
- {
- print img_picto($langs->trans("Activated"),'switch_on');
- }
- else
- {
- print 'scandir.'&label='.urlencode($module->name).'">';
- print img_picto($langs->trans("Disabled"),'switch_off');
- print ' ';
- }
- print ' ';
+ // Show example of numbering model
+ print '';
+ $tmp=$module->getExample();
+ if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print ''.$langs->trans($tmp).'
'; }
+ elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+ else print $tmp;
+ print ' '."\n";
- $contract=new Contrat($db);
- $contract->initAsSpecimen();
+ print '';
+ if ($conf->global->CONTRACT_ADDON == "$file")
+ {
+ print img_picto($langs->trans("Activated"),'switch_on');
+ }
+ else
+ {
+ print '';
+ print img_picto($langs->trans("Disabled"),'switch_off');
+ print ' ';
+ }
+ print ' ';
- // Info
- $htmltooltip='';
- $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().' ';
- print $form->textwithpicto('',$htmltooltip,1,0);
- print ' ';
+ // Info
+ $htmltooltip='';
+ $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().' ';
+ print $form->textwithpicto('',$htmltooltip,1,0);
+ print ' ';
+
+ print '';
+ }
+ }
+ }
+ closedir($handle);
+ }
+ }
}
print '';
- echo "$name";
- print " \n";
- require_once $dir.$file;
- $module = new $classname($db);
- print $module->description;
- print ' ';
+ if (file_exists($dir.'/'.$file))
+ {
+ $name = substr($file, 4, dol_strlen($file) -16);
+ $classname = substr($file, 0, dol_strlen($file) -12);
- // Active
- if (in_array($name, $def))
- {
- print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">';
- print img_picto($langs->trans("Enabled"),'switch_on');
- print ' ';
- print " ";
- }
- else
- {
- print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').' ';
- print " ";
- }
+ require_once $dir.'/'.$file;
+ $module = new $classname($db);
- // Default
- print "";
- if ($conf->global->CONTRACT_ADDON_PDF == "$name")
- {
- print img_picto($langs->trans("Default"),'on');
- }
- else
- {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').' ';
- }
- print ' ';
+ $modulequalified=1;
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
- // Info
- $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
- $htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
- $htmltooltip.='';
- print $form->textwithpicto('',$htmltooltip,-1,0);
- print ' ';
-
- // Preview
- $link=''.img_object($langs->trans("Preview"),'contract').' ';
- print '';
- print $link;
- print ' ';
+ if ($modulequalified)
+ {
+ $var = !$var;
+ print '';
+ print (empty($module->name)?$name:$module->name);
+ print " \n";
+ if (method_exists($module,'info')) print $module->info($langs);
+ else print $module->description;
+ print ' ';
- print ''."\n";
+ print '';
+ print img_picto($langs->trans("Enabled"),'switch_on');
+ print ' ';
+ print ' ';
+ }
+ else
+ {
+ print ''."\n";
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').' ';
+ print " ";
+ }
+
+ // Defaut
+ print '';
+ if ($conf->global->CONTRACT_ADDON_PDF == $name)
+ {
+ print img_picto($langs->trans("Default"),'on');
+ }
+ else
+ {
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').' ';
+ }
+ print ' ';
+
+ // Info
+ $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+ $htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
+ $htmltooltip.='';
+ print $form->textwithpicto('',$htmltooltip,1,0);
+ print ' ';
+
+ // Preview
+ print '';
+ if ($module->type == 'pdf')
+ {
+ print ''.img_object($langs->trans("Preview"),'contract').' ';
+ }
+ else
+ {
+ print img_object($langs->trans("PreviewNotAvailable"),'generic');
+ }
+ print ' ';
+
+ print "\n";
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
print '';
@@ -492,25 +512,8 @@ print '';
print ' \n";
-
-// print products on fichinter
-$var=! $var;
-print '';
-
print '';
print ''; // ui-btn to highlight on clic
print '';
print str_pad('',12,' ');
- if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access"); // No translation
- else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+ if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access"); // No translation
+ else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
print ' ';
print ' '."\n";
}
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 1df45d7e009..341aa4daefc 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -154,10 +154,10 @@ class ModelNumRefContracts
* @param int $hideref Hide ref
* @return int 0 if KO, 1 if OK
*/
-function contract_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function contract_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
{
- global $conf,$langs,$user;
- $langs->load("contract");
+ global $conf,$langs,$user,$hookmanager;
+ $langs->load("contracts");
$error=0;
@@ -223,6 +223,9 @@ function contract_create($db, $object, $modele, $outputlangs, $hidedetails=0, $h
// We delete old preview
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
dol_delete_preview($object);
+
+ // Success in building document. We build meta file.
+ dol_meta_create($object);
// Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 8a43ec9af92..1ec212fb07b 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -57,7 +57,7 @@ class modContrat extends DolibarrModules
$this->picto='contract';
// Data directories to create when module is enabled
- $this->dirs = array("/contracts/temp");
+ $this->dirs = array("/contract/temp");
// Dependances
$this->depends = array("modSociete","modService");
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index a2f4f2406fd..20556018b58 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -153,12 +153,12 @@ class InterfaceMailmanSpipsynchro
$return=1;
}
- return $return;
- }
- elseif ($action == 'CATEGORY_UNLINK')
- {
- dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
+ return $return;
+ }
+ elseif ($action == 'CATEGORY_UNLINK')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
if ($object->unlinkoff->del_to_abo() < 0)
{
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 3516404f8e7..ae1f56c0a67 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -90,6 +90,7 @@ ListOfServicesToExpireWithDuration=Liste des services actifs expirant dans %s jo
ListOfServicesToExpireWithDurationNeg=Liste des services actifs expiré depuis plus de %s jours
ListOfServicesToExpire=Liste des services actifs en expiration
NoteListOfYourExpiredServices=Cette list ne contient que les contrats de services des tiers pour lesquels vous êtes liés comme représentant commercial.
+DocumentModelStandard=Modèle de contrat standard
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat