diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 16f73042b66..5cc658702bc 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -156,10 +156,12 @@ if ($action == 'setdoc')
// On active le modele
$type='order';
+
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
$sql_del.= " WHERE nom = '".$db->escape($value)."'";
$sql_del.= " AND type = '".$type."'";
$sql_del.= " AND entity = ".$conf->entity;
+ dol_syslog("Delete from model table ".$sql_del);
$result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
@@ -167,13 +169,15 @@ if ($action == 'setdoc')
$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
$sql.= (! empty($scandir)?"'".$scandir."'":"null");
$sql.= ")";
- $result2=$db->query($sql);
+ dol_syslog("Insert into model table ".$sql);
+ $result2=$db->query($sql);
if ($result1 && $result2)
{
$db->commit();
}
else
{
+ dol_syslog("Error ".$db->lasterror(), LOG_ERR);
$db->rollback();
}
}
@@ -227,14 +231,13 @@ if ($action == 'set_COMMANDE_FREE_TEXT')
$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-llxHeader();
+llxHeader("",$langs->trans("OrdersSetup"));
$form=new Form($db);
$linkback=''.$langs->trans("BackToModuleList").'';
print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
-
-print "
";
+print '
';
@@ -246,12 +249,12 @@ print_titre($langs->trans("OrdersNumberingModules"));
print '
';
print '';
-print '| '.$langs->trans("Name").' | ';
+print ''.$langs->trans("Name").' | ';
print ''.$langs->trans("Description").' | ';
-print ''.$langs->trans("Example").' | ';
+print ''.$langs->trans("Example").' | ';
print ''.$langs->trans("Status").' | ';
print ''.$langs->trans("Infos").' | ';
-print "
\n";
+print ''."\n";
clearstatcache();
@@ -398,18 +401,18 @@ foreach ($dirmodels as $reldir)
$handle=opendir($dir);
if (is_resource($handle))
{
-
while (($file = readdir($handle))!==false)
{
$filelist[]=$file;
}
closedir($handle);
arsort($filelist);
-
+
foreach($filelist as $file)
{
if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
{
+
if (file_exists($dir.'/'.$file))
{
$name = substr($file, 4, dol_strlen($file) -16);
@@ -436,7 +439,7 @@ foreach ($dirmodels as $reldir)
if (in_array($name, $def))
{
print ''."\n";
- print '';
+ print '';
print img_picto($langs->trans("Enabled"),'switch_on');
print '';
print ' | ';
@@ -444,7 +447,7 @@ foreach ($dirmodels as $reldir)
else
{
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'';
print " | ";
}
@@ -456,7 +459,7 @@ foreach ($dirmodels as $reldir)
}
else
{
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'';
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'';
}
print '';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 46c793e0d72..3dbcbda8133 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -315,7 +315,7 @@ print '';
print '';
print '| '.$langs->trans("Name").' | ';
print ''.$langs->trans("Description").' | ';
-print ''.$langs->trans("Example").' | ';
+print ''.$langs->trans("Example").' | ';
print ''.$langs->trans("Status").' | ';
print ''.$langs->trans("Infos").' | ';
print '
'."\n";