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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-19 16:48:57 +02:00
commit 8b25a5cbf5
9 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/comm/action/index.php
View File

@ -759,7 +759,9 @@ if (empty($action) || $action == 'show_month') // View by month
$newparam=preg_replace('/day=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/viewcal=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter
$newparam.='&viewcal=1';
echo '<table width="100%" class="nocellnopadd cal_month">';
echo ' <tr class="liste_titre">';
$i=0;
@ -830,7 +832,9 @@ elseif ($action == 'show_week') // View by week
$newparam=preg_replace('/day=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter
$newparam.='&viewweek=1';
echo '<table width="100%" class="nocellnopadd cal_month">';
echo ' <tr class="liste_titre">';
$i=0;
@ -884,6 +888,8 @@ else // View by day
$newparam=$param; // newparam is for birthday links
$newparam=preg_replace('/action=show_month&?/i','',$newparam);
$newparam=preg_replace('/action=show_week&?/i','',$newparam);
$newparam=preg_replace('/viewday=[0-9]+&?/i','',$newparam);
$newparam.='&viewday=1';
// Code to show just one day
$style='cal_current_month';
$today=0;
@ -950,6 +956,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
global $theme_datacolor;
global $cachethirdparties, $cachecontacts, $colorindexused;
print '<div id="dayevent_'.sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day).'" class="dayevent">'."\n";
$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
print '<table class="nobordernopadding" width="100%">';
@ -957,7 +964,6 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?';
print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
print $newparam;
//.'&month='.$month.'&year='.$year;
print '">';
if ($showinfo) print dol_print_date($curtime,'daytext');
else print dol_print_date($curtime,'%d');
@ -965,6 +971,8 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print '</td><td align="right" class="nowrap">';
if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
{
$newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
//$param='month='.$monthshown.'&year='.$year;
$hourminsec='100000';
print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&datep='.sprintf("%04d%02d%02d",$year,$month,$day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'">';

3
htdocs/contact/class/contact.class.php
View File

@ -883,7 +883,8 @@ class Contact extends CommonObject
global $langs;
$langs->load("dict");
$code=$this->civilite_id;
$code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:''));
if (empty($code)) return '';
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
}

6
htdocs/core/search_page.php
View File

@ -61,8 +61,12 @@ print '<div>';
$nbofsearch=0;
// Instantiate hooks of thirdparty module
$hookmanager->initHooks(array('searchform'));
// Define $searchform
if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
// TODO Mutualize code here with function left_menu into main.inc.php page
if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
{
$langs->load("companies");
$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname');

10
htdocs/main.inc.php
View File

@ -1479,18 +1479,18 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
$searchform='';
$bookmarks='';
// Instantiate hooks of thirdparty module
$hookmanager->initHooks(array('searchform','leftblock'));
if (empty($conf->dol_hide_leftmenu))
{
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
// Instantiate hooks of thirdparty module
$hookmanager->initHooks(array('searchform','leftblock'));
if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print "\n".'<div class="ui-layout-west"> <!-- Begin left layout -->'."\n";
else print '<div id="id-left">';
print "\n";
// Define $searchform
if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && ! empty($conf->global->MAIN_SEARCHFORM_SOCIETE) && $user->rights->societe->lire)
{
$langs->load("companies");
$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname');

8
htdocs/theme/amarok/style.css.php
View File

@ -246,6 +246,10 @@ input:disabled {background:#b6b6b6;}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }
<?php } ?>
textarea.flat {
font-size:<?php print $fontsize ?>px;
font-family:<?php print $fontlist ?>;
@ -2120,6 +2124,10 @@ div.ui-radio
margin: 0;
position: static;
}
.ui-mobile fieldset
{
padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
}
<?php
if (is_object($db)) $db->close();

7
htdocs/theme/auguria/style.css.php
View File

@ -136,6 +136,9 @@ textarea:disabled {
}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }
<?php } ?>
.button {
font-family: <?php print $fontlist ?>;
border: 1px solid #ACBCBB;
@ -2261,6 +2264,10 @@ div.ui-radio
margin: 0;
position: static;
}
.ui-mobile fieldset
{
padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
}
<?php

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

@ -149,7 +149,6 @@ textarea:disabled {
background:#ddd;
}
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input.button[type=submit] {
@ -167,6 +166,10 @@ input.button[type=submit] {
display: inline;
}
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }
<?php } ?>
.button {
font-family: <?php print $fontlist ?>;
border: 0px;
@ -2442,6 +2445,10 @@ div.ui-radio
margin: 0;
position: static;
}
.ui-mobile fieldset
{
padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
}
<?php
if (is_object($db)) $db->close();

8
htdocs/theme/cameleo/style.css.php
View File

@ -142,6 +142,10 @@ input.button[type=submit] {
font-weight: bold;
}
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }
<?php } ?>
.button {
font-family: <?php print $fontlist ?>;
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
@ -2358,6 +2362,10 @@ div.ui-radio
margin: 0;
position: static;
}
.ui-mobile fieldset
{
padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
}
<?php

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

@ -259,6 +259,7 @@ select.flat, form.flat select {
input:disabled {
background:#ddd;
}
input:-webkit-autofill {
background-color: #FCFEFA !important; background-image:none !important;
}
@ -275,6 +276,10 @@ textarea:disabled {
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; }
<?php if (! empty($dol_use_jmobile)) { ?>
legend { margin-bottom: 8px; }
<?php } ?>
.button {
font-family: <?php print $fontlist ?>;
background-image: url(<?php echo $img_button ?>);
@ -2676,6 +2681,11 @@ div.ui-radio
margin: 0;
position: static;
}
.ui-mobile fieldset
{
padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
}
<?php
if (is_object($db)) $db->close();