From cfa9223cd1f1fd087f1f05bcad832708c0967631 Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 12 Aug 2004 14:35:22 +0000 Subject: [PATCH] * updates to make acquisition compatible with suggestions & serials * changes to use supplierid instead of id, that's easier to read. --- acqui/acquire.pl | 84 ++++++------- acqui/addorder.pl | 24 ++-- acqui/basket.pl | 11 +- acqui/finishreceive.pl | 92 +++------------ acqui/newbasket2.pl | 15 +-- acqui/newbiblio.pl | 12 +- acqui/order.pl | 2 +- acqui/receive.pl | 10 +- acqui/recieveorder.pl | 6 +- acqui/suggestion-select.pl | 2 +- acqui/supplier.pl | 2 +- .../default/en/acqui/acquire.tmpl | 110 +++++++----------- .../default/en/acqui/newbasket2.tmpl | 21 +--- .../intranet-tmpl/default/en/acqui/order.tmpl | 27 +---- .../default/en/acqui/recieve.tmpl | 4 +- .../default/en/acqui/recieveorder.tmpl | 4 +- .../default/en/acqui/suggestion-select.tmpl | 6 +- 17 files changed, 161 insertions(+), 271 deletions(-) diff --git a/acqui/acquire.pl b/acqui/acquire.pl index 98d6932f74..2b8b49d824 100755 --- a/acqui/acquire.pl +++ b/acqui/acquire.pl @@ -36,7 +36,7 @@ use HTML::Template; use C4::Date; my $input=new CGI; -my $id=$input->param('id'); +my $supplierid=$input->param('supplierid'); my $dbh = C4::Context->dbh; my $search=$input->param('recieve'); @@ -45,7 +45,8 @@ my $freight=$input->param('freight'); my $biblio=$input->param('biblio'); my $catview=$input->param('catview'); my $gst=$input->param('gst'); -my ($count,@results)=ordersearch($search,$id,$biblio,$catview); +my ($count,@results)=ordersearch($search,$supplierid,$biblio,$catview); +warn "C:$count for ordersearch($search,$supplierid,$biblio,$catview);"; my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'}); my $date = $results[0]->{'entrydate'}; @@ -60,24 +61,25 @@ my ($template, $loggedinuser, $cookie) $template->param($count); if ($count == 1){ - my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description"); - $sth->execute; - my @itemtype; - my %itemtypes; - push @itemtype, ""; - $itemtypes{''} = "Please choose"; - while (my ($value,$lib) = $sth->fetchrow_array) { - push @itemtype, $value; - $itemtypes{$value}=$lib; - } - - my $CGIitemtype=CGI::scrolling_list( -name => 'format', - -values => \@itemtype, - -default => $results[0]->{'itemtype'}, - -labels => \%itemtypes, - -size => 1, - -multiple => 0 ); - $sth->finish; + my $sth; +# my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description"); +# $sth->execute; +# my @itemtype; +# my %itemtypes; +# push @itemtype, ""; +# $itemtypes{''} = "Please choose"; +# while (my ($value,$lib) = $sth->fetchrow_array) { +# push @itemtype, $value; +# $itemtypes{$value}=$lib; +# } +# +# my $CGIitemtype=CGI::scrolling_list( -name => 'format', +# -values => \@itemtype, +# -default => $results[0]->{'itemtype'}, +# -labels => \%itemtypes, +# -size => 1, +# -multiple => 0 ); +# $sth->finish; my @branches; my @select_branch; @@ -93,7 +95,6 @@ if ($count == 1){ -labels => \%select_branches, -size => 1, -multiple => 0 ); - $sth->finish; my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0; # See whether barcodes should be automatically allocated. @@ -107,22 +108,21 @@ if ($count == 1){ $sth->finish; } - my @bookfund; - my @select_bookfund; - my %select_bookfunds; - ($count2,@bookfund)=bookfunds(); - for (my $i=0;$i<$count2;$i++){ - push @select_bookfund, $bookfund[$i]->{'bookfundid'}; - $select_bookfunds{$bookfund[$i]->{'bookfundid'}} = $bookfund[$i]->{'bookfundname'} - } - my $CGIbookfund=CGI::scrolling_list( -name => 'bookfund', - -values => \@select_bookfund, - -default => $results[0]->{'bookfundid'}, - -labels => \%select_bookfunds, - -size => 1, - -multiple => 0 ); +# my @bookfund; +# my @select_bookfund; +# my %select_bookfunds; +# ($count2,@bookfund)=bookfunds(); +# for (my $i=0;$i<$count2;$i++){ +# push @select_bookfund, $bookfund[$i]->{'bookfundid'}; +# $select_bookfunds{$bookfund[$i]->{'bookfundid'}} = $bookfund[$i]->{'bookfundname'} +# } +# my $CGIbookfund=CGI::scrolling_list( -name => 'bookfund', +# -values => \@select_bookfund, +# -default => $results[0]->{'bookfundid'}, +# -labels => \%select_bookfunds, +# -size => 1, +# -multiple => 0 ); - my $rrp=$results[0]->{'rrp'}; if ($results[0]->{'quantityreceived'} == 0){ $results[0]->{'quantityreceived'}=''; } @@ -134,7 +134,7 @@ if ($count == 1){ biblionumber => $results[0]->{'biblionumber'}, ordernumber => $results[0]->{'ordernumber'}, biblioitemnumber => $results[0]->{'biblioitemnumber'}, - booksellerid => $results[0]->{'booksellerid'}, + supplierid => $results[0]->{'booksellerid'}, freight => $freight, gst => $gst, catview => ($catview ne 'yes'?1:0), @@ -143,15 +143,15 @@ if ($count == 1){ title => $results[0]->{'title'}, author => $results[0]->{'author'}, copyrightdate => format_date($results[0]->{'copyrightdate'}), - CGIitemtype => $CGIitemtype, + itemtype => $results[0]->{'itemtype'}, CGIbranch => $CGIbranch, isbn => $results[0]->{'isbn'}, seriestitle => $results[0]->{'seriestitle'}, barcode => $barcode, - CGIbookfund => $CGIbookfund, + bookfund => $results[0]->{'bookfundid'}, quantity => $results[0]->{'quantity'}, quantityreceived => $results[0]->{'quantityreceived'}, - rrp => $rrp, + rrp => $results[0]->{'rrp'}, ecost => $results[0]->{'ecost'}, unitprice => $results[0]->{'unitprice'}, invoice => $invoice, @@ -172,13 +172,13 @@ if ($count == 1){ $line{gst} = $gst; $line{title} = $results[$i]->{'title'}; $line{author} = $results[$i]->{'author'}; - $line{id} = $id; + $line{supplierid} = $supplierid; push @loop,\%line; } $template->param( loop => \@loop, date => format_date($date), name => $booksellers[0]->{'name'}, - id => $id, + supplierid => $supplierid, invoice => $invoice, ); diff --git a/acqui/addorder.pl b/acqui/addorder.pl index e7a9401d20..58c69630d9 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -107,18 +107,18 @@ if ($quantity ne '0'){ } else { $bibnum=$input->param('biblio'); $bibitemnum=$input->param('bibitemnum'); - my $oldtype=$input->param('oldtype'); - &modbibitem({biblioitemnumber => $bibitemnum, - isbn => $isbn, - publishercode => $publishercode, - }); - &modbiblio({ - biblionumber => $bibnum, - title => $title?$title:"", - author => $author?$author:"", - copyrightdate => $copyrightdate?$copyrightdate:"", - series => $series?$series:"" }, - ); +# my $oldtype=$input->param('oldtype'); +# &modbibitem({biblioitemnumber => $bibitemnum, +# isbn => $isbn, +# publishercode => $publishercode, +# }); +# &modbiblio({ +# biblionumber => $bibnum, +# title => $title?$title:"", +# author => $author?$author:"", +# copyrightdate => $copyrightdate?$copyrightdate:"", +# series => $series?$series:"" }, +# ); } if ($ordnum) { modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2); diff --git a/acqui/basket.pl b/acqui/basket.pl index 9d41fa838f..8bff880841 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -26,7 +26,6 @@ use strict; use C4::Auth; use C4::Koha; -# use C4::Biblio; use C4::Output; use CGI; use C4::Interface::CGI::Output; @@ -37,7 +36,7 @@ use C4::Date; my $query =new CGI; my $basketno = $query ->param('basket'); -my $supplierid = $query->param('id'); +my $booksellerid = $query->param('supplierid'); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "acqui/basket.tmpl", query => $query, @@ -48,9 +47,13 @@ my ($template, $loggedinuser, $cookie) }); my ($count,@results); -my ($count2,@booksellers)=bookseller($supplierid); - my $basket = getbasket($basketno); +# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket +# if no booksellerid in parameter, get it from basket +warn "=>".$basket->{booksellerid}; +$booksellerid = $basket->{booksellerid} unless $booksellerid; +my ($count2,@booksellers)=bookseller($booksellerid); + # if new basket, pre-fill infos $basket->{creationdate} = "" unless ($basket->{creationdate}); $basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby}); diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index dd351a3307..11cccb7f88 100755 --- a/acqui/finishreceive.pl +++ b/acqui/finishreceive.pl @@ -21,6 +21,7 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +use strict; use C4::Output; use C4::Acquisition; use C4::Biblio; @@ -31,104 +32,37 @@ my $input=new CGI; my $user=$input->remote_user; my $biblionumber = $input->param('biblio'); +my $bibitemno=$input->param('biblioitemnum'); my $ordnum=$input->param('ordnum'); my $quantrec=$input->param('quantityrec'); my $quantity=$input->param('quantity'); -my $notes=$input->param('notes'); my $cost=$input->param('cost'); my $invoiceno=$input->param('invoice'); -my $bibitemno=$input->param('biblioitemnum'); -my $data=bibitemdata($bibitemno); -my $publisher=$data->{'publishercode'}; -my $pubdate=$data->{'publicationdate'}; -my $class=$data->{'classification'}; -my $dewey=$data->{'dewey'}; -my $subclass=$data->{'subclass'}; - -my $size=$data->{'size'}; -my $illus=$data->{'illus'}; -my $pages=$data->{'pages'}; my $replacement=$input->param('rrp'); +my $gst=$input->param('gst'); +my $freight=$input->param('freight'); +my $supplierid = $input->param('supplierid'); my $branch=$input->param('branch'); -my $bookfund=$input->param('bookfund'); -my $itemtype=$input->param('format'); -my $isbn=$input->param('ISBN'); -my $biblio = { - biblionumber => $biblionumber, - title => $input->param('title')?$input->param('title'):"", - author => $input->param('author')?$input->param('author'):"", - copyrightdate => $input->param('copyright')?$input->param('copyright'):"", - series => $input->param('Series')?$input->param('Series'):"" -}; # my $biblio if ($quantrec != 0){ $cost /= $quantrec; } -my $gst=$input->param('gst'); -my $freight=$input->param('freight'); -my $volinf=$input->param('volinf'); -my $id = $input->param('id'); -my $loan=0; -if ($itemtype =~ /REF/){ - $loan=1; -} - -if ($itemtype =~ /PER/){ - $class="Periodical"; - $bibitemno = &newbiblioitem({ - biblionumber => $biblionumber, - itemtype => $itemtype?$itemtype:"", - isbn => $isbn?$isbn:"", - volumeddesc => $volinf?$volinf:"", - classification => $class?$class:"" }); -} -if ($quantity != 0){ -# warn "receive : $biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund"; - receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund); - modbiblio($biblio); - &modbibitem({ - biblioitemnumber => $bibitemno, - biblionumber => $biblionumber, - itemtype => $itemtype?$itemtype:"", - isbn => $isbn?$isbn:"", - publisher => $publisher?$publisher:"", - publicationyear => $pubdate?$pubdate:"", - class => $class?$class:"", - dewey => $dewey?$dewey:"", - subclass => $subclass?$subclass:"", - illus => $illus?$illus:"", - pages => $pages?$pages:"", - volumeddesc => $volinf?$volinf:"", - notes => $notes?$notes:"", - size => $size?$size:"" }); +if ($quantity != 0) { + # save the quantity recieved. + receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$freight,$replacement); + # create items if the user has entered barcodes my $barcode=$input->param('barcode'); - my @barcodes; -# if ($barcode =~ /\,/){ - @barcodes=split(/\,| |\|/,$barcode); -# }elsif ($barcode =~ /\|/){ -# @barcodes=split(/\|/,$barcode); -# } else { -# $barcodes[0]=$barcode; -# } + my @barcodes=split(/\,| |\|/,$barcode); my ($error) = newitems({ biblioitemnumber => $bibitemno, biblionumber => $biblionumber, replacementprice => $replacement, price => $cost, - booksellerid => $id, + booksellerid => $supplierid, homebranch => $branch, - loan => $loan }, + loan => 0 }, @barcodes); - if ($error eq ''){ - if ($itemtype ne 'PER'){ - print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&id=$id&freight=$freight&gst=$gst"); - } else { - print $input->redirect("/acquisitions/"); - } - } else { - print $input->header; - print $error; - } + print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst"); } else { print $input->header; delorder($biblionumber,$ordnum); diff --git a/acqui/newbasket2.pl b/acqui/newbasket2.pl index 19aaea0e2a..981bad23fe 100755 --- a/acqui/newbasket2.pl +++ b/acqui/newbasket2.pl @@ -61,15 +61,11 @@ my $num=$input->param('num'); if ($num eq ''){ $num=10; } -my $id=$input->param('id'); +my $booksellerid=$input->param('booksellerid'); my $basket=$input->param('basket'); my $sub=$input->param('sub'); -my $donation; -if ($id == 72){ - $donation='yes'; -} #print $sub; -my ($count,@booksellers)=bookseller($id); +my ($count,@booksellers)=bookseller($booksellerid); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "acqui/newbasket2.tmpl", query => $input, @@ -83,7 +79,6 @@ my ($template, $loggedinuser, $cookie) #print startpage(); #print startmenu('acquisitions'); -my $testdonation = ($donation ne 'yes'); #tests if donation = true if ($keyword ne ''){ ($count,@results)=KeywordSearch(undef,'intra',\%search,$num,$offset); } elsif ($search{'front'} ne '') { @@ -221,7 +216,7 @@ while ($i < $count2){ $lineres{author2}=$author2; $lineres{title2}=$title2; $lineres{copyright}=$result->{'copyrightdate'}; - $lineres{id}=$id; + $lineres{booksellerid}=$booksellerid; $lineres{basket}=$basket; $lineres{sub}=$sub; $lineres{biblionumber}=$result->{biblionumber}; @@ -237,10 +232,9 @@ while ($i < $count2){ $offset=$num+$offset; $template->param( bookselname => $booksellers[0]->{'name'}, - id => $id, + booksellerid => $booksellerid, basket => $basket, parsub => $sub, - testdonation => $testdonation, count => $count, offset2 =>$offset2, dispnum => $dispnum, @@ -248,7 +242,6 @@ $template->param( bookselname => $booksellers[0]->{'name'}, num => $num, offset => $offset, type => $type, - id => $id, basket => $basket, title => $title, author => $author, diff --git a/acqui/newbiblio.pl b/acqui/newbiblio.pl index 757c451456..c836b9e790 100755 --- a/acqui/newbiblio.pl +++ b/acqui/newbiblio.pl @@ -49,11 +49,17 @@ my $dbh = C4::Context->dbh; if ($ordnum eq ''){ # create order $new='yes'; # $ordnum=newordernum; - if ($biblio) { + if ($biblio && !$suggestionid) { $data=bibdata($biblio); } - if ($suggestionid) { # get suggestion fields if applicable. - $data = getsuggestion($suggestionid); + # get suggestion fields if applicable. If it's a subscription renewal, then the biblio already exists + # otherwise, retrieve suggestion information. + if ($suggestionid) { + if ($biblio) { + $data=bibdata($biblio); + } else { + $data = getsuggestion($suggestionid); + } } if ($data->{'title'} eq ''){ $data->{'title'}=$title; diff --git a/acqui/order.pl b/acqui/order.pl index 7d8acf8d3d..5931c62b40 100755 --- a/acqui/order.pl +++ b/acqui/order.pl @@ -54,7 +54,7 @@ if ($op eq 'close') { closebasket($basket); } -#build reult page +#build result page my $toggle=0; my @loop_suppliers; for (my $i=0; $i<$count; $i++) { diff --git a/acqui/receive.pl b/acqui/receive.pl index 16e2fd1af9..50ab147193 100755 --- a/acqui/receive.pl +++ b/acqui/receive.pl @@ -34,8 +34,8 @@ use HTML::Template; use strict; my $input=new CGI; -my $id=$input->param('id'); -my ($count,@booksellers)=bookseller($id); +my $supplierid=$input->param('supplierid'); +my ($count,@booksellers)=bookseller($supplierid); my $invoice=$input->param('invoice'); my $freight=$input->param('freight'); my $gst=$input->param('gst'); @@ -53,7 +53,7 @@ my ($template, $loggedinuser, $cookie) my @results; ($count,@results)=invoice($invoice); if ($invoice eq ''){ - ($count,@results)=getallorders($id); + ($count,@results)=getallorders($supplierid); } my $totalprice=0; my $totalfreight=0; @@ -84,7 +84,7 @@ for (my$i=0;$i<$count;$i++){ $line{unitprice} = $results[$i]->{'unitprice'}; $line{quantityrecieved} = $results[$i]->{'quantityreceived'}; $line{total} = $total; - $line{id} = $id; + $line{supplierid} = $supplierid; push @loop_orders, \%line; $totalprice+=$results[$i]->{'unitprice'}; $totalfreight+=$results[$i]->{'freight'}; @@ -98,7 +98,7 @@ $tototal=$tototal+$freight; $template->param(invoice => $invoice, date => $date, name => $booksellers[0]->{'name'}, - id => $id, + supplierid => $supplierid, gst => $gst, freight => $freight, invoice => $invoice, diff --git a/acqui/recieveorder.pl b/acqui/recieveorder.pl index 302df0f2ff..024c4f8d2f 100755 --- a/acqui/recieveorder.pl +++ b/acqui/recieveorder.pl @@ -32,8 +32,8 @@ use HTML::Template; use C4::Acquisition; my $input=new CGI; -my $id=$input->param('id'); -my ($count,@booksellers)=bookseller($id); +my $supplierid=$input->param('supplierid'); +my ($count,@booksellers)=bookseller($supplierid); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "acqui/recieveorder.tmpl", @@ -46,7 +46,7 @@ my ($template, $loggedinuser, $cookie) $template->param( name => $booksellers[0]->{'name'}, - id => $id, + supplierid => $supplierid, ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/acqui/suggestion-select.pl b/acqui/suggestion-select.pl index d2ec8a738a..a00a8ad987 100755 --- a/acqui/suggestion-select.pl +++ b/acqui/suggestion-select.pl @@ -11,7 +11,7 @@ use C4::Suggestions; my $input = new CGI; my $basketid = $input->param('basket'); -my $supplierid = $input->param('id'); +my $supplierid = $input->param('booksellerid'); my $title = $input->param('title'); my $author = $input->param('author'); diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 4df003f177..e8c872b906 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -34,7 +34,7 @@ use HTML::Template; use strict; my $query=new CGI; -my $id=$query->param('id'); +my $id=$query->param('supplierid'); my ($count,@booksellers)=bookseller($id); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "acqui/supplier.tmpl", diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl index 247ebfe309..462345ce6e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl @@ -2,26 +2,8 @@

Receipt Summary for: Invoice

-
- Invoice:
- Received By:
- -
-

- Receive Order

Shopping Basket For: @@ -29,91 +11,89 @@

catalogue details

- - " > + +

- - " > + +

- - " > + +

- - + +

- - "> + +

- - "> + +

+

Enter barcode(s) and branch if you want to add item(s) immediatly

- +

- - "> -

-

- - -

-

- "> - "> - "> - "> - "> - "> - - - - &id="> - Edit - - + + ">

Accounting details

- - + +

- - "> + + + ">

- + ">

- + ">

- - "> + +

- + ">

- + ">

- - "> + + +

+

+ "> + "> + "> + "> + "> + "> + + + + &booksellerid="> + Edit + +

@@ -131,7 +111,7 @@ - &biblio=&invoice=&freight=&gst=&id="> + &biblio=&invoice=&freight=&gst=&supplierid="> diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl index fb6ef9d098..c3ccf1daf4 100755 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl @@ -1,18 +1,13 @@

Shopping Basket For:

- - &basket=&sub="> + &basket=&sub="> //images/filenew.png" border="0" alt="Add New Biblio"> - - &basket=&sub="> - //images/filenew.png" border="0" alt="Add New Biblio"> - "> //images/1uparrow.png" border="0" alt="View Basket">
- > + > > New Search: @@ -41,20 +36,12 @@ "> - - &author=&copyright=&id=&basket=&biblio=&title="> + &booksellerid=&basket=&biblio="> - - &copyright=&id=&basket=&biblio=&title="> - - - - &type="> - @@ -97,7 +84,7 @@ - &offset=&type=&id=&basket=&search=&author="> + &offset=&type=&booksellerid=&basket=&search=&author="> Next diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl index 24745164c2..0b34aa3bf4 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl @@ -6,41 +6,24 @@ - - > - - + "> - + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl index 0e27c0c193..518f2dd696 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl @@ -1,10 +1,10 @@
-

Receive Orders From Supplier ">

+

Receive Orders From Supplier ">

- > + >

Supplier invoice information

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl index 9edb69e4f5..840450f62b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl @@ -49,7 +49,11 @@ ,

-- 2.39.5
OrderView gapped numbers Receive Company - - - - - - - -
BasketItemsStaffDate
- +
 
- /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > + /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > Inactive - - - - Inactive - - - /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > + /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > @@ -70,6 +53,6 @@
- Add supplier + Add supplier diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl index 48c337ed83..223dc61dd1 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl @@ -11,7 +11,7 @@
- "> + "> "> "> "> @@ -37,7 +37,7 @@
&biblio=&invoice=&gst=&freight=&id=">&biblio=&invoice=&gst=&freight=&supplierid="> $ class="hilighted"> - &basket=&suggestionid=" class="button acquisition">Order + + &basket=&suggestionid=&biblio=" class="button acquisition">Order + + &basket=&suggestionid=" class="button acquisition">Order +