Skip to content

Commit

Permalink
Merge pull request #10846 from grandoc/new_branch_15_03_2019
Browse files Browse the repository at this point in the history 
New branch 15 03 2019
  • Loading branch information
@eldy
eldy committed Mar 19, 2019
2 parents eaaea2c + 8de8657 commit 9a3c66b
Show file tree
Hide file tree
Showing 14 changed files with 117 additions and 117 deletions.
18 changes: 9 additions & 9 deletions htdocs/fourn/class/fournisseur.product.class.php
View file
Expand Up @@ -893,13 +893,13 @@ public function display_price_product_fournisseur($showunitprice = 1, $showsupti
$langs->load("suppliers");
if (count($productFournList) > 0) {
$out .= '<table class="nobordernopadding" width="100%">';
$out .= '<tr><td class="liste_titre" align="right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
$out .= '<td class="liste_titre" align="right">'.($showunitprice?$langs->trans("QtyMin"):'').'</td>';
$out .= '<tr><td class="liste_titre right">'.($showunitprice?$langs->trans("Price").' '.$langs->trans("HT"):'').'</td>';
$out .= '<td class="liste_titre right">'.($showunitprice?$langs->trans("QtyMin"):'').'</td>';
$out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
$out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
foreach ($productFournList as $productFourn) {
$out.= '<tr><td align="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').'</td>';
$out.= '<td align="right">'.($showunitprice?$productFourn->fourn_qty:'').'</td>';
$out.= '<tr><td class="right">'.($showunitprice?price($productFourn->fourn_unitprice * (1 -$productFourn->fourn_remise_percent/100) - $productFourn->fourn_remise):'').'</td>';
$out.= '<td class="right">'.($showunitprice?$productFourn->fourn_qty:'').'</td>';
$out.= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
$out.= '<td>'.$productFourn->fourn_ref.'<td></tr>';
}
Expand Down Expand Up @@ -992,13 +992,13 @@ public function displayPriceProductFournisseurLog($productFournLogList = array()
if (count($productFournLogList) > 0) {
$out .= '<table class="nobordernopadding" width="100%">';
$out .= '<tr><td class="liste_titre">'.$langs->trans("Date").'</td>';
$out .= '<td class="liste_titre" align="right">'.$langs->trans("Price").'</td>';
//$out .= '<td class="liste_titre" align="right">'.$langs->trans("QtyMin").'</td>';
$out .= '<td class="liste_titre right">'.$langs->trans("Price").'</td>';
//$out .= '<td class="liste_titre right">'.$langs->trans("QtyMin").'</td>';
$out .= '<td class="liste_titre">'.$langs->trans("User").'</td></tr>';
foreach ($productFournLogList as $productFournLog) {
$out.= '<tr><td align="right">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
$out.= '<td align="right">'.price($productFournLog['price']).'</td>';
//$out.= '<td align="right">'.$productFournLog['quantity'].'</td>';
$out.= '<tr><td align="class">'.dol_print_date($productFournLog['datec'], 'dayhour', 'tzuser').'</td>';
$out.= '<td align="class">'.price($productFournLog['price']).'</td>';
//$out.= '<td align="class">'.$productFournLog['quantity'].'</td>';
$out.= '<td>'.$productFournLog['lastname'].'</td></tr>';
}
$out .= '</table>';
Expand Down
4 changes: 2 additions & 2 deletions htdocs/imports/index.php
View file
Expand Up @@ -111,7 +111,7 @@
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
print '<td>'.$langs->trans("LibraryShort").'</td>';
print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
print '<td class="right">'.$langs->trans("LibraryVersion").'</td>';
print '</tr>';

include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
Expand All @@ -125,7 +125,7 @@
$text=$model->getDriverDescForKey($key);
print '<td>'.$form->textwithpicto($model->getDriverLabelForKey($key), $text).'</td>';
print '<td>'.$model->getLibLabelForKey($key).'</td>';
print '<td class="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>';
print '<td class="nowrap right">'.$model->getLibVersionForKey($key).'</td>';
print '</tr>';
}

Expand Down
14 changes: 7 additions & 7 deletions htdocs/install/repair.php
View file
Expand Up @@ -113,13 +113,13 @@
if ($db->connected)
{
print '<tr><td class="nowrap">';
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerConnection") . ": " . $dolibarr_main_db_host . $langs->transnoentities("OK"));
$ok = 1;
}
else
{
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>";
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->transnoentities("Error")."</td></tr>";
dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok = 0;
}
Expand All @@ -129,13 +129,13 @@
if($db->database_selected)
{
print '<tr><td class="nowrap">';
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
dolibarr_install_syslog("repair: database connection successful: " . $dolibarr_main_db_name);
$ok=1;
}
else
{
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>";
dolibarr_install_syslog("repair: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok=0;
}
Expand All @@ -147,9 +147,9 @@
$version=$db->getVersion();
$versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>';
print '<td class="right">'.$version.'</td></tr>';
dolibarr_install_syslog("repair: " . $langs->transnoentities("ServerVersion") . ": " . $version);
//print '<td align="right">'.join('.',$versionarray).'</td></tr>';
//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
}

$conf->setValues($db);
Expand Down Expand Up @@ -206,7 +206,7 @@
foreach($filelist as $file)
{
print '<tr><td class="nowrap">*** ';
print $langs->trans("Script").'</td><td align="right">'.$file.'</td></tr>';
print $langs->trans("Script").'</td><td class="right">'.$file.'</td></tr>';

$name = substr($file, 0, dol_strlen($file) - 4);

Expand Down
4 changes: 2 additions & 2 deletions htdocs/install/step2.php
View file
Expand Up @@ -125,11 +125,11 @@
$versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("DatabaseVersion").'</td>';
print '<td>'.$version.'</td></tr>';
//print '<td align="right">'.join('.',$versionarray).'</td></tr>';
//print '<td class="right">'.join('.',$versionarray).'</td></tr>';

print '<tr><td>'.$langs->trans("DatabaseName").'</td>';
print '<td>'.$db->database_name.'</td></tr>';
//print '<td align="right">'.join('.',$versionarray).'</td></tr>';
//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
}

$requestnb=0;
Expand Down
14 changes: 7 additions & 7 deletions htdocs/install/upgrade.php
View file
Expand Up @@ -181,16 +181,16 @@
$version=$db->getVersion();
$versionarray=$db->getVersionArray();
print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
print '<td align="right">'.$version.'</td></tr>';
print '<td class="right">'.$version.'</td></tr>';
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
if ($db->type == 'mysqli' && function_exists('mysqli_get_charset'))
{
$tmparray = $db->db->get_charset();
print '<tr><td>'.$langs->trans("ClientCharset").'</td>';
print '<td align="right">'.$tmparray->charset.'</td></tr>';
print '<td class="right">'.$tmparray->charset.'</td></tr>';
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ClientCharset") . ": " .$tmparray->charset);
print '<tr><td>'.$langs->trans("ClientSortingCharset").'</td>';
print '<td align="right">'.$tmparray->collation.'</td></tr>';
print '<td class="right">'.$tmparray->collation.'</td></tr>';
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ClientCollation") . ": " .$tmparray->collation);
}

Expand All @@ -201,7 +201,7 @@
&& versioncompare($versionarray, $versionmindb) < 0)
{
// Warning: database version too low.
print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
print "<tr><td>".$langs->trans("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb))."</td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
$ok=0;
}
Expand All @@ -228,7 +228,7 @@
)
{
// Warning: database version too low.
print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."</div></td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
print '<tr><td><div class="warning">'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion)."</div></td><td class=\"right\">".$langs->trans("Error")."</td></tr>\n";
dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
$ok=0;
break;
Expand Down Expand Up @@ -367,7 +367,7 @@
if (in_array($dir.$file, $listoffileprocessed)) continue;

print '<tr><td colspan="2"><hr></td></tr>';
print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td align="right">'.$file.'</td></tr>'."\n";
print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";

// Run sql script
$ok=run_sql($dir.$file, 0, '', 1);
Expand Down Expand Up @@ -401,7 +401,7 @@
if (in_array($modulefilelong, $listoffileprocessed)) continue;

print '<tr><td colspan="2"><hr></td></tr>';
print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td align="right">'.$modulefileshort.'</td></tr>'."\n";
print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").' (external modules)</td><td class="right">'.$modulefileshort.'</td></tr>'."\n";

// Run sql script
$okmodule=run_sql($modulefilelong, 0, '', 1); // Note: Result of migration of external module should not decide if we continue migration of Dolibarr or not.
Expand Down
8 changes: 4 additions & 4 deletions htdocs/install/upgrade2.php
View file
Expand Up @@ -143,7 +143,7 @@

if (!$db->connected)
{
print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase", $conf->db->name).'</td><td class="right">'.$langs->trans('Error').'</td></tr>';
dolibarr_install_syslog('upgrade2: failed to connect to database :' . $conf->db->name . ' on ' . $conf->db->host . ' for user ' . $conf->db->user, LOG_ERR);
$error++;
}
Expand Down Expand Up @@ -3666,21 +3666,21 @@ function migrate_clean_association($db, $langs, $conf, $versionto)
if (! $error)
{
print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
print '<td align="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
$db->commit();
}
else
{
print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
print '<td align="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
$db->rollback();
}
}
}
else
{
print '<tr><td>'.$langs->trans("Error").'</td>';
print '<td align="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions htdocs/opensurvey/index.php
View file
Expand Up @@ -68,9 +68,9 @@
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("OpenSurveyArea").'</td></tr>';
print "<tr ".$bc[0].">";
print '<td>'.$langs->trans("NbOfSurveys").'</td><td align="right"><a href="list.php">'.$nbsondages.'</a></td>';
print '<td>'.$langs->trans("NbOfSurveys").'</td><td class="right"><a href="list.php">'.$nbsondages.'</a></td>';
print "</tr>";
//print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">';
//print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">';
//print $total;
//print '</td></tr>';
print '</table>';
Expand Down
12 changes: 6 additions & 6 deletions htdocs/opensurvey/list.php
View file
Expand Up @@ -315,7 +315,7 @@
$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print '<td class="liste_titre" align="right">';
print '<td class="liste_titre" class="right">';
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print '</td>';
Expand Down Expand Up @@ -401,13 +401,13 @@
print '</td>';

// Nb of voters
print'<td align="right">'.$nbuser.'</td>'."\n";
print'<td class="right">'.$nbuser.'</td>'."\n";

print '<td align="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
print '<td class="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
if ($db->jdate($obj->date_fin) < $now && $obj->status == Opensurveysondage::STATUS_VALIDATED) { print img_warning($langs->trans("Expired")); }
print '</td>';

print'<td align="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n";
print'<td class="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n";

// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
Expand All @@ -416,7 +416,7 @@
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print '<td class="nowrap" align="center">';
print '<td class="nowrap center">';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
Expand All @@ -437,7 +437,7 @@
while ($i < $totalarray['nbfield'])
{
$i++;
if (! empty($totalarray['pos'][$i])) print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
if (! empty($totalarray['pos'][$i])) print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
else
{
if ($i == 1)
Expand Down
8 changes: 4 additions & 4 deletions htdocs/product/admin/dynamic_prices.php
View file
Expand Up @@ -176,7 +176,7 @@
print '<td>'.$entry->code.'</td>';
print '<td>'.$entry->description.'</td>';
print '<td>'.price($entry->value).'</td>';
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';
print '</tr>';
}
Expand Down Expand Up @@ -228,7 +228,7 @@
print '</table>';

//Form Buttons
print '<br><div align="center">';
print '<br><div class="center">';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
print '</div>';
Expand Down Expand Up @@ -267,7 +267,7 @@
print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
print '<td>'.$entry->update_interval.'</td>';
print '<td>'.$entry->getLastUpdated().'</td>';
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';
print '</tr>';
}
Expand Down Expand Up @@ -350,7 +350,7 @@ function on_change() {
print '</table>';

//Form Buttons
print '<br><div align="center">';
print '<br><div class="center">';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
print '</div>';
Expand Down

0 comments on commit 9a3c66b

Please sign in to comment.