diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 487af51d06f..87d17e1ad6c 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -49,172 +49,172 @@ $dir = DOL_DOCUMENT_ROOT."/includes/modules/facture/";
if ($_POST["action"] == 'updateMask')
{
- $maskconstinvoice=$_POST['maskconstinvoice'];
- $maskconstcredit=$_POST['maskconstcredit'];
- $maskinvoice=$_POST['maskinvoice'];
- $maskcredit=$_POST['maskcredit'];
- if ($maskconstinvoice) dolibarr_set_const($db,$maskconstinvoice,$maskinvoice,'chaine',0,'',$conf->entity);
- if ($maskconstcredit) dolibarr_set_const($db,$maskconstcredit,$maskcredit,'chaine',0,'',$conf->entity);
+ $maskconstinvoice=$_POST['maskconstinvoice'];
+ $maskconstcredit=$_POST['maskconstcredit'];
+ $maskinvoice=$_POST['maskinvoice'];
+ $maskcredit=$_POST['maskcredit'];
+ if ($maskconstinvoice) dolibarr_set_const($db,$maskconstinvoice,$maskinvoice,'chaine',0,'',$conf->entity);
+ if ($maskconstcredit) dolibarr_set_const($db,$maskconstcredit,$maskcredit,'chaine',0,'',$conf->entity);
}
if ($_GET["action"] == 'specimen')
{
- $modele=$_GET["module"];
+ $modele=$_GET["module"];
- $facture = new Facture($db);
- $facture->initAsSpecimen();
+ $facture = new Facture($db);
+ $facture->initAsSpecimen();
- // Load template
- $dir = DOL_DOCUMENT_ROOT . "/includes/modules/facture/doc/";
- $file = "pdf_".$modele.".modules.php";
- if (file_exists($dir.$file))
- {
- $classname = "pdf_".$modele;
- require_once($dir.$file);
+ // Load template
+ $dir = DOL_DOCUMENT_ROOT . "/includes/modules/facture/doc/";
+ $file = "pdf_".$modele.".modules.php";
+ if (file_exists($dir.$file))
+ {
+ $classname = "pdf_".$modele;
+ require_once($dir.$file);
- $obj = new $classname($db);
+ $obj = new $classname($db);
- if ($obj->write_file($facture,$langs) > 0)
- {
- header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture&file=SPECIMEN.pdf");
- return;
- }
- else
- {
- $mesg='
'.$obj->error.'
';
- dol_syslog($obj->error, LOG_ERR);
- }
- }
- else
- {
- $mesg=''.$langs->trans("ErrorModuleNotFound").'
';
- dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
- }
+ if ($obj->write_file($facture,$langs) > 0)
+ {
+ header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture&file=SPECIMEN.pdf");
+ return;
+ }
+ else
+ {
+ $mesg=''.$obj->error.'
';
+ dol_syslog($obj->error, LOG_ERR);
+ }
+ }
+ else
+ {
+ $mesg=''.$langs->trans("ErrorModuleNotFound").'
';
+ dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+ }
}
// define constants for models generator that need parameters
if ($_POST["action"] == 'setModuleOptions')
{
- $post_size=count($_POST);
- for($i=0;$i < $post_size;$i++)
+ $post_size=count($_POST);
+ for($i=0;$i < $post_size;$i++)
{
- if (array_key_exists('param'.$i,$_POST))
- {
- $param=$_POST["param".$i];
- $value=$_POST["value".$i];
- if ($param) dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
- }
+ if (array_key_exists('param'.$i,$_POST))
+ {
+ $param=$_POST["param".$i];
+ $value=$_POST["value".$i];
+ if ($param) dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+ }
}
}
if ($_GET["action"] == 'set')
{
- $type='invoice';
+ $type='invoice';
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
$sql.= " VALUES ('".$db->escape($_GET["value"])."','".$type."',".$conf->entity.", ";
$sql.= ($_GET["label"]?"'".$db->escape($_GET["label"])."'":'null').", ";
$sql.= (! empty($_GET["scandir"])?"'".$db->escape($_GET["scandir"])."'":"null");
$sql.= ")";
- if ($db->query($sql))
- {
+ if ($db->query($sql))
+ {
- }
+ }
}
if ($_GET["action"] == 'del')
{
- $type='invoice';
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
- $sql.= " WHERE nom = '".$_GET["value"]."'";
- $sql.= " AND type = '".$type."'";
- $sql.= " AND entity = ".$conf->entity;
+ $type='invoice';
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql.= " WHERE nom = '".$_GET["value"]."'";
+ $sql.= " AND type = '".$type."'";
+ $sql.= " AND entity = ".$conf->entity;
- if ($db->query($sql))
- {
+ if ($db->query($sql))
+ {
- }
+ }
}
if ($_GET["action"] == 'setdoc')
{
- $db->begin();
+ $db->begin();
- if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
- {
- $conf->global->FACTURE_ADDON_PDF = $_GET["value"];
- }
+ if (dolibarr_set_const($db, "FACTURE_ADDON_PDF",$_GET["value"],'chaine',0,'',$conf->entity))
+ {
+ $conf->global->FACTURE_ADDON_PDF = $_GET["value"];
+ }
- // On active le modele
- $type='invoice';
+ // On active le modele
+ $type='invoice';
- $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
- $sql_del.= " WHERE nom = '".$db->escape($_GET["value"])."'";
- $sql_del.= " AND type = '".$type."'";
- $sql_del.= " AND entity = ".$conf->entity;
+ $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
+ $sql_del.= " WHERE nom = '".$db->escape($_GET["value"])."'";
+ $sql_del.= " AND type = '".$type."'";
+ $sql_del.= " AND entity = ".$conf->entity;
dol_syslog("facture.php ".$sql_del);
- $result1=$db->query($sql_del);
+ $result1=$db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
$sql.= " VALUES ('".$_GET["value"]."', '".$type."', ".$conf->entity.", ";
$sql.= ($_GET["label"]?"'".$db->escape($_GET["label"])."'":'null').", ";
$sql.= (! empty($_GET["scandir"])?"'".$_GET["scandir"]."'":"null");
$sql.= ")";
- dol_syslog("facture.php ".$sql);
- $result2=$db->query($sql);
- if ($result1 && $result2)
- {
- $db->commit();
- }
- else
- {
- dol_syslog("facture.php ".$db->lasterror(), LOG_ERR);
- $db->rollback();
- }
+ dol_syslog("facture.php ".$sql);
+ $result2=$db->query($sql);
+ if ($result1 && $result2)
+ {
+ $db->commit();
+ }
+ else
+ {
+ dol_syslog("facture.php ".$db->lasterror(), LOG_ERR);
+ $db->rollback();
+ }
}
if ($_GET["action"] == 'setmod')
{
- // TODO Verifier si module numerotation choisi peut etre active
- // par appel methode canBeActivated
+ // TODO Verifier si module numerotation choisi peut etre active
+ // par appel methode canBeActivated
- dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"],'chaine',0,'',$conf->entity);
}
if ($_POST["action"] == 'setribchq')
{
- dolibarr_set_const($db, "FACTURE_RIB_NUMBER",$_POST["rib"],'chaine',0,'',$conf->entity);
- dolibarr_set_const($db, "FACTURE_CHQ_NUMBER",$_POST["chq"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "FACTURE_RIB_NUMBER",$_POST["rib"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "FACTURE_CHQ_NUMBER",$_POST["chq"],'chaine',0,'',$conf->entity);
}
if ($_POST["action"] == 'set_FACTURE_DRAFT_WATERMARK')
{
- dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK",trim($_POST["FACTURE_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK",trim($_POST["FACTURE_DRAFT_WATERMARK"]),'chaine',0,'',$conf->entity);
}
if ($_POST["action"] == 'set_FACTURE_FREE_TEXT')
{
- dolibarr_set_const($db, "FACTURE_FREE_TEXT",$_POST["FACTURE_FREE_TEXT"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "FACTURE_FREE_TEXT",$_POST["FACTURE_FREE_TEXT"],'chaine',0,'',$conf->entity);
}
if ($_POST["action"] == 'setforcedate')
{
- dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION",$_POST["forcedate"],'chaine',0,'',$conf->entity);
+ dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION",$_POST["forcedate"],'chaine',0,'',$conf->entity);
}
if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
{
- if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity));
- {
- dol_print_error($db);
- }
+ if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity));
+ {
+ dol_print_error($db);
+ }
}
if ($_GET["action"] == 'delete')
{
- if (! dolibarr_del_const($db, $_GET["rowid"],$conf->entity));
- {
- dol_print_error($db);
- }
+ if (! dolibarr_del_const($db, $_GET["rowid"],$conf->entity));
+ {
+ dol_print_error($db);
+ }
}
@@ -261,113 +261,118 @@ clearstatcache();
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
{
- $dir = $dirroot . "/includes/modules/facture/";
+ $dir = $dirroot . "/includes/modules/facture/";
- if (is_dir($dir))
- {
- $handle = opendir($dir);
- if (is_resource($handle))
- {
- while (($file = readdir($handle))!==false)
- {
- if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
- {
- $filebis = $file;
- $classname = preg_replace('/\.php$/','',$file);
- // For compatibility
- if (! is_file($dir.$filebis))
- {
- $filebis = $file."/".$file.".modules.php";
- $classname = "mod_facture_".$file;
- }
- //print "x".$dir."-".$filebis."-".$classname;
- if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php')
- {
- // Chargement de la classe de numerotation
- require_once($dir.$filebis);
+ if (is_dir($dir))
+ {
+ $handle = opendir($dir);
+ if (is_resource($handle))
+ {
+ while (($file = readdir($handle))!==false)
+ {
+ if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
+ {
+ $filebis = $file;
+ $classname = preg_replace('/\.php$/','',$file);
+ // For compatibility
+ if (! is_file($dir.$filebis))
+ {
+ $filebis = $file."/".$file.".modules.php";
+ $classname = "mod_facture_".$file;
+ }
+ //print "x".$dir."-".$filebis."-".$classname;
+ if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php')
+ {
+ // Chargement de la classe de numerotation
+ require_once($dir.$filebis);
- $module = new $classname($db);
+ $module = new $classname($db);
- // 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 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;
- if ($module->isEnabled())
- {
- $var = !$var;
- print '| ';
- echo preg_replace('/mod_facture_/','',preg_replace('/\.php$/','',$file));
- print " | \n";
+ if ($module->isEnabled())
+ {
+ $var = !$var;
+ print ' |
| ';
+ echo preg_replace('/mod_facture_/','',preg_replace('/\.php$/','',$file));
+ print " | \n";
- print $module->info();
+ print $module->info();
- print ' | ';
+ print '';
- // Affiche example
- print ''.$module->getExample().' | ';
+ // Affiche example
+ print ''.$module->getExample().' | ';
- print '';
- //print "> ".$conf->global->FACTURE_ADDON." - ".$file;
- if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file)
- {
- print img_picto($langs->trans("Activated"),'on');
- }
- else
- {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'';
- }
- print ' | ';
+ print '';
+ //print "> ".$conf->global->FACTURE_ADDON." - ".$file;
+ if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file)
+ {
+ print img_picto($langs->trans("Activated"),'on');
+ }
+ else
+ {
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'';
+ }
+ print ' | ';
- $facture=new Facture($db);
- $facture->initAsSpecimen();
+ $facture=new Facture($db);
+ $facture->initAsSpecimen();
- // Example for standard invoice
- $htmltooltip='';
- $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
- $facture->type=0;
- $nextval=$module->getNextValue($mysoc,$facture);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=$langs->trans("NextValueForInvoices").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval.'
';
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error).'
';
- }
- }
- // Example for credit invoice
- $facture->type=2;
- $nextval=$module->getNextValue($mysoc,$facture);
- if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
- {
- $htmltooltip.=$langs->trans("NextValueForCreditNotes").': ';
- if ($nextval)
- {
- $htmltooltip.=$nextval;
- }
- else
- {
- $htmltooltip.=$langs->trans($module->error);
- }
- }
+ // Example for standard invoice
+ $htmltooltip='';
+ $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
';
+ $facture->type=0;
+ $nextval=$module->getNextValue($mysoc,$facture);
+ if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
+ {
+ $htmltooltip.=$langs->trans("NextValueForInvoices").': ';
+ if ($nextval)
+ {
+ $htmltooltip.=$nextval.'
';
+ }
+ else
+ {
+ $htmltooltip.=$langs->trans($module->error).'
';
+ }
+ }
+ // Example for credit invoice
+ $facture->type=2;
+ $nextval=$module->getNextValue($mysoc,$facture);
+ if ("$nextval" != $langs->trans("NotAvailable")) // Keep " on nextval
+ {
+ $htmltooltip.=$langs->trans("NextValueForCreditNotes").': ';
+ if ($nextval)
+ {
+ $htmltooltip.=$nextval;
+ }
+ else
+ {
+ $htmltooltip.=$langs->trans($module->error);
+ }
+ }
- print '';
- print $html->textwithpicto('',$htmltooltip,1,0);
- print ' | ';
+ print '';
+ print $html->textwithpicto('',$htmltooltip,1,0);
- print " |
\n";
-
- if (! empty($module->error)) dol_htmloutput_errors($module->error,'');
- }
- }
- }
- }
- closedir($handle);
- }
- }
+ if ($conf->global->FACTURE_ADDON.'.php' == $file) // If module is the one used, we show existing errors
+ {
+ if (! empty($module->error)) dol_htmloutput_errors($module->error,'');
+ }
+
+ print '';
+
+ print "\n";
+
+ }
+ }
+ }
+ }
+ closedir($handle);
+ }
+ }
}
print '';
@@ -388,18 +393,18 @@ $sql.= " AND entity = ".$conf->entity;
$resql=$db->query($sql);
if ($resql)
{
- $i = 0;
- $num_rows=$db->num_rows($resql);
- while ($i < $num_rows)
- {
- $array = $db->fetch_array($resql);
- array_push($def, $array[0]);
- $i++;
- }
+ $i = 0;
+ $num_rows=$db->num_rows($resql);
+ while ($i < $num_rows)
+ {
+ $array = $db->fetch_array($resql);
+ array_push($def, $array[0]);
+ $i++;
+ }
}
else
{
- dol_print_error($db);
+ dol_print_error($db);
}
print '';
@@ -417,115 +422,115 @@ clearstatcache();
$var=true;
foreach ($conf->file->dol_document_root as $dirroot)
{
- foreach (array('','/doc') as $valdir)
- {
- $dir = $dirroot . "/includes/modules/facture".$valdir;
+ foreach (array('','/doc') as $valdir)
+ {
+ $dir = $dirroot . "/includes/modules/facture".$valdir;
- if (is_dir($dir))
- {
- $handle=opendir($dir);
- if (is_resource($handle))
- {
- while (($file = readdir($handle))!==false)
- {
- if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
- {
- $name = substr($file, 4, dol_strlen($file) -16);
- $classname = substr($file, 0, dol_strlen($file) -12);
+ if (is_dir($dir))
+ {
+ $handle=opendir($dir);
+ if (is_resource($handle))
+ {
+ while (($file = readdir($handle))!==false)
+ {
+ if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+ {
+ $name = substr($file, 4, dol_strlen($file) -16);
+ $classname = substr($file, 0, dol_strlen($file) -12);
- require_once($dir.'/'.$file);
- $module = new $classname($db);
+ require_once($dir.'/'.$file);
+ $module = new $classname($db);
- $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;
+ $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;
- 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 ' | ';
+ 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 ' | ';
- // Active
- if (in_array($name, $def))
- {
- print "\n";
- if ($conf->global->FACTURE_ADDON_PDF != "$name")
- {
- print '';
- print img_picto($langs->trans("Enabled"),'on');
- print '';
- }
- else
- {
- print img_picto($langs->trans("Enabled"),'on');
- }
- print " | ";
- }
- else
- {
- print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'';
- print " | ";
- }
+ // Active
+ if (in_array($name, $def))
+ {
+ print "\n";
+ if ($conf->global->FACTURE_ADDON_PDF != "$name")
+ {
+ print '';
+ print img_picto($langs->trans("Enabled"),'on');
+ print '';
+ }
+ else
+ {
+ print img_picto($langs->trans("Enabled"),'on');
+ }
+ print " | ";
+ }
+ else
+ {
+ print "\n";
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'off').'';
+ print " | ";
+ }
- // Defaut
- print "";
- if ($conf->global->FACTURE_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 ' | ';
+ // Defaut
+ print "";
+ if ($conf->global->FACTURE_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("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
- if ($module->type == 'pdf')
- {
- $htmltooltip.='
'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
- }
- $htmltooltip.='
'.$langs->trans("FeaturesSupported").':';
- $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
- $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
- $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
- $htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1);
- $htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
- $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
- $htmltooltip.='
'.$langs->trans("WatermarkOnDraftInvoices").': '.yn($module->option_draft_watermark,1,1);
+ // Info
+ $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+ $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+ if ($module->type == 'pdf')
+ {
+ $htmltooltip.='
'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
+ }
+ $htmltooltip.='
'.$langs->trans("FeaturesSupported").':';
+ $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+ $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+ $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+ $htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1);
+ $htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
+ $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+ $htmltooltip.='
'.$langs->trans("WatermarkOnDraftInvoices").': '.yn($module->option_draft_watermark,1,1);
- print '';
- print $html->textwithpicto('',$htmltooltip,1,0);
- print ' | ';
+ print '';
+ print $html->textwithpicto('',$htmltooltip,1,0);
+ print ' | ';
- // Preview
- print '';
- if ($module->type == 'pdf')
- {
- print ''.img_object($langs->trans("Preview"),'bill').'';
- }
- else
- {
- print img_object($langs->trans("PreviewNotAvailable"),'generic');
- }
- print ' | ';
+ // Preview
+ print '';
+ if ($module->type == 'pdf')
+ {
+ print ''.img_object($langs->trans("Preview"),'bill').'';
+ }
+ else
+ {
+ print img_object($langs->trans("PreviewNotAvailable"),'generic');
+ }
+ print ' | ';
- print "
\n";
- }
- }
- }
- closedir($handle);
- }
- }
- }
+ print "\n";
+ }
+ }
+ }
+ closedir($handle);
+ }
+ }
+ }
}
print '
';
@@ -555,38 +560,38 @@ print "".$langs->trans("SuggestPaymentByRIBOnAccount")." | ";
print "";
if ($conf->banque->enabled)
{
- $sql = "SELECT rowid, label";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
- $sql.= " WHERE clos = 0";
- $sql.= " AND courant = 1";
- $sql.= " AND entity = ".$conf->entity;
- $resql=$db->query($sql);
- if ($resql)
- {
- $num = $db->num_rows($resql);
- $i = 0;
- if ($num > 0) {
- print "";
+ } else {
+ print "".$langs->trans("NoActiveBankAccountDefined")."";
+ }
+ }
}
else
{
- print $langs->trans("BankModuleNotActive");
+ print $langs->trans("BankModuleNotActive");
}
print " | ";
$var=!$var;
@@ -606,19 +611,19 @@ $var=True;
$resql=$db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
- while ($i < $num)
- {
- $var=!$var;
- $row = $db->fetch_row($resql);
+ $num = $db->num_rows($resql);
+ $i = 0;
+ while ($i < $num)
+ {
+ $var=!$var;
+ $row = $db->fetch_row($resql);
- print '';
+ print '';
- $i++;
- }
+ $i++;
+ }
}
print "";
print "";