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

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
fhenry 2013-05-01 22:57:33 +02:00
commit 5d60ed2462
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/fiche.php
View File

@ -215,7 +215,7 @@ if ($id > 0)
{
$langs->load("compta");
print '<tr><td nowrap>';
print '<tr><td>';
print $langs->trans('CustomerCode').'</td><td colspan="3">';
print $object->code_client;
if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
@ -300,8 +300,8 @@ if ($id > 0)
// Conditions de reglement par defaut
$langs->load('bills');
$form = new Form($db);
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print '<tr><td>';
print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans('PaymentConditions');
print '<td>';
if (($action != 'editconditions') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';

2
htdocs/core/modules/DolibarrModules.class.php
View File

@ -1261,6 +1261,8 @@ abstract class DolibarrModules
{
foreach($this->module_parts as $key => $value)
{
if (is_array($value) && count($value) == 0) continue; // Discard empty arrays
$newvalue = $value;
// Serialize array parameters

2
htdocs/main.inc.php
View File

@ -1015,7 +1015,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
foreach($filescss as $cssfile)
{
// cssfile is a relative path
print '<!-- Includes CSS added by module '.$modcss. '-->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
print '">'."\n";

1
htdocs/societe/consumption.php
View File

@ -70,6 +70,7 @@ if (GETPOST("button_removefilter"))
$thirdTypeSelect = GETPOST("third_select_id");
$type_element = GETPOST('type_element')?GETPOST('type_element'):'invoice';
$langs->load("companies");
$langs->load("bills");
$langs->load("orders");
$langs->load("suppliers");

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

@ -952,10 +952,11 @@ div.blockvmenusearch
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1b; ?>) 90%, rgb(<?php echo $colorbacktab2; ?>) 100%);
<?php } ?>
border-left: 1px solid #CCCCCC;
border-right: 1px solid #BBBBBB;
border-bottom: 1px solid #BBBBBB;
border-radius: 5px;
border-left: 1px solid #DDDDDD;
border-right: 1px solid #CCCCCC;
border-bottom: 1px solid #CCCCCC;
border-top: 1px solid #E8E8E8;
border-radius: 5px;
-moz-border-radius: 5px;
-moz-box-shadow: 4px 4px 4px #DDD;
-webkit-box-shadow: 4px 4px 4px #DDD;