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

(-)a/acqui/addorderiso2709.pl (-5 / +1 lines)
Lines 160-166 if ($op eq ""){ Link Here
160
    my @quantities = $input->param('quantity');
160
    my @quantities = $input->param('quantity');
161
    my @prices = $input->param('price');
161
    my @prices = $input->param('price');
162
    my @budgets_id = $input->param('budget_id');
162
    my @budgets_id = $input->param('budget_id');
163
    my @rrp = $input->param('rrp');
164
    my @discount = $input->param('discount');
163
    my @discount = $input->param('discount');
165
    my @sort1 = $input->param('sort1');
164
    my @sort1 = $input->param('sort1');
166
    my @sort2 = $input->param('sort2');
165
    my @sort2 = $input->param('sort2');
Lines 174-180 if ($op eq ""){ Link Here
174
        my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
173
        my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0;
175
        my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
174
        my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
176
        my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
175
        my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
177
        my $c_rrp = shift( @rrp ); # rrp include tax
178
        my $c_discount = shift ( @discount);
176
        my $c_discount = shift ( @discount);
179
        $c_discount = $c_discount / 100 if $c_discount > 100;
177
        $c_discount = $c_discount / 100 if $c_discount > 100;
180
        my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
178
        my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
Lines 406-416 sub import_biblios_list { Link Here
406
        );
404
        );
407
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
405
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
408
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
406
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
409
        my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'rrp', 'discount', 'sort1', 'sort2']);
407
        my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']);
410
        my $price = $infos->{price};
408
        my $price = $infos->{price};
411
        my $quantity = $infos->{quantity};
409
        my $quantity = $infos->{quantity};
412
        my $budget_code = $infos->{budget_code};
410
        my $budget_code = $infos->{budget_code};
413
        my $rrp = $infos->{rrp};
414
        my $discount = $infos->{discount};
411
        my $discount = $infos->{discount};
415
        my $sort1 = $infos->{sort1};
412
        my $sort1 = $infos->{sort1};
416
        my $sort2 = $infos->{sort2};
413
        my $sort2 = $infos->{sort2};
Lines 424-430 sub import_biblios_list { Link Here
424
        $cellrecord{price} = $price || '';
421
        $cellrecord{price} = $price || '';
425
        $cellrecord{quantity} = $quantity || '';
422
        $cellrecord{quantity} = $quantity || '';
426
        $cellrecord{budget_id} = $budget_id || '';
423
        $cellrecord{budget_id} = $budget_id || '';
427
        $cellrecord{rrp} = $rrp || '';
428
        $cellrecord{discount} = $discount || '';
424
        $cellrecord{discount} = $discount || '';
429
        $cellrecord{sort1} = $sort1 || '';
425
        $cellrecord{sort1} = $sort1 || '';
430
        $cellrecord{sort2} = $sort2 || '';
426
        $cellrecord{sort2} = $sort2 || '';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-2 lines)
Lines 170-176 Link Here
170
170
171
171
172
                          </legend>
172
                          </legend>
173
                          <input type="hidden" value="[% biblio.rrp %]" name="rrp" />
174
                          <ol>
173
                          <ol>
175
                            <li class="status">
174
                            <li class="status">
176
                              <span class="match">
175
                              <span class="match">
177
- 

Return to bug 7180