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

Fix [ bug #1145 ] Agenda button list type do not display

Browse Source
This commit is contained in:
Florian Henry 2013-11-22 14:43:15 +01:00
parent ea0bbb5896
commit f852c9a5bb
2 changed files with 109 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ Fix: Option drop table into backup was broken.
Fix: [ bug #1105 ] Searching Boxes other search option Fix: [ bug #1105 ] Searching Boxes other search option
Fix: wrong buy price update Fix: wrong buy price update
Fix: [ bug #1142 ] Set paiement on invoice (PGSql) Fix: [ bug #1142 ] Set paiement on invoice (PGSql)
Fix: [ bug #1145 ] Agenda button list type do not display
***** ChangeLog for 3.4.1 compared to 3.4.0 ***** ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
Fix: Display buying price on line edit when no supplier price is defined Fix: Display buying price on line edit when no supplier price is defined

30
htdocs/core/lib/agenda.lib.php
View File

@ -43,13 +43,11 @@
* @param string $actioncode Preselected value of actioncode for filter on type * @param string $actioncode Preselected value of actioncode for filter on type
* @return void * @return void
*/ */
function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$showextcals=array(),$actioncode='') function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $showextcals = array(), $actioncode = '') {
{
global $conf, $user, $langs, $db; global $conf, $user, $langs, $db;
// Filters // Filters
if ($canedit || ! empty($conf->projet->enabled))
{
print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER ["PHP_SELF"] . '" method="POST">'; print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER ["PHP_SELF"] . '" method="POST">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">'; print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
print '<input type="hidden" name="status" value="' . $status . '">'; print '<input type="hidden" name="status" value="' . $status . '">';
@ -58,14 +56,12 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
print '<input type="hidden" name="day" value="' . $day . '">'; print '<input type="hidden" name="day" value="' . $day . '">';
print '<input type="hidden" name="showbirthday" value="' . $showbirthday . '">'; print '<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
print '<table class="nobordernopadding" width="100%">'; print '<table class="nobordernopadding" width="100%">';
if ($canedit || ! empty($conf->projet->enabled))
{
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table class="nobordernopadding">'; print '<table class="nobordernopadding">';
if ($canedit) if ($canedit) {
{
print '<tr>'; print '<tr>';
print '<td class="nowrap">'; print '<td class="nowrap">';
print $langs->trans ( "ActionsAskedBy" ); print $langs->trans ( "ActionsAskedBy" );
@ -100,8 +96,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
print '</td></tr>'; print '</td></tr>';
} }
if (! empty($conf->projet->enabled) && $user->rights->projet->lire) if (! empty ( $conf->projet->enabled ) && $user->rights->projet->lire) {
{
print '<tr>'; print '<tr>';
print '<td class="nowrap">'; print '<td class="nowrap">';
print $langs->trans ( "Project" ) . ' &nbsp; '; print $langs->trans ( "Project" ) . ' &nbsp; ';
@ -125,8 +120,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
print '</td>'; print '</td>';
// Legend // Legend
if ($conf->use_javascript_ajax && is_array($showextcals)) if ($conf->use_javascript_ajax && is_array ( $showextcals )) {
{
print '<td align="center" valign="middle" class="nowrap">'; print '<td align="center" valign="middle" class="nowrap">';
print '<script type="text/javascript">' . "\n"; print '<script type="text/javascript">' . "\n";
print 'jQuery(document).ready(function () {' . "\n"; print 'jQuery(document).ready(function () {' . "\n";
@ -136,13 +130,10 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
print '});' . "\n"; print '});' . "\n";
print '</script>' . "\n"; print '</script>' . "\n";
print '<table>'; print '<table>';
if (! empty($conf->global->MAIN_JS_SWITCH_AGENDA)) if (! empty ( $conf->global->MAIN_JS_SWITCH_AGENDA )) {
{ if (count ( $showextcals ) > 0) {
if (count($showextcals) > 0)
{
print '<tr><td><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans ( "LocalAgenda" ) . '</td></tr>'; print '<tr><td><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans ( "LocalAgenda" ) . '</td></tr>';
foreach($showextcals as $val) foreach ( $showextcals as $val ) {
{
$htmlname = dol_string_nospecial ( $val ['name'] ); $htmlname = dol_string_nospecial ( $val ['name'] );
print '<script type="text/javascript">' . "\n"; print '<script type="text/javascript">' . "\n";
print 'jQuery(document).ready(function () {' . "\n"; print 'jQuery(document).ready(function () {' . "\n";
@ -159,11 +150,10 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
} }
print '</tr>'; print '</tr>';
}
print '</table>'; print '</table>';
print '</form>'; print '</form>';
} }
}
/** /**