Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
This commit is contained in:
Laurent Destailleur
2015-02-19 00:01:26 +01:00
parent 25ba9d2c97 774389940e
commit e3713c8b6d
123 changed files with 534 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/tools/dolibarr_export.php
View File

@@ -97,7 +97,7 @@ jQuery(document).ready(function() {
if (jQuery("#select_sql_compat").val() == 'POSTGRESQL')
{
jQuery("#checkbox_dump_disable-add-locks").attr('checked',true);
};
}
});
<?php

10
htdocs/admin/tools/eaccelerator.php
View File

@@ -97,7 +97,7 @@ function compare($x, $y)
*/
function revcompare($x, $y)
{
global $sortby, $langs;
global $sortby;
if ($x[$sortby] == $y[$sortby]) {
return 0;
@@ -146,16 +146,16 @@ function create_script_table($list)
if($sortby == "file")
print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=mtime&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Date").'</a>&nbsp;';
if($sortby == "mtime")
if($sortby == "mtime")
print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=size&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Size").'</a>&nbsp;';
if($sortby == "size")
if($sortby == "size")
print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=reloads&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Reloads").'</a>&nbsp;';
if($sortby == "reloads")
if($sortby == "reloads")
print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
print '<th><a href="'.$_SERVER['PHP_SELF'].'?sort=hits&order='.($order == "asc" ? "desc" : "asc").'">'.$langs->trans("Hits").'</a>&nbsp;';
if($sortby == "hits")
if($sortby == "hits")
print ($order == "asc" ? "&darr;" : "&uarr;").'</th>';
print '</tr>';
switch ($sortby) {

1
htdocs/admin/tools/export.php
View File

@@ -469,7 +469,6 @@ function backup_tables($outputfile, $tables='*')
$sql='SELECT * FROM '.$table;
$result = $db->query($sql);
$num_fields = $db->num_rows($result);
while($row = $db->fetch_row($result))
{
// For each row of data we print a line of INSERT

2
htdocs/admin/tools/listevents.php
View File

@@ -102,7 +102,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
{
$error++;
dol_syslog($securityevent->error, LOG_ERR);
$db->rolback();
$db->rollback();
}
}