Bugzilla – Attachment 10244 Details for
Bug 8240
There is dead code in orderreceive.tt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8240: Remove dead code from orderreceive
0001-Bug-8240-Remove-dead-code-from-orderreceive.patch (text/plain), 10.84 KB, created by
Jonathan Druart
on 2012-06-12 07:50:49 UTC
(
hide
)
Description:
Bug 8240: Remove dead code from orderreceive
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2012-06-12 07:50:49 UTC
Size:
10.84 KB
patch
obsolete
>From 06c62b4e2fd5fc6c64095f798267989a0958a576 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 12 Jun 2012 09:50:27 +0200 >Subject: [PATCH 1/1] Bug 8240: Remove dead code from orderreceive > >--- > acqui/orderreceive.pl | 199 +++++++++----------- > .../prog/en/modules/acqui/orderreceive.tt | 23 +--- > 2 files changed, 92 insertions(+), 130 deletions(-) > >diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl >index 1ea0bd1..691f0de 100755 >--- a/acqui/orderreceive.pl >+++ b/acqui/orderreceive.pl >@@ -108,122 +108,105 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >-my $count = scalar @$results; >-# prepare the form for receiving >-if ( $count == 1 ) { >- my $order = $results->[0]; >- >- # Check if ACQ framework exists >- my $acq_fw = GetMarcStructure(1, 'ACQ'); >- unless($acq_fw) { >- $template->param('NoACQframework' => 1); >- } >- >- my $AcqCreateItem = C4::Context->preference('AcqCreateItem'); >- if ($AcqCreateItem eq 'receiving') { >- $template->param( >- AcqCreateItemReceiving => 1, >- UniqueItemFields => C4::Context->preference('UniqueItemFields'), >- ); >- } elsif ($AcqCreateItem eq 'ordering') { >- my $fw = ($acq_fw) ? 'ACQ' : ''; >- my @itemnumbers = GetItemnumbersFromOrder($order->{ordernumber}); >- my @items; >- foreach (@itemnumbers) { >- my $item = GetItem($_); >- if($item->{homebranch}) { >- $item->{homebranchname} = GetBranchName($item->{homebranch}); >- } >- if($item->{holdingbranch}) { >- $item->{holdingbranchname} = GetBranchName($item->{holdingbranch}); >- } >- if(my $code = GetAuthValCode("items.notforloan", $fw)) { >- $item->{notforloan} = GetKohaAuthorisedValueLib($code, $item->{notforloan}); >- } >- if(my $code = GetAuthValCode("items.restricted", $fw)) { >- $item->{restricted} = GetKohaAuthorisedValueLib($code, $item->{restricted}); >- } >- if(my $code = GetAuthValCode("items.location", $fw)) { >- $item->{location} = GetKohaAuthorisedValueLib($code, $item->{location}); >- } >- if(my $code = GetAuthValCode("items.ccode", $fw)) { >- $item->{collection} = GetKohaAuthorisedValueLib($code, $item->{ccode}); >- } >- if(my $code = GetAuthValCode("items.materials", $fw)) { >- $item->{materials} = GetKohaAuthorisedValueLib($code, $item->{materials}); >- } >- my $itemtype = getitemtypeinfo($item->{itype}); >- $item->{itemtype} = $itemtype->{description}; >- push @items, $item; >- } >- $template->param(items => \@items); >- } >- >- if ( $order->{'unitprice'} == 0 ) { >- $order->{'unitprice'} = ''; >- } >- >- my $suggestion = GetSuggestionInfoFromBiblionumber($order->{'biblionumber'}); >+unless ( @$results ) { >+ output_html_with_http_headers $input, $cookie, $template->output; >+ exit; >+} > >- my $authorisedby = $order->{'authorisedby'}; >- my $member = GetMember( borrowernumber => $authorisedby ); >+# prepare the form for receiving >+my $order = $results->[0]; > >- my $budget = GetBudget( $order->{'budget_id'} ); >+# Check if ACQ framework exists >+my $acq_fw = GetMarcStructure(1, 'ACQ'); >+unless($acq_fw) { >+ $template->param('NoACQframework' => 1); >+} > >+my $AcqCreateItem = C4::Context->preference('AcqCreateItem'); >+if ($AcqCreateItem eq 'receiving') { > $template->param( >- AcqCreateItem => $AcqCreateItem, >- count => 1, >- biblionumber => $order->{'biblionumber'}, >- ordernumber => $order->{'ordernumber'}, >- biblioitemnumber => $order->{'biblioitemnumber'}, >- booksellerid => $order->{'booksellerid'}, >- freight => $freight, >- gst => $gst, >- name => $bookseller->{'name'}, >- date => format_date($order->{entrydate}), >- title => $order->{'title'}, >- author => $order->{'author'}, >- copyrightdate => $order->{'copyrightdate'}, >- isbn => $order->{'isbn'}, >- seriestitle => $order->{'seriestitle'}, >- bookfund => $budget->{budget_name}, >- quantity => $order->{'quantity'}, >- quantityreceivedplus1 => $order->{'quantityreceived'} + 1, >- quantityreceived => $order->{'quantityreceived'}, >- rrp => $order->{'rrp'}, >- ecost => $order->{'ecost'}, >- unitprice => $order->{'unitprice'}, >- memberfirstname => $member->{firstname} || "", >- membersurname => $member->{surname} || "", >- invoice => $invoice, >- datereceived => $datereceived->output(), >- datereceived_iso => $datereceived->output('iso'), >- notes => $order->{notes}, >- suggestionid => $suggestion->{suggestionid}, >- surnamesuggestedby => $suggestion->{surnamesuggestedby}, >- firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, >+ AcqCreateItemReceiving => 1, >+ UniqueItemFields => C4::Context->preference('UniqueItemFields'), > ); >-} >-else { >- my @loop; >- for ( my $i = 0 ; $i < $count ; $i++ ) { >- my %line = %{ @$results[$i] }; >- >- $line{invoice} = $invoice; >- $line{datereceived} = $datereceived->output(); >- $line{freight} = $freight; >- $line{gst} = $gst; >- $line{title} = @$results[$i]->{'title'}; >- $line{author} = @$results[$i]->{'author'}; >- $line{booksellerid} = $booksellerid; >- push @loop, \%line; >+} elsif ($AcqCreateItem eq 'ordering') { >+ my $fw = ($acq_fw) ? 'ACQ' : ''; >+ my @itemnumbers = GetItemnumbersFromOrder($order->{ordernumber}); >+ my @items; >+ foreach (@itemnumbers) { >+ my $item = GetItem($_); >+ if($item->{homebranch}) { >+ $item->{homebranchname} = GetBranchName($item->{homebranch}); >+ } >+ if($item->{holdingbranch}) { >+ $item->{holdingbranchname} = GetBranchName($item->{holdingbranch}); >+ } >+ if(my $code = GetAuthValCode("items.notforloan", $fw)) { >+ $item->{notforloan} = GetKohaAuthorisedValueLib($code, $item->{notforloan}); >+ } >+ if(my $code = GetAuthValCode("items.restricted", $fw)) { >+ $item->{restricted} = GetKohaAuthorisedValueLib($code, $item->{restricted}); >+ } >+ if(my $code = GetAuthValCode("items.location", $fw)) { >+ $item->{location} = GetKohaAuthorisedValueLib($code, $item->{location}); >+ } >+ if(my $code = GetAuthValCode("items.ccode", $fw)) { >+ $item->{collection} = GetKohaAuthorisedValueLib($code, $item->{ccode}); >+ } >+ if(my $code = GetAuthValCode("items.materials", $fw)) { >+ $item->{materials} = GetKohaAuthorisedValueLib($code, $item->{materials}); >+ } >+ my $itemtype = getitemtypeinfo($item->{itype}); >+ $item->{itemtype} = $itemtype->{description}; >+ push @items, $item; > } >+ $template->param(items => \@items); >+} > >- $template->param( >- loop => \@loop, >- booksellerid => $booksellerid, >- ); >+if ( $order->{'unitprice'} == 0 ) { >+ $order->{'unitprice'} = ''; > } >+ >+my $suggestion = GetSuggestionInfoFromBiblionumber($order->{'biblionumber'}); >+ >+my $authorisedby = $order->{'authorisedby'}; >+my $member = GetMember( borrowernumber => $authorisedby ); >+ >+my $budget = GetBudget( $order->{'budget_id'} ); >+ >+$template->param( >+ AcqCreateItem => $AcqCreateItem, >+ count => 1, >+ biblionumber => $order->{'biblionumber'}, >+ ordernumber => $order->{'ordernumber'}, >+ biblioitemnumber => $order->{'biblioitemnumber'}, >+ booksellerid => $order->{'booksellerid'}, >+ freight => $freight, >+ gst => $gst, >+ name => $bookseller->{'name'}, >+ date => format_date($order->{entrydate}), >+ title => $order->{'title'}, >+ author => $order->{'author'}, >+ copyrightdate => $order->{'copyrightdate'}, >+ isbn => $order->{'isbn'}, >+ seriestitle => $order->{'seriestitle'}, >+ bookfund => $budget->{budget_name}, >+ quantity => $order->{'quantity'}, >+ quantityreceivedplus1 => $order->{'quantityreceived'} + 1, >+ quantityreceived => $order->{'quantityreceived'}, >+ rrp => $order->{'rrp'}, >+ ecost => $order->{'ecost'}, >+ unitprice => $order->{'unitprice'}, >+ memberfirstname => $member->{firstname} || "", >+ membersurname => $member->{surname} || "", >+ invoice => $invoice, >+ datereceived => $datereceived->output(), >+ datereceived_iso => $datereceived->output('iso'), >+ notes => $order->{notes}, >+ suggestionid => $suggestion->{suggestionid}, >+ surnamesuggestedby => $suggestion->{surnamesuggestedby}, >+ firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, >+); >+ > my $op = $input->param('op'); > if ($op and $op eq 'edit'){ > $template->param(edit => 1); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 821dcd3..fcf12eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -305,28 +305,7 @@ > <a class="cancel" href="/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% supplierid %]&invoice=[% invoice %]&gst=[% gst %]&freight=[% freight %]">Cancel</a> > </fieldset></div> </form> > [% ELSE %] >-<div id="acqui_acquire_orderlist"> >- <table> >- <tr> >- <th>Basket</th> >- <th>ISBN</th> >- <th>Title</th> >- <th>Author</th> >- <th>Qty</th> >- <th>Received</th> >- </tr> >- [% FOREACH loo IN loop %] >- <tr> >- <td>[% loo.basketno %]</td> >- <td>[% loo.isbn %]</td> >- <td><a href="orderreceive.pl?datereceived=[% loo.datereceived %]&receive=[% loo.ordernumber %]&biblio=[% loo.biblionumber %]&invoice=[% loo.invoice %]&freight=[% loo.freight %]&gst=[% loo.gst %]&id=[% loo.id %]">[% loo.title |html %]</a></td> >- <td>[% loo.author %]</td> >- <td>[% loo.quantity %]</td> >- <td>[% loo.quantityreceived %]</td> >- </tr> >- [% END %] >- </table> >-</div> >+ This ordernumber does not exist. > [% END %] > > </div> >-- >1.7.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8240
:
10244
|
10329
|
10479
|
11768
|
12816
|
12943
|
13904