Attachment #40150 for bug #14383

View | Details | Raw Unified | Return to bug 14383
Collapse All | Expand All




# see if the user want to see all budgets or only owned ones by default
my $show_mine = $input->param('show_mine') // 0;

# IF USER DOESN'T HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW...
if (not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'}
    and $op eq 'add_form')
{

            $budget->{'budget_lock'} = 1;
        }

        # if a budget search doesn't match, next
        if ($filter_budgetname) {
            next
              unless $budget->{budget_code} =~ m/$filter_budgetname/i

            $available_total += $budget->{total_remaining};
        }

# if amount == 0 don't display...
        delete $budget->{'budget_unalloc_sublevel'}
            if (!defined $budget->{'budget_unalloc_sublevel'}
            or $budget->{'budget_unalloc_sublevel'} == 0);

Lines 330-336 foreach my $budget (@budgets) { Link Here

(-)a/admin/aqplan.pl (-1 / +1 lines)
330	or $authcat eq 'BRANCHES'	330	or $authcat eq 'BRANCHES'
331	or $authcat eq 'MONTHS' ) {	331	or $authcat eq 'MONTHS' ) {
332		332
333	# but skip budgets that dont match the current auth-category	333	# but skip budgets that don't match the current auth-category
334	next if ( $budget->{'sort1_authcat'} ne $authcat	334	next if ( $budget->{'sort1_authcat'} ne $authcat
335	&& $budget->{'sort2_authcat'} ne $authcat );	335	&& $budget->{'sort2_authcat'} ne $authcat );
336	}	336	}

Lines 67-73 if ($parent) { Link Here

(-)a/admin/check_parent_total.pl (-1 / +1 lines)
67	my $sum = $sth->fetchrow_hashref;	67	my $sum = $sth->fetchrow_hashref;
68	$sth->finish;	68	$sth->finish;
69	$sub_unalloc = $parent->{'budget_amount'} - $sum->{sum};	69	$sub_unalloc = $parent->{'budget_amount'} - $sum->{sum};
70	# TRICKY.. , IF THE PARENT IS THE CURRENT PARENT - THEN SUBSTRACT CURRENT BUDGET FROM TOTAL	70	# TRICKY.. , IF THE PARENT IS THE CURRENT PARENT - THEN SUBTRACT CURRENT BUDGET FROM TOTAL
71	$sub_unalloc += $budget->{'budget_amount'} if ( $budget->{'budget_parent_id'} == $parent_id ) ;	71	$sub_unalloc += $budget->{'budget_amount'} if ( $budget->{'budget_parent_id'} == $parent_id ) ;
72	}	72	}
73		73

Lines 86-92 See http://dev.mysql.com/doc/refman/5.0/en/time-zone-support.html Link Here

(-)a/admin/env_tz_test.pl (-2 / +1 lines)
86		86
87	=head2 cron/crontab	87	=head2 cron/crontab
88		88
89	Current versions of cron in debian allow ENV variables to be set in the lines preceeding	89	Current versions of cron in debian allow ENV variables to be set in the lines preceding
90	scheduled commands. They will be exported to the environment of the scheduled job. This is	90	scheduled commands. They will be exported to the environment of the scheduled job. This is
91	an example for crontab:	91	an example for crontab:
92		92
93	-

Return to bug 14383

Lines 60-66 my $op = $input->param('op') \|\| 'list'; Link Here

(-)a/admin/aqbudgets.pl (-3 / +3 lines)
60	# see if the user want to see all budgets or only owned ones by default	60	# see if the user want to see all budgets or only owned ones by default
61	my $show_mine = $input->param('show_mine') // 0;	61	my $show_mine = $input->param('show_mine') // 0;
62		62
63	# IF USER DOESNT HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW...	63	# IF USER DOESN'T HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW...
64	if (not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'}	64	if (not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'}
65	and $op eq 'add_form')	65	and $op eq 'add_form')
66	{	66	{
Lines 282-288 if ( $op eq 'list' ) { Link Here
282	$budget->{'budget_lock'} = 1;	282	$budget->{'budget_lock'} = 1;
283	}	283	}
284		284
285	# if a budget search doesnt match, next	285	# if a budget search doesn't match, next
286	if ($filter_budgetname) {	286	if ($filter_budgetname) {
287	next	287	next
288	unless $budget->{budget_code} =~ m/$filter_budgetname/i	288	unless $budget->{budget_code} =~ m/$filter_budgetname/i
Lines 303-309 if ( $op eq 'list' ) { Link Here
303	$available_total += $budget->{total_remaining};	303	$available_total += $budget->{total_remaining};
304	}	304	}
305		305
306	# if amount == 0 dont display...	306	# if amount == 0 don't display...
307	delete $budget->{'budget_unalloc_sublevel'}	307	delete $budget->{'budget_unalloc_sublevel'}
308	if (!defined $budget->{'budget_unalloc_sublevel'}	308	if (!defined $budget->{'budget_unalloc_sublevel'}
309	or $budget->{'budget_unalloc_sublevel'} == 0);	309	or $budget->{'budget_unalloc_sublevel'} == 0);