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

(-)a/acqui/addorderiso2709.pl (-4 / +15 lines)
Lines 210-217 if ($op eq ""){ Link Here
210
        }
210
        }
211
        if ($price){
211
        if ($price){
212
            $orderinfo{'listprice'} = $price;
212
            $orderinfo{'listprice'} = $price;
213
            eval "use C4::Acquisition qw/GetBasket/;";
213
            eval {
214
            eval "use C4::Bookseller qw/GetBookSellerFromId/;";
214
		require C4::Acquisition;
215
		import C4::Acquisition qw/GetBasket/;
216
	    };
217
	    if ($@){
218
		croak $@;
219
	    }
220
            eval {
221
		require C4::Bookseller;
222
	        import C4::Bookseller qw/GetBookSellerFromId/;
223
	    };
224
	    if ($@){
225
		croak $@;
226
	    }
215
            my $basket     = GetBasket( $orderinfo{basketno} );
227
            my $basket     = GetBasket( $orderinfo{basketno} );
216
            my $bookseller = GetBookSellerFromId( $basket->{booksellerid} );
228
            my $bookseller = GetBookSellerFromId( $basket->{booksellerid} );
217
            my $gst        = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
229
            my $gst        = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
Lines 265-271 my $budget = GetBudget($budget_id); Link Here
265
277
266
# build budget list
278
# build budget list
267
my $budget_loop = [];
279
my $budget_loop = [];
268
my $budgets = GetBudgetHierarchy( q{}, $borrower->{branchcode}, $borrower->{borrowernumber} );
280
$budgets = GetBudgetHierarchy( q{}, $borrower->{branchcode}, $borrower->{borrowernumber} );
269
foreach my $r ( @{$budgets} ) {
281
foreach my $r ( @{$budgets} ) {
270
    if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
282
    if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
271
        next;
283
        next;
272
- 

Return to bug 6679