From 615da41a94324b7f706cba144a6fc62f944f7b86 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 16 Sep 2013 12:45:52 +0200 Subject: [PATCH] Bug 7180: Remove useless rrp variable --- acqui/addorderiso2709.pl | 6 +----- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 6cd61b9..026a780 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -160,7 +160,6 @@ if ($op eq ""){ my @quantities = $input->param('quantity'); my @prices = $input->param('price'); my @budgets_id = $input->param('budget_id'); - my @rrp = $input->param('rrp'); my @discount = $input->param('discount'); my @sort1 = $input->param('sort1'); my @sort2 = $input->param('sort2'); @@ -174,7 +173,6 @@ if ($op eq ""){ my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0; my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1; my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id; - my $c_rrp = shift( @rrp ); # rrp include tax my $c_discount = shift ( @discount); $c_discount = $c_discount / 100 if $c_discount > 100; my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || ''; @@ -406,11 +404,10 @@ sub import_biblios_list { ); my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} ); my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information"; - my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'rrp', 'discount', 'sort1', 'sort2']); + my $infos = get_infos_syspref($marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']); my $price = $infos->{price}; my $quantity = $infos->{quantity}; my $budget_code = $infos->{budget_code}; - my $rrp = $infos->{rrp}; my $discount = $infos->{discount}; my $sort1 = $infos->{sort1}; my $sort2 = $infos->{sort2}; @@ -424,7 +421,6 @@ sub import_biblios_list { $cellrecord{price} = $price || ''; $cellrecord{quantity} = $quantity || ''; $cellrecord{budget_id} = $budget_id || ''; - $cellrecord{rrp} = $rrp || ''; $cellrecord{discount} = $discount || ''; $cellrecord{sort1} = $sort1 || ''; $cellrecord{sort2} = $sort2 || ''; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index d604e0f..ec3279f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -170,7 +170,6 @@ -
  1. -- 1.7.10.4