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

Merge branch 'develop' into doxygen_todo

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-14 13:46:40 +01:00 committed by GitHub
commit 835d22f556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
146 changed files with 499 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -145,6 +145,7 @@ NEW: #4301
For Developers or integrators:
NEW: Add a manifest.json.php file for web app.
NEW: Support of deployement of metapackages
NEW: Removed deprecated code that create linked object from ->origin
NEW: experimental zapier for dolibarr
NEW: Accountancy - Add hook bookkeepinglist on general ledger

2
build/README
View File

@ -36,7 +36,7 @@ Note: Prerequisites to build autoexe DoliWamp package:
> perl makepack-dolibarrmodule.pl
- To build developper documentation, launch the script
> perl dolybarr-doxygen-build.pl
> perl dolibarr-doxygen-build.pl
Note:

2
build/doxygen/dolibarr-doxygen-build.pl
View File

@ -36,7 +36,7 @@ $SOURCE="../..";
$result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
while (<IN>) {
if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
if ( $_ =~ /define\('DOL_VERSION', '([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
}
close IN;
($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);

2
htdocs/accountancy/bookkeeping/list.php
View File

@ -974,7 +974,7 @@ while ($i < min($num, $limit))
// Exported operation date
if (! empty($arrayfields['t.date_export']['checked']))
{
print '<td align="center">' . dol_print_date($line->date_export, 'dayhour') . '</td>';
print '<td class="center">' . dol_print_date($line->date_export, 'dayhour') . '</td>';
if (! $i) $totalarray['nbfield']++;
}

2
htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
View File

@ -116,7 +116,7 @@ echo $this->control->tpl['ajax_selectcountry']; ?>
<tr>
<td class="tdtop"><?php echo $langs->trans("Note"); ?></td>
<td colspan="3" valign="top"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
<td colspan="3" class="tdtop"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
</tr>
<tr>

2
htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
View File

@ -125,7 +125,7 @@ echo $this->control->tpl['ajax_selectcountry'];
<tr>
<td class="tdtop"><?php echo $langs->trans("Note"); ?></td>
<td colspan="3" valign="top"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
<td colspan="3" class="tdtop"><textarea name="note" cols="70" rows="<?php echo ROWS_3; ?>"><?php echo $this->control->tpl['note']; ?></textarea></td>
</tr>
<tr>

1
htdocs/adherents/index.php
View File

@ -124,7 +124,6 @@ if ($result)
}
//print '<tr><td width="30%" class="notopnoleft" valign="top">';
print '<div class="fichecenter"><div class="fichethirdleft">';

4
htdocs/admin/bank.php
View File

@ -442,7 +442,7 @@ print $langs->trans('BankColorizeMovementDesc');
print "</td>";
// Active
if ($conf->global->BANK_COLORIZE_MOVEMENT) {
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetbankcolorizemovement">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -450,7 +450,7 @@ if ($conf->global->BANK_COLORIZE_MOVEMENT) {
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}

14
htdocs/admin/fichinter.php
View File

@ -320,7 +320,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->FICHEINTER_ADDON == $classname)
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -348,7 +348,7 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= $langs->trans($module->error).'<br>';
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -486,12 +486,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, -1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
@ -587,7 +587,7 @@ print '<tr class="oddeven">';
print '<td>';
print $langs->trans("UseServicesDurationOnFichinter");
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<input type="checkbox" name="FICHINTER_USE_SERVICE_DURATION"'.($conf->global->FICHINTER_USE_SERVICE_DURATION ? ' checked' : '').'>';
print '</td>';
print '<td class="right">';
@ -603,7 +603,7 @@ print '<tr class="oddeven">';
print '<td>';
print $langs->trans("UseDurationOnFichinter");
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<input type="checkbox" name="FICHINTER_WITHOUT_DURATION"'.($conf->global->FICHINTER_WITHOUT_DURATION ? ' checked' : '').'>';
print '</td>';
print '<td class="right">';
@ -619,7 +619,7 @@ print '<tr class="oddeven">';
print '<td>';
print $langs->trans("UseDateWithoutHourOnFichinter");
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<input type="checkbox" name="FICHINTER_DATE_WITHOUT_HOUR"'.($conf->global->FICHINTER_DATE_WITHOUT_HOUR ? ' checked' : '').'>';
print '</td>';
print '<td class="right">';

14
htdocs/admin/holiday.php
View File

@ -250,7 +250,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->HOLIDAY_ADDON == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -281,7 +281,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -397,7 +397,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -405,13 +405,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->HOLIDAY_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"), 'on');
@ -437,12 +437,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';

8
htdocs/admin/livraison.php
View File

@ -245,7 +245,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -408,12 +408,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';

6
htdocs/admin/mails_templates.php
View File

@ -571,7 +571,7 @@ foreach ($fieldsforcontent as $tmpfieldlist)
}
print '</td>';
if ($tmpfieldlist == 'topic') {
print '<td align="center" rowspan="' . (count($fieldsforcontent)) . '">';
print '<td class="center" rowspan="' . (count($fieldsforcontent)) . '">';
if ($action != 'edit') {
print '<input type="submit" class="button" name="actionadd" value="' . $langs->trans("Add") . '">';
}
@ -730,7 +730,7 @@ if ($resql)
if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
print '<td></td><td></td><td></td>';
print '<td align="center">';
print '<td class="center">';
print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="rowid" value="'.$rowid.'">';
print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
@ -874,7 +874,7 @@ if ($resql)
$url.='&';
// Status / Active
print '<td align="center" class="nowrap">';
print '<td class="center nowrap">';
if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
else print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
print "</td>";

44
htdocs/admin/modules.php
View File

@ -198,20 +198,36 @@ if ($action=='install')
// TODO Make more test
}
// Now we install the module
if (! $error)
{
//var_dump($dirins);
@dol_delete_dir_recursive($dirins.'/'.$modulename); // delete the zip file
dol_syslog("Uncompress of module file is a success. We copy it from ".$modulenamedir." into target dir ".$dirins.'/'.$modulename);
$result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);
if ($result <= 0)
{
dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulename, LOG_WARNING);
$langs->load("errors");
setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulename), null, 'errors');
$error++;
}
dol_syslog("Uncompress of module file is a success.");
$modulenamearrays = array();
if (dol_is_file($modulenamedir.'/metapackage.conf')) {
// This is a meta package
$metafile = file_get_contents($modulenamedir.'/metapackage.conf');
$modulenamearrays = explode("\n", $metafile);
}
$modulenamearrays[$modulename] = $modulename;
foreach($modulenamearrays as $modulenameval) {
if (strpos($modulenameval, '#') === 0) continue; // Discard comments
if (strpos($modulenameval, '//') === 0) continue; // Discard comments
if (! trim($modulenameval)) continue;
// Now we install the module
if (! $error)
{
//var_dump($dirins);
@dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the zip file
dol_syslog("We copy now directory ".$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval." into target dir ".$dirins.'/'.$modulenameval);
$result=dolCopyDir($conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval, $dirins.'/'.$modulenameval, '0444', 1);
if ($result <= 0)
{
dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING);
$langs->load("errors");
setEventMessages($langs->trans("ErrorFailToCopyDir", $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval, $dirins.'/'.$modulenameval), null, 'errors');
$error++;
}
}
}
}
}

10
htdocs/admin/multicurrency.php
View File

@ -189,12 +189,12 @@ dol_fiche_head($head, 'settings', $langs->trans("ModuleSetup"), -1, "multicurren
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameters").'</td>'."\n";
print '<td align="center">'.$langs->trans("Status").'</td>'."\n";
print '<td class="center">'.$langs->trans("Status").'</td>'."\n";
print '</tr>';
print '<tr class="oddeven">';
print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE").'</td>';
print '<td align="center">';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE');
} else {
@ -206,7 +206,7 @@ print '</td></tr>';
print '<tr class="oddeven">';
print '<td>'.$langs->transnoentitiesnoconv("multicurrency_useOriginTx").'</td>';
print '<td align="center">';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('MULTICURRENCY_USE_ORIGIN_TX');
} else {
@ -220,7 +220,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
{
print '<tr class="oddeven">';
print '<td>'.$langs->transnoentitiesnoconv("MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT").'</td>';
print '<td align="center">';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT');
} else {
@ -313,7 +313,7 @@ print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$form->textwithpicto($langs->trans("CurrenciesUsed"), $langs->transnoentitiesnoconv("CurrenciesUsed_help_to_add")).'</td>'."\n";
print '<td align="center">'.$langs->trans("Rate").'</td>'."\n";
print '<td class="center">'.$langs->trans("Rate").'</td>'."\n";
print '</tr>';
print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';

4
htdocs/admin/payment.php
View File

@ -175,7 +175,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
//print "> ".$conf->global->PAYMENT_ADDON." - ".$file;
if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file)
{
@ -205,7 +205,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
if ($conf->global->PAYMENT_ADDON.'.php' == $file) // If module is the one used, we show existing errors

4
htdocs/admin/perms.php
View File

@ -178,7 +178,7 @@ if ($result)
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
print '<td>'.$langs->trans("Permission").'</td>';
print '<td align="center">'.$langs->trans("Default").'</td>';
print '<td class="center">'.$langs->trans("Default").'</td>';
print '<td align="center">&nbsp;</td>';
print "</tr>\n";
}
@ -193,7 +193,7 @@ if ($result)
$perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
print '<td>'.$perm_libelle. '</td>';
print '<td align="center">';
print '<td class="center">';
if ($obj->bydefault == 1)
{
print img_picto($langs->trans("Active"), 'tick');

10
htdocs/admin/prelevement.php
View File

@ -355,7 +355,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
print img_picto($langs->trans("Enabled"),'switch_on');
print '</a>';
@ -363,13 +363,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->PAYMENTORDER_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"),'on');
@ -397,12 +397,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';

10
htdocs/admin/propal.php
View File

@ -306,7 +306,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->PROPALE_ADDON == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -338,7 +338,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -442,7 +442,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -484,12 +484,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';

14
htdocs/admin/reception_setup.php
View File

@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->RECEPTION_ADDON_NUMBER == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -290,7 +290,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -395,7 +395,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -403,13 +403,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Defaut
print '<td align="center">';
print '<td class="center">';
if ($conf->global->RECEPTION_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"), 'on');
@ -434,12 +434,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';

6
htdocs/admin/security.php
View File

@ -246,7 +246,7 @@ print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("RuleForGeneratedPasswords").'</td>';
print '<td>'.$langs->trans("Example").'</td>';
print '<td align="center">'.$langs->trans("Activated").'</td>';
print '<td class="center">'.$langs->trans("Activated").'</td>';
print '</tr>';
foreach ($arrayhandler as $key => $module)
@ -406,8 +406,8 @@ print "<input type=\"hidden\" name=\"action\" value=\"encrypt\">";
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("Parameters").'</td>';
print '<td align="center">'.$langs->trans("Activated").'</td>';
print '<td align="center">'.$langs->trans("Action").'</td>';
print '<td class="center">'.$langs->trans("Activated").'</td>';
print '<td class="center">'.$langs->trans("Action").'</td>';
print '</tr>';
// Disable clear password in database

4
htdocs/admin/stock.php
View File

@ -473,7 +473,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
// Example with a yes / no select
/*print '<tr class="oddeven">';
print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
print '<td align="center">';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL');
} else {
@ -486,7 +486,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
// Example with a yes / no select
/*print '<tr class="oddeven">';
print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
print '<td align="center">';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA');
} else {

14
htdocs/admin/supplier_invoice.php
View File

@ -268,7 +268,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -297,7 +297,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -395,7 +395,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
//if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
//{
// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
@ -411,13 +411,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=invoice_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name")
{
//print img_picto($langs->trans("Default"),'on');
@ -438,10 +438,10 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
print '</td>';

14
htdocs/admin/supplier_order.php
View File

@ -298,7 +298,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -327,7 +327,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -420,7 +420,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF != "$name")
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">';
@ -435,13 +435,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=order_supplier">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->COMMANDE_SUPPLIER_ADDON_PDF == "$name")
{
print img_picto($langs->trans("Default"), 'on');
@ -460,10 +460,10 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
$htmltooltip .= '<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
$htmltooltip .= '<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
print '</td>';

14
htdocs/admin/supplier_payment.php
View File

@ -259,7 +259,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
//print "> ".$conf->global->SUPPLIER_PAYMENT_ADDON." - ".$file;
if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file)
{
@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
if ($conf->global->PAYMENT_ADDON.'.php' == $file) // If module is the one used, we show existing errors
@ -366,7 +366,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
//if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
//{
// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
@ -382,13 +382,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name")
{
//print img_picto($langs->trans("Default"),'on');
@ -407,10 +407,10 @@ foreach ($dirmodels as $reldir)
$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
print '</td>';

10
htdocs/admin/supplier_proposal.php
View File

@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir)
else print $tmp;
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
{
print img_picto($langs->trans("Activated"), 'switch_on');
@ -305,7 +305,7 @@ foreach ($dirmodels as $reldir)
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -408,7 +408,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -450,12 +450,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';

24
htdocs/admin/ticket.php
View File

@ -250,7 +250,7 @@ foreach ($dirmodels as $reldir) {
print '</td>'."\n";
print '<td align="center">';
print '<td class="center">';
if ($conf->global->TICKET_ADDON == 'mod_'.$classname) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) {
}
}
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
@ -315,7 +315,7 @@ if ($conf->use_javascript_ajax) {
print $form->selectarray("TICKET_DISABLE_ALL_MAILS", $arrval, $conf->global->TICKET_DISABLE_ALL_MAILS);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -330,7 +330,7 @@ if ($conf->use_javascript_ajax) {
print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -348,7 +348,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -365,7 +365,7 @@ if ($conf->use_javascript_ajax) {
print $form->selectarray("TICKET_LIMIT_VIEW_ASSIGNED_ONLY", $arrval, $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsLimitViewAssignedOnlyHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -386,7 +386,7 @@ if ($conf->use_javascript_ajax) {
print $form->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsAutoAssignTicketHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -426,7 +426,7 @@ if ($conf->use_javascript_ajax) {
print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -438,7 +438,7 @@ print '</tr>';
print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationTo").'</td>';
print '<td class="left">';
print '<input type="text" name="TICKET_NOTIFICATION_EMAIL_TO" value="'.(!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? $conf->global->TICKET_NOTIFICATION_EMAIL_TO : $conf->global->TICKET_NOTIFICATION_EMAIL_FROM).'" size="20" ></td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -447,7 +447,7 @@ print '</tr>';
print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationFrom").'</td>';
print '<td class="left">';
print '<input type="text" name="TICKET_NOTIFICATION_EMAIL_FROM" value="'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'" size="20" ></td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -460,7 +460,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
$doleditor->Create();
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelpAdmin"), 1, 'help');
print '</td></tr>';
@ -472,7 +472,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
$doleditor->Create();
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelpAdmin"), 1, 'help');
print '</td></tr>';

20
htdocs/admin/ticket_public.php
View File

@ -218,7 +218,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsEmailMustExistHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -235,7 +235,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print $form->selectarray("TICKET_SHOW_MODULE_LOGO", $arrval, $conf->global->TICKET_SHOW_MODULE_LOGO);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsShowModuleLogoHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -251,7 +251,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsShowCompanyLogoHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -268,7 +268,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -310,7 +310,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print '</td><td>';
print '<input type="text" name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$conf->global->TICKET_PUBLIC_INTERFACE_TOPIC.'" size="40" ></td>';
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
print '</td></tr>';
@ -322,7 +322,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
$doleditor->Create();
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help');
print '</td></tr>';
@ -334,7 +334,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
$doleditor->Create();
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help');
print '</td></tr>';
@ -348,7 +348,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
print '</td>';
print '</tr>';
@ -361,7 +361,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
$doleditor->Create();
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
print '</td></tr>';
@ -371,7 +371,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
print '</td><td>';
print '<input type="text" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$conf->global->TICKET_URL_PUBLIC_INTERFACE.'" size="40" ></td>';
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
print '</td></tr>';

6
htdocs/admin/translation.php
View File

@ -302,11 +302,11 @@ if ($mode == 'overwrite')
print '<td>';
print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
print '</td>';
print '<td align="center">';
print '<td class="center">';
}
else
{*/
print '<td align="center">';
print '<td class="center">';
print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
//}
print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
@ -356,7 +356,7 @@ if ($mode == 'overwrite')
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
{
print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';

10
htdocs/admin/user.php
View File

@ -263,7 +263,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -271,13 +271,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Defaut
print '<td align="center">';
print '<td class="center">';
if ($conf->global->USER_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"), 'on');
@ -303,12 +303,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';

10
htdocs/admin/usergroup.php
View File

@ -210,7 +210,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
@ -218,13 +218,13 @@ foreach ($dirmodels as $reldir)
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Defaut
print '<td align="center">';
print '<td class="center">';
if ($conf->global->USERGROUP_ADDON_PDF == $name)
{
print img_picto($langs->trans("Default"), 'on');
@ -250,12 +250,12 @@ foreach ($dirmodels as $reldir)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';

2
htdocs/admin/website.php
View File

@ -625,7 +625,7 @@ if ($id)
// Delete link
if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete">'.img_delete().'</a></td>';
else print '<td align="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
print "</tr>\n";
}

2
htdocs/admin/workflow.php
View File

@ -162,7 +162,7 @@ foreach ($workflowcodes as $key => $params)
print ' '.img_warning($langs->transnoentitiesnoconv($params['warning']));
}
print "</td>\n";
print '<td align="center">';
print '<td class="center">';
if (!empty($conf->use_javascript_ajax))
{
print ajax_constantonoff($key);

34
htdocs/api/class/api_setup.class.php
View File

@ -1286,9 +1286,9 @@ class Setup extends DolibarrApi
$sql = "SELECT rowid, code, pos, label, use_default, description";
$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
$sql .= " WHERE t.active = ".$active;
if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
if ($module) $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
$sql .= " WHERE t.active = ".(int) $active;
// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
// if ($module) $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
// Add sql filters
if ($sqlfilters)
{
@ -1430,8 +1430,8 @@ class Setup extends DolibarrApi
$out .= '<tr class="liste_titre">';
$out .= '<td>#</td>';
$out .= '<td>'.$langs->trans("Constant").'</td>';
$out .= '<td align="center">'.$langs->trans("ExpectedValue").'</td>';
$out .= '<td align="center">'.$langs->trans("Value").'</td>';
$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
$out .= '<td class="center">'.$langs->trans("Value").'</td>';
$out .= '</tr>'."\n";
$i = 0;
@ -1451,8 +1451,8 @@ class Setup extends DolibarrApi
$out .= '<tr class="oddeven">';
$out .= '<td>'.$i.'</td>'."\n";
$out .= '<td>'.$constname.'</td>'."\n";
$out .= '<td align="center">'.$constvalue.'</td>'."\n";
$out .= '<td align="center">'.$valueforchecksum.'</td>'."\n";
$out .= '<td class="center">'.$constvalue.'</td>'."\n";
$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
$out .= "</tr>\n";
}
@ -1498,7 +1498,7 @@ class Setup extends DolibarrApi
$out .= '<tr class="liste_titre">';
$out .= '<td>#</td>';
$out .= '<td>'.$langs->trans("Filename").'</td>';
$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
$out .= '</tr>'."\n";
$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
if (is_array($tmpfilelist) && count($tmpfilelist))
@ -1510,7 +1510,7 @@ class Setup extends DolibarrApi
$out .= '<tr class="oddeven">';
$out .= '<td>'.$i.'</td>'."\n";
$out .= '<td>'.$file['filename'].'</td>'."\n";
$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
$out .= "</tr>\n";
}
}
@ -1532,8 +1532,8 @@ class Setup extends DolibarrApi
$out .= '<tr class="liste_titre">';
$out .= '<td>#</td>';
$out .= '<td>'.$langs->trans("Filename").'</td>';
$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
$out .= '<td align="center">'.$langs->trans("CurrentChecksum").'</td>';
$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
$out .= '<td class="right">'.$langs->trans("Size").'</td>';
$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
$out .= '</tr>'."\n";
@ -1547,8 +1547,8 @@ class Setup extends DolibarrApi
$out .= '<tr class="oddeven">';
$out .= '<td>'.$i.'</td>'."\n";
$out .= '<td>'.$file['filename'].'</td>'."\n";
$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
$out .= '<td align="center">'.$file['md5'].'</td>'."\n";
$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
$totalsize += $size;
$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
@ -1582,8 +1582,8 @@ class Setup extends DolibarrApi
$out .= '<tr class="liste_titre">';
$out .= '<td>#</td>';
$out .= '<td>'.$langs->trans("Filename").'</td>';
$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
$out .= '<td align="center">'.$langs->trans("CurrentChecksum").'</td>';
$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
$out .= '<td class="right">'.$langs->trans("Size").'</td>';
$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
$out .= '</tr>'."\n";
@ -1597,8 +1597,8 @@ class Setup extends DolibarrApi
$out .= '<tr class="oddeven">';
$out .= '<td>'.$i.'</td>'."\n";
$out .= '<td>'.$file['filename'].'</td>'."\n";
$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
$out .= '<td align="center">'.$file['md5'].'</td>'."\n";
$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
$totalsize += $size;
$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";

6
htdocs/bookmarks/list.php
View File

@ -213,13 +213,13 @@ while ($i < min($num, $limit))
print "</td>\n";
// Target
print '<td align="center">';
print '<td class="center">';
if ($obj->target == 0) print $langs->trans("BookmarkTargetReplaceWindowShort");
if ($obj->target == 1) print $langs->trans("BookmarkTargetNewWindowShort");
print "</td>\n";
// Author
print '<td align="center">';
print '<td class="center">';
if ($obj->fk_user)
{
$userstatic->id=$obj->fk_user;
@ -233,7 +233,7 @@ while ($i < min($num, $limit))
print "</td>\n";
// Date creation
print '<td align="center">'.dol_print_date($db->jdate($obj->dateb), 'day')."</td>";
print '<td class="center">'.dol_print_date($db->jdate($obj->dateb), 'day')."</td>";
// Position
print '<td class="right">'.$obj->position."</td>";

4
htdocs/comm/action/list.php
View File

@ -618,7 +618,7 @@ if ($resql)
$formatToUse = $obj->fulldayevent ? 'day' : 'dayhour';
// Start date
if (!empty($arrayfields['a.datep']['checked'])) {
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($obj->dp), $formatToUse);
$late = 0;
if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
@ -631,7 +631,7 @@ if ($resql)
// End date
if (!empty($arrayfields['a.datep2']['checked'])) {
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($obj->dp2), $formatToUse);
print '</td>';
}

2
htdocs/comm/action/pertype.php
View File

@ -603,7 +603,7 @@ echo '<td></td>';
$i=0;
for ($h = $begin_d; $h < $end_d; $h++)
{
echo '<td align="center">';
echo '<td class="center">';
print '<small style="font-family: courier">'.sprintf("%02d", $h).'</small>';
print "</td>";
}

2
htdocs/comm/action/peruser.php
View File

@ -665,7 +665,7 @@ while($currentdaytoshow<$lastdaytoshow) {
}
for ($h = $begin_h; $h < $end_h; $h++)
{
echo '<td align="center">';
echo '<td class="center">';
print '<small style="font-family: courier">'.sprintf("%02d", $h).'</small>';
print "</td>";
}

16
htdocs/comm/action/rapport/index.php
View File

@ -131,11 +131,11 @@ if ($resql)
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Period").'</td>';
print '<td align="center">'.$langs->trans("EventsNb").'</td>';
print '<td align="center">'.$langs->trans("Action").'</td>';
print '<td class="center">'.$langs->trans("EventsNb").'</td>';
print '<td class="center">'.$langs->trans("Action").'</td>';
print '<td>'.$langs->trans("PDF").'</td>';
print '<td align="center">'.$langs->trans("Date").'</td>';
print '<td align="center">'.$langs->trans("Size").'</td>';
print '<td class="center">'.$langs->trans("Date").'</td>';
print '<td class="center">'.$langs->trans("Size").'</td>';
print "</tr>\n";
while ($i < min($num, $limit))
@ -150,10 +150,10 @@ if ($resql)
print "<td>".$obj->df."</td>\n";
// Nb of events
print '<td align="center">'.$obj->cc.'</td>';
print '<td class="center">'.$obj->cc.'</td>';
// Button to build doc
print '<td align="center">';
print '<td class="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('BuildDoc'), 'filenew').'</a>';
print '</td>';
@ -184,8 +184,8 @@ if ($resql)
print $out;
print '</td>';
print '<td align="center">'.dol_print_date(dol_filemtime($file), 'dayhour').'</td>';
print '<td align="center">'.dol_print_size(dol_filesize($file)).'</td>';
print '<td class="center">'.dol_print_date(dol_filemtime($file), 'dayhour').'</td>';
print '<td class="center">'.dol_print_size(dol_filesize($file)).'</td>';
}
else {
print '<td>&nbsp;</td>';

14
htdocs/comm/mailing/card.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2016 Laurent Destailleur <eldy@uers.sourceforge.net>
* Copyright (C) 2005-2019 Laurent Destailleur <eldy@uers.sourceforge.net>
* Copyright (C) 2005-2016 Regis Houssin <regis.houssin@inodbox.com>
*
* This program is free software; you can redistribute it and/or modify
@ -763,7 +763,7 @@ if ($action == 'create')
print '</br><br>';
print '<table class="border centpercent">';
print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet')).'"></td></tr>';
print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet', 'alphanohtml')).'"></td></tr>';
print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
print $htmlother->selectColor($_POST['bgcolor'], 'bgcolor', '', 0);
print '</td></tr>';
@ -906,6 +906,11 @@ else
print $form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
print '</td><td>';
print $form->editfieldval("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
$email = CMailFile::getValidAddress($object->email_from, 2);
if ($email && !isValidEmail($email)) {
$langs->load("errors");
print img_warning($langs->trans("ErrorBadEMail", $email));
}
print '</td></tr>';
// Errors to
@ -913,6 +918,11 @@ else
print $form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
print '</td><td>';
print $form->editfieldval("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
$email = CMailFile::getValidAddress($object->email_errorsto, 2);
if ($email && !isValidEmail($email)) {
$langs->load("errors");
print img_warning($langs->trans("ErrorBadEMail", $email));
}
print '</td></tr>';
// Nb of distinct emails

38
htdocs/comm/mailing/cibles.php
View File

@ -229,6 +229,7 @@ if ($object->fetch($id) >= 0)
{
$nbtry = $object->countNbOfTargets('alreadysent');
$nbko = $object->countNbOfTargets('alreadysentko');
$nbok = ($nbtry - $nbko);
$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
@ -244,10 +245,39 @@ if ($object->fetch($id) >= 0)
print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
$emailarray = CMailFile::getArrayAddress($object->email_from);
foreach($emailarray as $email => $name) {
if ($name && $name != $email) {
print dol_escape_htmltag($name).' &lt;'.$email;
print '&gt;';
if (!isValidEmail($email)) {
$langs->load("errors");
print img_warning($langs->trans("ErrorBadEMail", $email));
}
} else {
print dol_print_email($object->email_from, 0, 0, 0, 0, 1);
}
}
//print dol_print_email($object->email_from, 0, 0, 0, 0, 1);
//var_dump($object->email_from);
print '</td></tr>';
// Errors to
print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">';
$emailarray = CMailFile::getArrayAddress($object->email_errorsto);
foreach($emailarray as $email => $name) {
if ($name != $email) {
print dol_escape_htmltag($name).' &lt;'.$email;
print '&gt;';
if (!isValidEmail($email)) {
$langs->load("errors");
print img_warning($langs->trans("ErrorBadEMail", $email));
}
} else {
print dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1);
}
}
print '</td></tr>';
// Nb of distinct emails
@ -598,7 +628,7 @@ if ($object->fetch($id) >= 0)
print '<td>'.$obj->lastname.'</td>';
print '<td>'.$obj->firstname.'</td>';
print '<td>'.$obj->other.'</td>';
print '<td align="center">';
print '<td class="center">';
if (empty($obj->source_id) || empty($obj->source_type))
{
print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
@ -649,7 +679,7 @@ if ($object->fetch($id) >= 0)
else
{
// Date sent
print '<td align="center">'.$obj->date_envoi.'</td>';
print '<td class="center">'.$obj->date_envoi.'</td>';
print '<td class="nowrap right">';
print $object::libStatutDest($obj->statut, 2, $obj->error_text);

8
htdocs/comm/mailing/index.php
View File

@ -165,8 +165,8 @@ if ($result) {
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("LastMailings", $limit).'</td>';
print '<td align="center">'.$langs->trans("DateCreation").'</td>';
print '<td align="center">'.$langs->trans("NbOfEMails").'</td>';
print '<td class="center">'.$langs->trans("DateCreation").'</td>';
print '<td class="center">'.$langs->trans("NbOfEMails").'</td>';
print '<td class="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
$num = $db->num_rows($result);
@ -184,8 +184,8 @@ if ($result) {
print '<tr class="oddeven">';
print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
print '<td>'.dol_trunc($obj->titre, 38).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
print '<td align="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
print '</tr>';
$i++;

4
htdocs/comm/mailing/list.php
View File

@ -228,14 +228,14 @@ if ($result)
print '<td>'.$obj->titre.'</td>';
// Date creation
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($obj->datec), 'day');
print '</td>';
// Nb of email
if (!$filteremail)
{
print '<td align="center">';
print '<td class="center">';
$nbemail = $obj->nbemail;
/*if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
{

12
htdocs/comm/propal/list.php
View File

@ -879,7 +879,7 @@ if ($resql)
// Country
if (!empty($arrayfields['country.code_iso']['checked']))
{
print '<td align="center">';
print '<td class="center">';
$tmparray = getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print '</td>';
@ -890,7 +890,7 @@ if ($resql)
{
if (!is_array($typenArray) || empty($typenArray)) $typenArray = $formcompany->typent_array(1);
print '<td align="center">';
print '<td class="center">';
print $typenArray[$obj->typent_code];
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -899,7 +899,7 @@ if ($resql)
// Date proposal
if (!empty($arrayfields['p.date']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($obj->dp), 'day');
print "</td>\n";
if (!$i) $totalarray['nbfield']++;
@ -910,7 +910,7 @@ if ($resql)
{
if ($obj->dfv)
{
print '<td align="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
print '</td>';
}
else
@ -924,7 +924,7 @@ if ($resql)
{
if ($obj->ddelivery)
{
print '<td align="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
print '</td>';
}
else
@ -936,7 +936,7 @@ if ($resql)
// Availability
if (! empty($arrayfields['ava.rowid']['checked']))
{
print '<td align="center">';
print '<td class="center">';
$form->form_availability('', $obj->availability, 'none', 1);
print '</td>';
if (! $i) $totalarray['nbfield']++;

2
htdocs/comm/propal/stats/index.php
View File

@ -274,7 +274,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre" height="24">';
print '<td align="center">'.$langs->trans("Year").'</td>';
print '<td class="center">'.$langs->trans("Year").'</td>';
print '<td class="right">'.$langs->trans("NbOfProposals").'</td>';
print '<td class="right">%</td>';
print '<td class="right">'.$langs->trans("AmountTotal").'</td>';

8
htdocs/comm/remise.php
View File

@ -235,7 +235,7 @@ if ($socid > 0)
print '<td width="160">'.$langs->trans("Date").'</td>';
print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
print '<td class="left">'.$langs->trans("NoteReason").'</td>';
print '<td align="center">'.$langs->trans("User").'</td>';
print '<td class="center">'.$langs->trans("User").'</td>';
print '</tr>';
$num = $db->num_rows($resql);
if ($num > 0)
@ -246,7 +246,7 @@ if ($socid > 0)
$obj = $db->fetch_object($resql);
print '<tr class="oddeven">';
print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
print '<td class="center">'.price2num($obj->remise_percent).'%</td>';
print '<td class="left">'.$obj->note.'</td>';
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
print '</tr>';
@ -294,7 +294,7 @@ if ($socid > 0)
print '<td width="160">'.$langs->trans("Date").'</td>';
print '<td width="160" align="center">'.$langs->trans("CustomerRelativeDiscountShort").'</td>';
print '<td class="left">'.$langs->trans("NoteReason").'</td>';
print '<td align="center">'.$langs->trans("User").'</td>';
print '<td class="center">'.$langs->trans("User").'</td>';
print '</tr>';
$num = $db->num_rows($resql);
if ($num > 0)
@ -305,7 +305,7 @@ if ($socid > 0)
$obj = $db->fetch_object($resql);
print '<tr class="oddeven">';
print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
print '<td class="center">'.price2num($obj->remise_percent).'%</td>';
print '<td class="left">'.$obj->note.'</td>';
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
print '</tr>';

2
htdocs/comm/remx.php
View File

@ -1062,7 +1062,7 @@ if ($socid > 0)
{
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td align="center">';
print '<td class="center">';
print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
print '</td>';
print '<td>&nbsp;</td>';

10
htdocs/commande/list.php
View File

@ -1020,7 +1020,7 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
print '<td align="center">';
print '<td class="center">';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print '</td>';
@ -1029,7 +1029,7 @@ if ($resql)
// Type ent
if (! empty($arrayfields['typent.code']['checked']))
{
print '<td align="center">';
print '<td class="center">';
if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print '</td>';
@ -1039,7 +1039,7 @@ if ($resql)
// Order date
if (! empty($arrayfields['c.date_commande']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($obj->date_commande), 'day');
print '</td>';
if (! $i) $totalarray['nbfield']++;
@ -1047,7 +1047,7 @@ if ($resql)
// Plannned date of delivery
if (! empty($arrayfields['c.date_delivery']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($obj->date_delivery), 'day');
print '</td>';
if (! $i) $totalarray['nbfield']++;
@ -1116,7 +1116,7 @@ if ($resql)
// Billed
if (! empty($arrayfields['c.facture']['checked']))
{
print '<td align="center">'.yn($obj->billed).'</td>';
print '<td class="center">'.yn($obj->billed).'</td>';
if (! $i) $totalarray['nbfield']++;
}

2
htdocs/commande/orderstoinvoice.php
View File

@ -705,7 +705,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
print '<td class="nowrap right">'.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5).'</td>';
// Checkbox
print '<td align="center">';
print '<td class="center">';
print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="'.$objp->rowid.'">';
print '</td>';

2
htdocs/commande/stats/index.php
View File

@ -301,7 +301,7 @@ print '<br><br>';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre" height="24">';
print '<td align="center">'.$langs->trans("Year").'</td>';
print '<td class="center">'.$langs->trans("Year").'</td>';
print '<td class="right">'.$langs->trans("NbOfOrders").'</td>';
print '<td class="right">%</td>';
print '<td class="right">'.$langs->trans("AmountTotal").'</td>';

14
htdocs/compta/bank/bankentries_list.php
View File

@ -93,7 +93,6 @@ $search_req_nb = GETPOST("req_nb", 'alpha');
$search_num_releve = GETPOST("search_num_releve", 'alpha');
$search_conciliated = GETPOST("search_conciliated", 'int');
$num_releve = GETPOST("num_releve", "alpha");
$cat = GETPOST("cat");
if (empty($dateop)) $dateop = -1;
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@ -420,6 +419,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
$options = array();
$buttonreconcile = '';
$morehtmlref = '';
if ($id > 0 || !empty($ref))
{
@ -458,9 +458,9 @@ if ($id > 0 || !empty($ref))
if ($user->rights->banque->consolidate) {
$newparam = $param;
$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
$buttonreconcile = '<a class="butActionNew" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
} else {
$buttonreconcile = '<a class="butActionNewRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
}
}
}
@ -703,7 +703,7 @@ if ($resql)
print '<td class=right>'.$langs->trans("Credit").'</td>';
/*if (! empty($conf->accounting->enabled))
{
print '<td align="center">';
print '<td class="center">';
print $langs->trans("AccountAccounting");
print '</td>';
}*/
@ -739,11 +739,11 @@ if ($resql)
print '<td class="right"><input name="addcredit" class="flat" type="text" size="4" value="'.GETPOST("addcredit", "alpha").'"></td>';
/*if (! empty($conf->accounting->enabled))
{
print '<td align="center">';
print '<td class="center">';
print $formaccounting->select_account($search_accountancy_code, 'search_accountancy_code', 1, null, 1, 1, '');
print '</td>';
}*/
print '<td align="center">';
print '<td class="center">';
print '<input type="submit" name="save" class="button" value="'.$langs->trans("Add").'"><br>';
print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';
@ -1101,7 +1101,7 @@ if ($resql)
print '</td>';
}
print '<td align="center">';
print '<td class="center">';
print '<input type="checkbox" id="selectAll" />';
print ' <script type="text/javascript">
$("input#selectAll").change(function() {

2
htdocs/compta/bank/class/account.class.php
View File

@ -132,7 +132,7 @@ class Account extends CommonObject
/**
* IBAN number (International Bank Account Number). Stored into iban_prefix field into database
* @var
* @var string
*/
public $iban;

12
htdocs/compta/cashcontrol/cashcontrol_card.php
View File

@ -411,7 +411,7 @@ if ($action == "create" || $action == "start")
print '<tr class="liste_titre">';
print '<td></td>';
print '<td align="center">'.$langs->trans("InitialBankBalance");
print '<td class="center">'.$langs->trans("InitialBankBalance");
//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
print '</td>';
print '<td align="center" class="hide0" colspan="'.count($arrayofpaymentmode).'">';
@ -422,7 +422,7 @@ if ($action == "create" || $action == "start")
print '<tr class="liste_titre">';
print '<td></td>';
print '<td align="center">'.$langs->trans("Cash");
print '<td class="center">'.$langs->trans("Cash");
//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
print '</td>';
$i = 0;
@ -439,7 +439,7 @@ if ($action == "create" || $action == "start")
print '<tr>';
// Initial amount
print '<td>'.$langs->trans("NbOfInvoices").'</td>';
print '<td align="center">';
print '<td class="center">';
print '</td>';
// Amount per payment type
$i = 0;
@ -457,7 +457,7 @@ if ($action == "create" || $action == "start")
print '<tr>';
// Initial amount
print '<td>'.$langs->trans("TheoricalAmount").'</td>';
print '<td align="center">';
print '<td class="center">';
print price($initialbalanceforterminal[$terminalid]['cash']).'<br>';
print '</td>';
// Amount per payment type
@ -476,7 +476,7 @@ if ($action == "create" || $action == "start")
print '<tr>';
print '<td>'.$langs->trans("RealAmount").'</td>';
// Initial amount
print '<td align="center">';
print '<td class="center">';
print '<input name="opening" type="text" class="maxwidth100 center" value="'.(GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash'])).'">';
print '</td>';
// Amount per payment type
@ -489,7 +489,7 @@ if ($action == "create" || $action == "start")
$i++;
}
// Save
print '<td align="center">';
print '<td class="center">';
print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
print '<input type="submit" name="add" class="button" value="'.$langs->trans("Save").'">';
print '</td>';

8
htdocs/compta/charges/index.php
View File

@ -198,7 +198,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$payment_sc_static->ref = $obj->pid;
print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
// Date payment
print '<td align="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
// Type payment
print '<td>';
if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
@ -313,7 +313,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
// Date
print '<td align="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
// Type payment
print '<td>';
@ -439,7 +439,7 @@ while ($j < $numlt)
$tva_static->ref = $obj->rowid;
print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
print '<td class="right">'.price($obj->amount)."</td>";
print "</tr>\n";
@ -525,7 +525,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
// Date
print '<td align="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
// Type payment
print '<td>';

2
htdocs/compta/deplacement/list.php
View File

@ -172,7 +172,7 @@ if ($resql)
// Type
print '<td>'.$langs->trans($obj->type).'</td>';
// Date
print '<td align="center">'.dol_print_date($db->jdate($obj->dd), 'day').'</td>';
print '<td class="center">'.dol_print_date($db->jdate($obj->dd), 'day').'</td>';
// User
print '<td>';
$userstatic->id = $obj->fk_user;

8
htdocs/compta/deplacement/stats/index.php
View File

@ -255,10 +255,10 @@ print '<br><br>';
print '<div class="div-table-responsive-no-min">';
print '<table class="border centpercent">';
print '<tr height="24">';
print '<td align="center">'.$langs->trans("Year").'</td>';
print '<td align="center">'.$langs->trans("Number").'</td>';
print '<td align="center">'.$langs->trans("AmountTotal").'</td>';
print '<td align="center">'.$langs->trans("AmountAverage").'</td>';
print '<td class="center">'.$langs->trans("Year").'</td>';
print '<td class="center">'.$langs->trans("Number").'</td>';
print '<td class="center">'.$langs->trans("AmountTotal").'</td>';
print '<td class="center">'.$langs->trans("AmountAverage").'</td>';
print '</tr>';
$oldyear=0;

8
htdocs/compta/facture/card.php
View File

@ -4382,7 +4382,7 @@ elseif ($id > 0 || !empty($ref))
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
print '<td></td>';
print '<td align="center">'.$langs->trans('Situation').'</td>';
print '<td class="center">'.$langs->trans('Situation').'</td>';
if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
print '<td class="right">'.$langs->trans('AmountHT').'</td>';
print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
@ -4423,7 +4423,7 @@ elseif ($id > 0 || !empty($ref))
print '<tr class="oddeven">';
print '<td>'.$object->getNomUrl(1).'</td>';
print '<td></td>';
print '<td align="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
print '<td class="right">'.price($object->total_ht).'</td>';
print '<td class="right">'.price($object->total_ttc).'</td>';
@ -4473,7 +4473,7 @@ elseif ($id > 0 || !empty($ref))
print '<tr class="oddeven">';
print '<td>'.$next_invoice->getNomUrl(1).'</td>';
print '<td></td>';
print '<td align="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
print '<td class="right">'.price($next_invoice->total_ht).'</td>';
print '<td class="right">'.price($next_invoice->total_ttc).'</td>';
@ -4570,7 +4570,7 @@ elseif ($id > 0 || !empty($ref))
print '</td>';
}
print '<td class="right">'.price($sign * $objp->amount).'</td>';
print '<td align="center">';
print '<td class="center">';
if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
{
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">';

20
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -564,22 +564,22 @@ if ($resql)
}
if (!empty($arrayfields['recurring']['checked']))
{
print '<td align="center">'.yn($objp->frequency ? 1 : 0).'</td>';
print '<td class="center">'.yn($objp->frequency ? 1 : 0).'</td>';
if (!$i) $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.frequency']['checked']))
{
print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
if (!$i) $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.unit_frequency']['checked']))
{
print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
if (!$i) $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.nb_gen_done']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -587,7 +587,7 @@ if ($resql)
// Date last generation
if (!empty($arrayfields['f.date_last_gen']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -595,7 +595,7 @@ if ($resql)
// Date next generation
if (!empty($arrayfields['f.date_when']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print '<div class="nowraponall">';
print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached() ? '<strike>' : '').dol_print_date($db->jdate($objp->date_when), 'day').($invoicerectmp->isMaxNbGenReached() ? '</strike>' : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
if (!$invoicerectmp->isMaxNbGenReached())
@ -612,14 +612,14 @@ if ($resql)
}
if (!empty($arrayfields['f.datec']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($objp->datec), 'dayhour');
print '</td>';
if (!$i) $totalarray['nbfield']++;
}
if (!empty($arrayfields['f.tms']['checked']))
{
print '<td align="center">';
print '<td class="center">';
print dol_print_date($db->jdate($objp->tms), 'dayhour');
print '</td>';
if (!$i) $totalarray['nbfield']++;
@ -634,13 +634,13 @@ if ($resql)
print $hookmanager->resPrint;
// Status
if (!empty($arrayfields['status']['checked'])) {
print '<td align="center">';
print '<td class="center">';
print $invoicerectmp->getLibStatut(3, 0);
print '</td>';
if (!$i) $totalarray['nbfield']++;
}
// Action column
print '<td align="center">';
print '<td class="center">';
if ($user->rights->facture->creer && empty($invoicerectmp->suspended))
{
if ($invoicerectmp->isMaxNbGenReached())

6
htdocs/compta/facture/list.php
View File

@ -1166,7 +1166,7 @@ if ($resql)
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
print '<td align="center">';
print '<td class="center">';
$tmparray=getCountry($obj->fk_pays, 'all');
print $tmparray['label'];
print '</td>';
@ -1175,7 +1175,7 @@ if ($resql)
// Type ent
if (! empty($arrayfields['typent.code']['checked']))
{
print '<td align="center">';
print '<td class="center">';
if (! is_array($typenArray) || count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
print $typenArray[$obj->typent_code];
print '</td>';
@ -1184,7 +1184,7 @@ if ($resql)
// Staff
if (! empty($arrayfields['staff.code']['checked']))
{
print '<td align="center">';
print '<td class="center">';
if (! is_array($staffArray) || count($staffArray)==0) $staffArray = $formcompany->effectif_array(1);
print $staffArray[$obj->staff_code];
print '</td>';

18
htdocs/compta/facture/prelevement.php
View File

@ -587,11 +587,11 @@ if ($object->id > 0)
print '<tr class="liste_titre">';
print '<td class="left">'.$langs->trans("DateRequest").'</td>';
print '<td align="center">'.$langs->trans("User").'</td>';
print '<td align="center">'.$langs->trans("Amount").'</td>';
print '<td align="center">'.$langs->trans("WithdrawalReceipt").'</td>';
print '<td class="center">'.$langs->trans("User").'</td>';
print '<td class="center">'.$langs->trans("Amount").'</td>';
print '<td class="center">'.$langs->trans("WithdrawalReceipt").'</td>';
print '<td>&nbsp;</td>';
print '<td align="center">'.$langs->trans("DateProcess").'</td>';
print '<td class="center">'.$langs->trans("DateProcess").'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
@ -620,11 +620,11 @@ if ($object->id > 0)
print '<tr class="oddeven">';
print '<td class="left">'.dol_print_date($db->jdate($obj->date_demande), 'day')."</td>\n";
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
print '<td align="center">'.price($obj->amount).'</td>';
print '<td class="center">'.price($obj->amount).'</td>';
print '<td align="center">-</td>';
print '<td>&nbsp;</td>';
print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
print '<td class="center">'.$langs->trans("OrderWaiting").'</td>';
print '<td class="right">';
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;did='.$obj->rowid.'">';
@ -672,9 +672,9 @@ if ($object->id > 0)
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a></td>';
print '<td align="center">'.price($obj->amount).'</td>';
print '<td class="center">'.price($obj->amount).'</td>';
print '<td align="center">';
print '<td class="center">';
if ($obj->fk_prelevement_bons > 0)
{
$withdrawreceipt = new BonPrelevement($db);
@ -686,7 +686,7 @@ if ($object->id > 0)
print '<td>&nbsp;</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_traite), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->date_traite), 'day')."</td>\n";
print '<td>&nbsp;</td>';

2
htdocs/compta/facture/stats/index.php
View File

@ -276,7 +276,7 @@ print '<br><br>';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre" height="24">';
print '<td align="center">'.$langs->trans("Year").'</td>';
print '<td class="center">'.$langs->trans("Year").'</td>';
print '<td class="right">'.$langs->trans("NumberOfBills").'</td>';
print '<td class="right">%</td>';
print '<td class="right">'.$langs->trans("AmountTotal").'</td>';

4
htdocs/compta/index.php
View File

@ -667,10 +667,10 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
print '<tr class="oddeven">';
print '<td>'.$chargestatic->getNomUrl(1).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
print '<td class="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
print '<td class="nowrap right">'.price($obj->amount).'</td>';
print '<td class="nowrap right">'.price($obj->sumpaid).'</td>';
print '<td align="center">'.$chargestatic->getLibStatut(3).'</td>';
print '<td class="center">'.$chargestatic->getLibStatut(3).'</td>';
print '</tr>';
$tot_ttc += $obj->amount;

8
htdocs/compta/paiement.php
View File

@ -584,8 +584,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<tr class="liste_titre">';
print '<td>'.$arraytitle.'</td>';
print '<td align="center">'.$langs->trans('Date').'</td>';
print '<td align="center">'.$langs->trans('DateMaxPayment').'</td>';
print '<td class="center">'.$langs->trans('Date').'</td>';
print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td>'.$langs->trans('Currency').'</td>';
print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
@ -645,7 +645,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print "</td>\n";
// Date
print '<td align="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
// Due date
if ($objp->dlr > 0)
@ -666,7 +666,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
}
// Currency
if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$objp->multicurrency_code."</td>\n";
if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
// Multicurrency Price
if (!empty($conf->multicurrency->enabled))

16
htdocs/compta/paiement/cheque/card.php
View File

@ -502,7 +502,7 @@ if ($action == 'new')
print '<td class="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
// Link to payment
print '<td align="center">';
print '<td class="center">';
$paymentstatic->id = $value["paymentid"];
$paymentstatic->ref = $value["paymentid"];
if ($paymentstatic->id)
@ -515,7 +515,7 @@ if ($action == 'new')
}
print '</td>';
// Link to bank transaction
print '<td align="center">';
print '<td class="center">';
$accountlinestatic->rowid = $value["id"];
if ($accountlinestatic->rowid)
{
@ -527,7 +527,7 @@ if ($action == 'new')
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
print '</td>';
print '</tr>';
@ -685,14 +685,14 @@ else
while ($objp = $db->fetch_object($resql))
{
print '<tr class="oddeven">';
print '<td align="center">'.$i.'</td>';
print '<td align="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Date operation
print '<td align="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
print '<td class="center">'.$i.'</td>';
print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Date operation
print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
print '<td>'.dol_trunc($objp->banque, 24).'</td>';
print '<td class="right">'.price($objp->amount).'</td>';
// Link to payment
print '<td align="center">';
print '<td class="center">';
$paymentstatic->id = $objp->pid;
$paymentstatic->ref = $objp->pid;
if ($paymentstatic->id)
@ -705,7 +705,7 @@ else
}
print '</td>';
// Link to bank transaction
print '<td align="center">';
print '<td class="center">';
$accountlinestatic->rowid = $objp->rowid;
if ($accountlinestatic->rowid)
{

2
htdocs/compta/paiement/cheque/list.php
View File

@ -197,7 +197,7 @@ if ($resql)
print '</td>';
// Date
print '<td align="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour
print '<td class="center">'.dol_print_date($db->jdate($objp->dp), 'day').'</td>'; // TODO Use date hour
// Bank
print '<td>';

2
htdocs/compta/paiement/list.php
View File

@ -306,7 +306,7 @@ if ($resql)
// Date
$dateformatforpayment = 'day';
if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
print '<td align="center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment).'</td>';
print '<td class="center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment).'</td>';
if (!$i) $totalarray['nbfield']++;
// Thirdparty

2
htdocs/compta/paiement/tovalidate.php
View File

@ -121,7 +121,7 @@ if ($resql)
print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<td class="right">'.price($objp->amount).'</td>';
print '<td align="center">';
print '<td class="center">';
if ($objp->statut == 0)
{

4
htdocs/compta/paiement_charge.php
View File

@ -267,7 +267,7 @@ if ($action == 'create')
print '<td class="right">'.$langs->trans("Amount").'</td>';
print '<td class="right">'.$langs->trans("AlreadyPaid").'</td>';
print '<td class="right">'.$langs->trans("RemainderToPay").'</td>';
print '<td align="center">'.$langs->trans("Amount").'</td>';
print '<td class="center">'.$langs->trans("Amount").'</td>';
print "</tr>\n";
$total = 0;
@ -294,7 +294,7 @@ if ($action == 'create')
print '<td class="right">'.price($objp->amount - $sumpaid)."</td>";
print '<td align="center">';
print '<td class="center">';
if ($sumpaid < $objp->amount)
{
$namef = "amount_".$objp->id;

4
htdocs/compta/payment_sc/card.php
View File

@ -241,7 +241,7 @@ if ($resql)
print '<td>'.$langs->trans('Type').'</td>';
print '<td>'.$langs->trans('Label').'</td>';
print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
print '<td align="center">'.$langs->trans('Status').'</td>';
print '<td class="center">'.$langs->trans('Status').'</td>';
print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
print "</tr>\n";
@ -267,7 +267,7 @@ if ($resql)
// Expected to pay
print '<td class="right">'.price($objp->sc_amount).'</td>';
// Status
print '<td align="center">'.$socialcontrib->getLibStatut(4, $objp->amount).'</td>';
print '<td class="center">'.$socialcontrib->getLibStatut(4, $objp->amount).'</td>';
// Amount payed
print '<td class="right">'.price($objp->amount).'</td>';
print "</tr>\n";

2
htdocs/compta/prelevement/bons.php
View File

@ -156,7 +156,7 @@ if ($result)
print '<a href="card.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
print '<td class="right">'.price($obj->amount)."</td>\n";

4
htdocs/compta/prelevement/create.php
View File

@ -339,7 +339,7 @@ if ($result)
print"\n<!-- debut table -->\n";
print '<table class="noborder centpercent">';
print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
print '<td align="center">'.$langs->trans("Date").'</td><td class="right">'.$langs->trans("Amount").'</td>';
print '<td class="center">'.$langs->trans("Date").'</td><td class="right">'.$langs->trans("Amount").'</td>';
print '</tr>';
while ($i < min($num,$limit))
@ -355,7 +355,7 @@ if ($result)
print $bprev->getNomUrl(1);
print "</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
print '<td class="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";

2
htdocs/compta/prelevement/factures.php
View File

@ -241,7 +241,7 @@ if ($result)
print '<td class="right">'.price($obj->amount_requested)."</td>\n";
// Status of requests
print '<td align="center">';
print '<td class="center">';
if ($obj->statut == 0)
{

4
htdocs/compta/prelevement/fiche-rejet.php
View File

@ -212,8 +212,8 @@ if ($resql)
print '<td class="right">'.price($obj->amount)."</td>\n";
print '<td>'.$rej->motifs[$obj->motif].'</td>';
print '<td align="center">'.yn($obj->afacturer).'</td>';
print '<td align="center">'.$obj->fk_facture.'</td>';
print '<td class="center">'.yn($obj->afacturer).'</td>';
print '<td class="center">'.$obj->fk_facture.'</td>';
print "</tr>\n";
$total += $obj->amount;

2
htdocs/compta/prelevement/list.php
View File

@ -192,7 +192,7 @@ if ($result)
print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
print '<td class="right">'.price($obj->amount)."</td>\n";

2
htdocs/compta/prelevement/stats.php
View File

@ -120,7 +120,7 @@ if ($resql)
}
print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td>';
print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td class="right">';
print '<td class="center">'.$nbtotal.'</td><td>&nbsp;</td><td class="right">';
print price($total);
print '</td><td class="right">&nbsp;</td>';
print "</tr></table>";

2
htdocs/compta/sociales/list.php
View File

@ -277,7 +277,7 @@ if ($resql)
if (! $i) $totalarray['nbfield']++;
// Date end period
print '<td align="center">';
print '<td class="center">';
if ($obj->periode)
{
print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';

8
htdocs/compta/sociales/payments.php
View File

@ -170,7 +170,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Ref payment
print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
// Date payment
print '<td align="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
// Type payment
print '<td>';
if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
@ -272,7 +272,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$tva_static->ref = $obj->rowid;
print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";
print '<td class="right">'.price($obj->amount)."</td>";
print "</tr>\n";
@ -373,7 +373,7 @@ while ($j < $numlt)
$tva_static->ref = $obj->rowid;
print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";
print '<td class="right">'.price($obj->amount)."</td>";
print "</tr>\n";
@ -455,7 +455,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
$sal_static->ref = $obj->rowid;
print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
print '<td class="right">'.price($obj->amount)."</td>";
print "</tr>\n";

2
htdocs/compta/stats/cabyuser.php
View File

@ -426,7 +426,7 @@ if (count($amount)) {
print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
// Other stats
print '<td align="center">';
print '<td class="center">';
if (! empty($conf->propal->enabled) && $key>0) {
print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
}

2
htdocs/compta/stats/casoc.php
View File

@ -602,7 +602,7 @@ if (count($amount)) {
print '<td class="right">'.($catotal > 0 ? round(100 * $amount[$key] / $catotal, 2).'%' : '&nbsp;').'</td>';
// Other stats
print '<td align="center">';
print '<td class="center">';
if (! empty($conf->propal->enabled) && $key>0) {
print '&nbsp;<a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("ProposalStats"), "stats").'</a>&nbsp;';
}

2
htdocs/contact/list.php
View File

@ -896,7 +896,7 @@ while ($i < min($num, $limit))
// No EMail
if (! empty($arrayfields['p.no_email']['checked']))
{
print '<td align="center">'.yn($obj->no_email).'</td>';
print '<td class="center">'.yn($obj->no_email).'</td>';
if (! $i) $totalarray['nbfield']++;
}
if (! empty($conf->socialnetworks->enabled)) {

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

@ -643,7 +643,7 @@ class Contrat extends CommonObject
$sql .= " note_private, note_public, model_pdf, extraparams";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat";
if (!$id) $sql .= " WHERE entity IN (".getEntity('contract').")";
else $sql .= " WHERE rowid=".$id;
else $sql .= " WHERE rowid=".(int) $id;
if ($ref_customer)
{
$sql .= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
@ -1291,20 +1291,20 @@ class Contrat extends CommonObject
// Clean parameters
if (empty($this->fk_commercial_signature) && $this->commercial_signature_id > 0) $this->fk_commercial_signature = $this->commercial_signature_id;
if (empty($this->fk_commercial_suivi) && $this->commercial_suivi_id > 0) $this->fk_commercial_suivi = $this->commercial_suivi_id;
if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = $this->socid;
if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = $this->projet;
if (empty($this->fk_soc) && $this->socid > 0) $this->fk_soc = (int) $this->socid;
if (empty($this->fk_project) && $this->projet > 0) $this->fk_project = (int) $this->projet;
if (isset($this->ref)) $this->ref = trim($this->ref);
if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
if (isset($this->ref_ext)) $this->ref_ext = trim($this->ref_ext);
if (isset($this->entity)) $this->entity = trim($this->entity);
if (isset($this->entity)) $this->entity = (int) $this->entity;
if (isset($this->statut)) $this->statut = (int) $this->statut;
if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
if (isset($this->fk_soc)) $this->fk_soc = (int) $this->fk_soc;
if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature = trim($this->fk_commercial_signature);
if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi = trim($this->fk_commercial_suivi);
if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service = trim($this->fk_user_mise_en_service);
if (isset($this->fk_user_cloture)) $this->fk_user_cloture = trim($this->fk_user_cloture);
if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service = (int) $this->fk_user_mise_en_service;
if (isset($this->fk_user_cloture)) $this->fk_user_cloture = (int) $this->fk_user_cloture;
if (isset($this->note_private)) $this->note_private = trim($this->note_private);
if (isset($this->note_public)) $this->note_public = trim($this->note_public);
if (isset($this->import_key)) $this->import_key = trim($this->import_key);

2
htdocs/core/ajax/ajaxdirpreview.php
View File

@ -284,7 +284,7 @@ if ($type == 'directory')
}
elseif ($section === '0')
{
if ($module == 'ecm') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
if ($module == 'ecm') $textifempty='<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
else $textifempty = $langs->trans('NoFileFound');
}
else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));

2
htdocs/core/ajax/ajaxdirtree.php
View File

@ -278,7 +278,7 @@ if (empty($conf->use_javascript_ajax) || ! empty($conf->global->MAIN_ECM_DISABLE
print '</td>';
// Info
print '<td align="center">';
print '<td class="center">';
$userstatic->id=$val['fk_user_c'];
$userstatic->lastname=$val['login_c'];
$htmltooltip='<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';

2
htdocs/core/class/CMailFile.class.php
View File

@ -1489,6 +1489,7 @@ class CMailFile
* If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
* If format 4: 'John Doe' or 'john@doe.com' if no label exists
* If format 5: <a href="mailto:john@doe.com">John Doe</a> or <a href="mailto:john@doe.com">john@doe.com</a> if no label exists
* @see getArrayAddress()
*/
public static function getValidAddress($address, $format, $encode = 0, $maxnumberofemail = 0)
{
@ -1560,6 +1561,7 @@ class CMailFile
*
* @param string $address Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
* @return array array of email => name
* @see getValidAddress()
*/
public function getArrayAddress($address)
{

2
htdocs/core/class/commonobject.class.php
View File

@ -73,7 +73,7 @@ abstract class CommonObject
public $table_element;
/**
* @var int Name of subtable line
* @var string Name of subtable line
*/
public $table_element_line = '';

6
htdocs/core/class/html.form.class.php
View File

@ -285,7 +285,7 @@ class Form
}
$ret .= $tmpcontent;
}
else $ret .= $value;
else $ret .= dol_escape_htmltag($value);
if ($formatfunc && method_exists($object, $formatfunc))
{
@ -2097,7 +2097,7 @@ class Form
}
else
{
$selectFieldsGrouped = ", p.stock";
$selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
}
$sql = "SELECT ";
@ -7411,7 +7411,7 @@ class Form
if ($urladvanced) $ret.='<a href="'.$urladvanced.'">';
else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
}
$ret.='<img class="photo'.$modulepart.($cssclass?' '.$cssclass:'').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
$ret.='<img alt="Photo" class="photo'.$modulepart.($cssclass?' '.$cssclass:'').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width?' width="'.$width.'"':'').($height?' height="'.$height.'"':'').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
if ($addlinktofullsize) $ret.='</a>';
}
elseif ($altfile && file_exists($dir."/".$altfile))

2
htdocs/core/class/html.formmail.class.php
View File

@ -973,7 +973,7 @@ class FormMail extends Form
$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
}
$out .= '<tr>';
$out .= '<td valign="top">';
$out .= '<td class="tdtop">';
$out .= $form->textwithpicto($langs->trans('MailText'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltipfrombody');
$out .= '</td>';
$out .= '<td>';

8
htdocs/core/class/html.formticket.class.php
View File

@ -912,7 +912,7 @@ class FormTicket
$checkbox_selected = (GETPOST('private_message', 'alpha') == "1" ? ' checked' : '');
print '<input type="checkbox" name="private_message" value="1" id="private_message" '.$checkbox_selected.'/> ';
print '<label for="private_message">'.$langs->trans('MarkMessageAsPrivate').'</label>';
print '</td><td align="center">';
print '</td><td class="center">';
print $form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help');
print '</td></tr>';
}
@ -980,7 +980,7 @@ class FormTicket
$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
$doleditor->Create();
print '</td><td align="center">';
print '</td><td class="center">';
print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelp"), 1, 'help');
print '</td></tr>';
}
@ -1013,7 +1013,7 @@ class FormTicket
include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
$doleditor->Create();
print '</td><td align="center">';
print '</td><td class="center">';
if ($user->rights->ticket->write && !$user->socid) {
print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
}
@ -1030,7 +1030,7 @@ class FormTicket
include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
$doleditor->Create();
print '</td><td align="center">';
print '</td><td class="center">';
print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');
print '</td></tr>';
}

2
htdocs/core/get_info.php
View File

@ -125,7 +125,7 @@ else $toprightmenu.=$result; // For backward compatibility
// Link to module builder
if (! empty($conf->modulebuilder->enabled))
{
$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="modulebuilder">';
//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
$text.='<span class="fa fa-bug atoplogin"></span>';
$text.='</a>';

10
htdocs/core/lib/admin.lib.php
View File

@ -254,7 +254,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
}
else
{
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<tr><td class="tdtop" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
if (! $silent) print '</tr>';
$error++;
@ -339,7 +339,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
$cursor=$reg[1];
if (empty($listofinsertedrowid[$cursor]))
{
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<tr><td class="tdtop" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("FileIsNotCorrect")."</div></td>";
if (! $silent) print '</tr>';
$error++;
@ -396,7 +396,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
// Is it an error we accept
if (! in_array($errno, $okerrors))
{
if (! $silent) print '<tr><td valign="top" colspan="2">';
if (! $silent) print '<tr><td class="tdtop" colspan="2">';
if (! $silent) print '<div class="error">'.$langs->trans("Error")." ".$db->errno().": ".$newsql."<br>".$db->error()."</div></td>";
if (! $silent) print '</tr>'."\n";
dol_syslog('Admin.lib::run_sql Request '.($i+1)." Error ".$db->errno()." ".$newsql."<br>".$db->error(), LOG_ERR);
@ -1434,7 +1434,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
$text = $langs->trans("Value");
print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
print '</td>';
if (empty($strictw3c)) print '<td align="center" width="80">'.$langs->trans("Action").'</td>';
if (empty($strictw3c)) print '<td class="center" width="80">'.$langs->trans("Action").'</td>';
print "</tr>\n";
$label='';
@ -1600,7 +1600,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
// Submit
if (empty($strictw3c))
{
print '<td align="center">';
print '<td class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
print "</td>";
}

2
htdocs/core/lib/agenda.lib.php
View File

@ -184,7 +184,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
else print '</td>';
if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
else print '<td align="center" valign="middle" class="nowrap">';
else print '<td class="center nowrap" valign="middle">';
print '<table class="centpercent"><tr><td align="center">';
print '<div class="formleftzone">';

6
htdocs/core/lib/company.lib.php
View File

@ -1199,7 +1199,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
// Status
if (!empty($arrayfields['t.statut']['checked']))
{
print '<td align="center">'.$contactstatic->getLibStatut(5).'</td>';
print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
}
// Extra fields
@ -1753,7 +1753,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
}
// Status
$out .= '<td class="nowrap" align="center">'.$actionstatic->LibStatut($histo[$key]['percent'], 3, 0, $histo[$key]['datestart']).'</td>';
$out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 3, 0, $histo[$key]['datestart']).'</td>';
// Actions
$out .= '<td></td>';
@ -1838,7 +1838,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
print '<td>'.$obj->town.'</td>';
print '<td>'.$obj->code_client.'</td>';
print '<td align="center">';
print '<td class="center">';
print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$obj->rowid.'&amp;action=edit">';
print img_edit();
print '</a></td>';

4
htdocs/core/lib/functions.lib.php
View File

@ -2149,7 +2149,7 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
* @param int $socid Id of third party if known
* @param int $addlink 0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on)
* @param int $max Max number of characters to show
* @param int $showinvalid Show warning if syntax email is wrong
* @param int $showinvalid 1=Show warning if syntax email is wrong
* @param int $withpicto Show picto
* @return string HTML Link
*/
@ -2191,7 +2191,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
}
}
$rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';
$rep = '<div class="nospan" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';
if ($hookmanager) {
$parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);
$reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);

2
htdocs/core/lib/ldap.lib.php
View File

@ -163,7 +163,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
$hide=0;
if (! is_numeric($key))
{
print '<tr '.$bc[$var].' valign="top">';
print '<tr class="oddeven">';
print '<td>';
print $key;
print '</td><td>';

2
htdocs/core/lib/project.lib.php
View File

@ -1645,7 +1645,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
$cssweekend = 'weekend';
}
$tableCell = '<td align="center" class="hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
$placeholder = '';
if ($alreadyspent)
{

4
htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
View File

@ -168,12 +168,12 @@ class doc_generic_bom_odt extends ModelePDFBom
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

4
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -175,12 +175,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
{
$texte .= $file['name'].'<br>';
}
$texte .= '<div id="div_'.get_class($this).'">';
$texte .= '</div>';
}
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

2
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -170,7 +170,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$texte .= '</td>';
$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte .= '</td>';
$texte .= '</tr>';

2
htdocs/core/modules/dons/html_cerfafr.html
View File

@ -8,7 +8,7 @@
<div style="height: 297mm; width: 210mm; page-break-inside: avoid;">
<table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#ffffff">
<tr>
<td width="20%" class="nowrap" valign="middle" align="center">
<td width="20%" class="nowrap center" valign="middle" align="center">
<img src="./theme/common/logo_cerfa.png" width="70px"/><br>
<font><b>N° 11580*03</b><br>
DGFIP

4
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -175,12 +175,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
}
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

4
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -174,12 +174,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
{
$texte.=$file['name'].'<br>';
}
$texte.='<div id="div_'.get_class($this).'">';
$texte.='</div>';
}
$texte.= '</td>';
$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
$texte.= '<td rowspan="2" class="tdtop hideonsmartphone">';
$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
$texte.= '</td>';
$texte.= '</tr>';

Some files were not shown because too many files have changed in this diff Show More