Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
This commit is contained in:
Laurent Destailleur
2013-06-24 20:02:02 +02:00
parent cba1d73dd4 eb07c6b2e7
commit 1d8b9949d6
11 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@@ -1892,4 +1892,4 @@ class Adherent extends CommonObject
} }
} }
?> ?>

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

@@ -1506,4 +1506,4 @@ function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
} }
} }
return $ret; return $ret;
} }

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

@@ -273,4 +273,4 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
else return $result; else return $result;
} }
?> ?>

2
htdocs/core/tpl/contacts.tpl.php
View File

@@ -185,4 +185,4 @@ $userstatic=new User($db);
<?php } } ?> <?php } } ?>
</div> </div>
<!-- END PHP TEMPLATE CONTACTS --> <!-- END PHP TEMPLATE CONTACTS -->

2
htdocs/cron/list.php
View File

@@ -317,4 +317,4 @@ dol_print_cron_urls();
llxFooter(); llxFooter();
$db->close(); $db->close();
?> ?>

2
htdocs/document.php
View File

@@ -178,4 +178,4 @@ header('Pragma: public');
readfile($original_file_osencoded); readfile($original_file_osencoded);
?> ?>

2
htdocs/product/ajax/products.php
View File

@@ -170,4 +170,4 @@ else
if ($outjson) print json_encode($arrayresult); if ($outjson) print json_encode($arrayresult);
} }
?> ?>

1
htdocs/theme/bureau2crea/style.css.php
View File

@@ -65,6 +65,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files // Define image path files
$fontlist='arial, sans-serif, verdana, helvetica'; $fontlist='arial, sans-serif, verdana, helvetica';
//$fontlist='Verdana,Helvetica,Arial,sans-serif'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
$dol_hide_topmenu=$conf->dol_hide_topmenu; $dol_hide_topmenu=$conf->dol_hide_topmenu;
$dol_hide_leftmenu=$conf->dol_hide_leftmenu; $dol_hide_leftmenu=$conf->dol_hide_leftmenu;
$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen; $dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;

5
htdocs/theme/eldy/style.css.php
View File

@@ -1709,7 +1709,7 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>;
text-align: <?php echo $left; ?>; text-align: <?php echo $left; ?>;
} }
tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
/*font-weight: normal;*/ /*font-weight: normal;*/
@@ -1717,6 +1717,9 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>;
text-shadow:1px 0px 1px #ffffff; text-shadow:1px 0px 1px #ffffff;
} }
div.liste_titre {
padding-left: 3px;
}
tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;

2
htdocs/user/logout.php
View File

@@ -82,4 +82,4 @@ unset($_SESSION['dol_entity']);
if (GETPOST('noredirect')) return; if (GETPOST('noredirect')) return;
header("Location: ".$url); // Default behaviour is redirect to index.php page header("Location: ".$url); // Default behaviour is redirect to index.php page
?> ?>

2
htdocs/viewimage.php
View File

@@ -198,4 +198,4 @@ else // Open and return file
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();
?> ?>