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

(-)a/C4/Suggestions.pm (-1 / +3 lines)
Lines 109-115 sub SearchSuggestion { Link Here
109
            B2.branchname       AS branchnamesuggestedby,
109
            B2.branchname       AS branchnamesuggestedby,
110
            U2.email            AS emailmanagedby,
110
            U2.email            AS emailmanagedby,
111
            U2.branchcode       AS branchcodemanagedby,
111
            U2.branchcode       AS branchcodemanagedby,
112
            U2.borrowernumber   AS borrnummanagedby
112
            U2.borrowernumber   AS borrnummanagedby,
113
            BU.budget_name      AS budget_name
113
        FROM suggestions
114
        FROM suggestions
114
            LEFT JOIN borrowers     AS U1 ON suggestedby=U1.borrowernumber
115
            LEFT JOIN borrowers     AS U1 ON suggestedby=U1.borrowernumber
115
            LEFT JOIN branches      AS B1 ON B1.branchcode=U1.branchcode
116
            LEFT JOIN branches      AS B1 ON B1.branchcode=U1.branchcode
Lines 117-122 sub SearchSuggestion { Link Here
117
            LEFT JOIN borrowers     AS U2 ON managedby=U2.borrowernumber
118
            LEFT JOIN borrowers     AS U2 ON managedby=U2.borrowernumber
118
            LEFT JOIN branches      AS B2 ON B2.branchcode=U2.branchcode
119
            LEFT JOIN branches      AS B2 ON B2.branchcode=U2.branchcode
119
            LEFT JOIN categories    AS C2 ON C2.categorycode=U2.categorycode
120
            LEFT JOIN categories    AS C2 ON C2.categorycode=U2.categorycode
121
            LEFT JOIN aqbudgets     AS BU ON budgetid=BU.budget_id
120
        WHERE 1=1
122
        WHERE 1=1
121
    }
123
    }
122
    );
124
    );
(-)a/acqui/newordersuggestion.pl (-7 lines)
Lines 138-150 my $suggestions_loop = SearchSuggestion( Link Here
138
    }
138
    }
139
);
139
);
140
140
141
foreach my $suggestion (@$suggestions_loop) {
142
            if ($suggestion->{budgetid}){
143
                my $bud = GetBudget( $suggestion->{budgetid} );
144
                $suggestion->{budget_name} = $bud->{budget_name} if $bud;
145
            }
146
}
147
148
my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
141
my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
149
$template->param(
142
$template->param(
150
    suggestions_loop        => $suggestions_loop,
143
    suggestions_loop        => $suggestions_loop,
(-)a/t/db_dependent/Suggestions.t (-3 / +8 lines)
Lines 18-24 Link Here
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use DateTime::Duration;
20
use DateTime::Duration;
21
use Test::More tests => 107;
21
use Test::More tests => 109;
22
use Test::Warn;
22
use Test::Warn;
23
23
24
use t::lib::Mocks;
24
use t::lib::Mocks;
Lines 26-32 use t::lib::TestBuilder; Link Here
26
26
27
use C4::Context;
27
use C4::Context;
28
use C4::Letters;
28
use C4::Letters;
29
use C4::Budgets qw( AddBudgetPeriod AddBudget );
29
use C4::Budgets qw( AddBudgetPeriod AddBudget GetBudget );
30
use Koha::Database;
30
use Koha::Database;
31
use Koha::DateUtils qw( dt_from_string output_pref );
31
use Koha::DateUtils qw( dt_from_string output_pref );
32
use Koha::Libraries;
32
use Koha::Libraries;
Lines 369-374 $search_suggestion = SearchSuggestion({ Link Here
369
});
369
});
370
is( @$search_suggestion, 3, 'SearchSuggestion (budgetid = "__ANY__") returns the correct number of suggestions' );
370
is( @$search_suggestion, 3, 'SearchSuggestion (budgetid = "__ANY__") returns the correct number of suggestions' );
371
371
372
$search_suggestion = SearchSuggestion({ budgetid => $budget_id });
373
is( @$search_suggestion[0]->{budget_name}, GetBudget($budget_id)->{budget_name}, 'SearchSuggestion returns the correct budget name');
374
$search_suggestion = SearchSuggestion({ budgetid => "__NONE__" });
375
is( @$search_suggestion[0]->{budget_name}, undef, 'SearchSuggestion returns the correct budget name');
376
377
372
my $del_suggestion = {
378
my $del_suggestion = {
373
    title => 'my deleted title',
379
    title => 'my deleted title',
374
    STATUS => 'CHECKED',
380
    STATUS => 'CHECKED',
375
- 

Return to bug 4833