From d532cf3b7b6d59668be6b2cfbc39ca700d1c87bd Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 13 Feb 2003 17:27:47 +0000 Subject: [PATCH] Road to 1.9.1 * templating of normal acquisitions * some graphic changes (use of yellow color as "acquisition/cataloguin" symbol, header consistency...) * minor reordering of screens (newbasket.pl now unused) * few bugfixes When templating finished, the recieving of a book will be ended by a "calatoguing" screen. Cataloguing will be MARC cataloguing or non-MARC cataloguing, depending on "acquisitions" system parameter. --- acqui/addorder.pl | 2 +- acqui/basket.pl | 164 +++----- acqui/modorders.pl | 20 +- acqui/newbasket.pl | 90 ---- acqui/newbasket2.pl | 122 +++--- acqui/newbiblio.pl | 388 +++++------------- acqui/order.pl | 11 +- acqui/receive.pl | 168 +++----- acqui/recieveorder.pl | 67 +-- .../default/en/acqui/newbasket.tmpl | 36 ++ .../default/en/acqui/newbasket2.tmpl | 8 +- .../default/en/acqui/newbiblio.tmpl | 172 ++++++++ .../intranet-tmpl/default/en/acqui/order.tmpl | 10 +- .../default/en/acqui/recieve.tmpl | 86 ++++ .../default/en/acqui/recieveorder.tmpl | 34 ++ .../default/en/acqui/supplier.tmpl | 159 +++---- 16 files changed, 747 insertions(+), 790 deletions(-) delete mode 100755 acqui/newbasket.pl create mode 100644 koha-tmpl/intranet-tmpl/default/en/acqui/newbasket.tmpl create mode 100644 koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl create mode 100644 koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl create mode 100644 koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl diff --git a/acqui/addorder.pl b/acqui/addorder.pl index a2f7dabd35..d0aabf1502 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -98,4 +98,4 @@ if ($quantity ne '0'){ delorder($bibnum,$ordnum); } -print $input->redirect("newbasket.pl?id=$supplier&basket=$basketno"); +print $input->redirect("basket.pl?basket=$basketno"); diff --git a/acqui/basket.pl b/acqui/basket.pl index d5502f7753..8625f2c94f 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -23,117 +23,85 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +use C4::Auth; use C4::Catalogue; use C4::Biblio; use C4::Output; use CGI; +use C4::Interface::CGI::Output; +use C4::Database; +use HTML::Template; +use C4::Catalogue; use strict; -my $input=new CGI; -print $input->header(); -my $basket=$input->param('basket'); -my ($count,@results)=basket($basket); -print startpage; - -my @inp=startmenu('acquisitions'); +my $query =new CGI; +my $basket=$query ->param('basket'); +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "acqui/basket.tmpl", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => {acquisition => 1}, + debug => 1, + }); + +my ($count,@results); +if ($basket eq ''){ + $basket=newbasket(); + $results[0]->{'booksellerid'}=$query->param('id'); + $results[0]->{'authorisedby'} = $loggedinuser; +} else { + ($count,@results)=basket($basket); +} -my $count3=@inp; -for (my $i=0;$i<$count3;$i++){ - $inp[$i]=~ s/leftmargin=0 topmargin=0\>/leftmargin=0 topmargin=0 onload='update(orderform)'\>/; - } -print @inp; -# print $count; my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'}); -print < -Our Reference: $basket
-Authorised By: $results[0]->{'authorisedby'}
-$results[0]->{'entrydate'}; - -Shopping Basket For: {'booksellerid'}> $booksellers[0]->{'name'} -{'booksellerid'}&basket=$basket>Add more orders -
-
- Search ISBN, Title or Author: -
-

-

- - - - - - - - - - -printend -; - - my $line_total; # total of each line my $sub_total; # total of line totals my $gist; # GST my $grand_total; # $subttotal + $gist +my $toggle=0; +my @books_loop; for (my $i=0;$i<$count;$i++){ -my $rrp=$results[$i]->{'listprice'}; -if ($results[$i]->{'currency'} ne 'NZD'){ -$rrp=curconvert($results[$i]->{'currency'},$rrp); + my $rrp=$results[$i]->{'listprice'}; + $rrp=curconvert($results[$i]->{'currency'},$rrp); + + $line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'}; + $sub_total+=$line_total; + $gist=sprintf("%.2f",$sub_total*0.125); + $grand_total=$sub_total+$gist; + my %line; + if ($toggle==0){ + $line{color}='#ffffcc'; + $toggle=1; + } else { + $line{color}='white'; + $toggle=0; + } + $line{ordernumber} = $results[$i]->{'ordernumber'}; + $line{isbn} = $results[$i]->{'isbn'}; + $line{booksellerid} = $results[$i]->{'booksellerid'}; + $line{basket}=$basket; + $line{title} = $results[$i]->{'title'}; + $line{author} = $results[$i]->{'author'}; + $line{i} = $i; + $line{rrp} = $results[$i]->{'rrp'}; + $line{ecost} = $results[$i]->{'ecost'}; + $line{quantity} = $results[$i]->{'quantity'}; + $line{line_total} = $line_total; + $line{biblionumber} = $results[$i]->{'biblionumber'}; + push @books_loop, \%line; } - -$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'}; -$sub_total+=$line_total; -$gist=sprintf("%.2f",$sub_total*0.125); -$grand_total=$sub_total+$gist; - -print < - - - - - - - - - {'ordernumber'}> - {'biblionumber'}> - -EOP -; -} -# -print " -"; -print < - - - - - - - - - - - - - - - -
ORDERISBNTITLEAUTHORRRP\$ESTQUANTITYTOTAL
$results[$i]->{'ordernumber'}$results[$i]->{'isbn'}$results[$i]->{'title'}$results[$i]->{'author'}\$\${'quantity'} onchange='update(this.form)'>\$
- HELP
- To cancel an order, just change the quantity to 0 and click "save changes".
- To change any of the catalogue or accounting information attached to an order, click on the title.
- To add new orders to this supplier, start with a search. 		SubTotal\$
GST\$
TOTAL\$
-
-EOP - ; - -print endmenu('acquisitions'); - -print endpage; +$template->param(basket => $basket, + authorisedby => $results[0]->{'authorisedby'}, + entrydate =>$results[0]->{'entrydate'}, + id=> $results[0]->{'booksellerid'}, + name => $booksellers[0]->{'name'}, + books_loop => \@books_loop, + count =>$count, + subtotal => $sub_total, + gist => $gist, + grand_total =>$grand_total, + ); +output_html_with_http_headers $query, $cookie, $template->output; diff --git a/acqui/modorders.pl b/acqui/modorders.pl index c65d58ab7d..925ba2a5af 100755 --- a/acqui/modorders.pl +++ b/acqui/modorders.pl @@ -26,24 +26,16 @@ use CGI; use C4::Output; use C4::Catalogue; use C4::Biblio; -#use Date::Manip; my $input = new CGI; -#print $input->header; -#print startpage(); -#print startmenu('acquisitions'); -#print $input->Dump; my $basketno=$input->param('basketno'); my $count=$input->param('number'); for (my $i=0;$i<$count;$i++){ - my $bibnum=$input->param("bibnum$i"); - my $ordnum=$input->param("ordnum$i"); - my $quantity=$input->param("quantity$i"); - if ($quantity == 0){ - delorder($bibnum,$ordnum); - } + my $bibnum=$input->param("bibnum$i"); + my $ordnum=$input->param("ordnum$i"); + my $quantity=$input->param("quantity$i"); + if ($quantity == 0){ + delorder($bibnum,$ordnum); + } } print $input->redirect("basket.pl?basket=$basketno"); -#print $input->dump; -#print endmenu('acquisitions'); -#print endpage(); diff --git a/acqui/newbasket.pl b/acqui/newbasket.pl deleted file mode 100755 index f4ccdda9a0..0000000000 --- a/acqui/newbasket.pl +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/perl - -# $Id$ - -#script to show display basket of orders -#written by chris@katipo.co.nz 24/2/2000 - - -# Copyright 2000-2002 Katipo Communications -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - -use C4::Catalogue; -use C4::Biblio; -use C4::Output; -use CGI; -use strict; - -my $input=new CGI; -print $input->header(); -my $user=$input->remote_user; -my $id=$input->param('id'); -my ($count,@booksellers)=bookseller($id); -print startpage; - -print startmenu('acquisitions'); - -my $basket=$input->param('basket'); -if ($basket eq ''){ - $basket=newbasket(); -} -my $date=localtime(time); -print < -Our Reference: HLT-$basket
-Authorised By: $user
-$date - -Shopping Basket For: {'id'}> -$booksellers[0]->{'name'}
-Ph: $booksellers[0]->{'phone'}, Fax: $booksellers[0]->{'fax'}, -$booksellers[0]->{'address1'}, $booksellers[0]->{'address2'}, -$booksellers[0]->{'address3'}, $booksellers[0]->{'address4'} - - -

- - - - Search Keyword or Title: - - - - - -
-

-
DELIVERY ADDRESS:
-
Horowhenua Library Trust
-10 Bath St
-Levin
-New Zealand

- -Ph: +64-6-368 1953
-Email: orders\@library.org.nz - -

- - -printend -; - -print endmenu('acquisitions'); - -print endpage; diff --git a/acqui/newbasket2.pl b/acqui/newbasket2.pl index 741b5f42e9..f3fcd7590d 100755 --- a/acqui/newbasket2.pl +++ b/acqui/newbasket2.pl @@ -40,12 +40,6 @@ my $type=$input->param('type'); if ($type eq ''){ $type = 'intra'; } -#setup colours -my $main; -my $secondary; - $main='#cccc99'; - $secondary='#ffffcc'; - #print $input->dump; my $blah; @@ -131,7 +125,7 @@ my @loopresult; while ($i < $count2){ my %lineres; - my $coltab; + my $toggle; my $result=$results[$i]; $result->{'title'}=~ s/\`/\\\'/g; @@ -145,70 +139,70 @@ while ($i < $count2){ my $itemcount; my $location=''; my $word=$result->{'author'}; - $word=~ s/([a-z]) +([a-z])/$1%20$2/ig; - $word=~ s/ //g; - $word=~ s/ /%20/g; - $word=~ s/\,/\,%20/g; - $word=~ s/\n//g; - $lineres{word}=$word; - $lineres{type}=$type; - - my ($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit)=C4::Search::itemcount($env,$result->{'biblionumber'},$type); - if ($nacount > 0){ - $location .= "On Loan"; - if ($nacount >1 ){ - $location .= " ($nacount)"; - } - $location.=" "; + $word=~ s/([a-z]) +([a-z])/$1%20$2/ig; + $word=~ s/ //g; + $word=~ s/ /%20/g; + $word=~ s/\,/\,%20/g; + $word=~ s/\n//g; + $lineres{word}=$word; + $lineres{type}=$type; + + my ($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit)=C4::Search::itemcount($env,$result->{'biblionumber'},$type); + if ($nacount > 0){ + $location .= "On Loan"; + if ($nacount >1 ){ + $location .= " ($nacount)"; } - if ($lcount > 0){ - $location .= "Levin"; - if ($lcount >1 ){ - $location .= " ($lcount)"; - } - $location.=" "; + $location.=" "; + } + if ($lcount > 0){ + $location .= "Levin"; + if ($lcount >1 ){ + $location .= " ($lcount)"; } - if ($fcount > 0){ - $location .= "Foxton"; - if ($fcount >1 ){ - $location .= " ($fcount)"; - } - $location.=" "; + $location.=" "; + } + if ($fcount > 0){ + $location .= "Foxton"; + if ($fcount >1 ){ + $location .= " ($fcount)"; } - if ($scount > 0){ - $location .= "Shannon"; - if ($scount >1 ){ - $location .= " ($scount)"; - } - $location.=" "; + $location.=" "; + } + if ($scount > 0){ + $location .= "Shannon"; + if ($scount >1 ){ + $location .= " ($scount)"; } - if ($lostcount > 0){ - $location .= "Lost"; - if ($lostcount >1 ){ - $location .= " ($lostcount)"; - } - $location.=" "; + $location.=" "; + } + if ($lostcount > 0){ + $location .= "Lost"; + if ($lostcount >1 ){ + $location .= " ($lostcount)"; } - if ($mending > 0){ - $location .= "Mending"; - if ($mending >1 ){ - $location .= " ($mending)"; - } - $location.=" "; + $location.=" "; + } + if ($mending > 0){ + $location .= "Mending"; + if ($mending >1 ){ + $location .= " ($mending)"; } - if ($transit > 0){ - $location .= "In Transit"; - if ($transit >1 ){ - $location .= " ($transit)"; - } - $location.=" "; + $location.=" "; + } + if ($transit > 0){ + $location .= "In Transit"; + if ($transit >1 ){ + $location .= " ($transit)"; } - if ($colour == 1){ - $coltab=$secondary; - $colour=0; + $location.=" "; + } + if ($colour == 1){ + $toggle='#ffffcc'; + $colour = 0; } else{ - $coltab=$main; - $colour=1; + $colour = 1; + $toggle='white'; } $lineres{author2}=$author2; $lineres{title2}=$title2; @@ -219,7 +213,7 @@ while ($i < $count2){ $lineres{biblionumber}=$result->{biblionumber}; $lineres{title}=$result->{title}; $lineres{author}=$result->{author}; - $lineres{coltab}=$coltab; + $lineres{toggle}=$toggle; $lineres{itemcount}=$count; $lineres{location}=$location; push(@loopresult,\%lineres); diff --git a/acqui/newbiblio.pl b/acqui/newbiblio.pl index b5f6dbd214..82402cfda2 100755 --- a/acqui/newbiblio.pl +++ b/acqui/newbiblio.pl @@ -28,9 +28,15 @@ use C4::Catalogue; use C4::Biblio; use C4::Output; use C4::Search; +use C4::Auth; +use C4::Biblio; +use C4::Output; +use C4::Interface::CGI::Output; +use C4::Database; +use HTML::Template; my $input=new CGI; -print $input->header(); +#print $input->header(); my $id=$input->param('id'); my $title=$input->param('title'); my $author=$input->param('author'); @@ -38,306 +44,136 @@ my $copyright=$input->param('copyright'); my ($count,@booksellers)=bookseller($id); my $ordnum=$input->param('ordnum'); my $biblio=$input->param('biblio'); +my $basket=$input->param('basket'); my $data; my $new; +my $dbh = C4::Context->dbh; if ($ordnum eq ''){ - $new='yes'; - $ordnum=newordernum; - if ($biblio) { - $data=bibdata($biblio); + $new='yes'; + warn "NEW : YES"; + $ordnum=newordernum; + if ($biblio) { + $data=bibdata($biblio); + } + if ($data->{'title'} eq ''){ + $data->{'title'}=$title; + $data->{'author'}=$author; + $data->{'copyrightdate'}=$copyright; } - if ($data->{'title'} eq ''){ - $data->{'title'}=$title; - $data->{'author'}=$author; - $data->{'copyrightdate'}=$copyright; - } }else { - $data=getsingleorder($ordnum); - $biblio=$data->{'biblionumber'}; + $data=getsingleorder($ordnum); + $biblio=$data->{'biblionumber'}; } - -print startpage; - -print startmenu('acquisitions'); - - -my $basket=$input->param('basket'); -print < - - - - -
-printend -; - -if ($biblio eq ''){ - print ""; -} - -print < - - - - -{'biblioitemnumber'}> -{'itemtype'}> -{'discount'}> -{'listincgst'}> -{'listprice'}> -{'gstreg'}> -printend -; -my ($count2,$currencies)=getcurrencies; -for (my $i=0;$i<$count2;$i++){ - print "[$i]->{'currency'}\" value=$currencies->[0]->{'rate'}>\n"; -} -if ($new ne 'yes'){ - print "\n"; -} -print <View Basket -$ordnum - Order Details
-Shopping Basket For: $booksellers[0]->{'name'} -

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CATALOGUE DETAILS
Title * -
Author -
Copyright Date -
Format -
ISBN{'isbn'}> -
Series -
Branch
Item Barcode 'branch', + -values => \@select_branch, + -default => $data->{'branchcode'}, + -labels => \%select_branches, + -size => 1, + -multiple => 0 ); my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0; # See whether barcodes should be automatically allocated. # Defaults to 0, meaning "no". +my $barcode; if ($auto_barcode eq '1') { - my $dbh = C4::Context->dbh; - my $query="Select barcode from items order by barcode desc"; - my $sth=$dbh->prepare($query); - $sth->execute; - my $data=$sth->fetchrow_hashref; - print $data->{'barcode'}+1; - $sth->finish; + $sth=$dbh->prepare("Select max(barcode) from items"); + $sth->execute; + my $data=$sth->fetchrow_hashref; + $barcode = $data->{'barcode'}+1; + $sth->finish; } -print < -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ACCOUNTING DETAILS
Quantity -
Bookfund
Suppliers List Price -
Replacement Cost
-(NZ\$ inc GST)		 -
-Budgeted Cost
-(NZ\$ ex GST, inc discount) 		-
-Budgeted GST -
-BUDGETED TOTAL -
Actual Cost -
Invoice Number * -
Notes -
- -
- -
- -
HELP
-
    -
  • If ordering more than one copy of an item you will be prompted to choose additional bookfunds, and put in additional barcodes at the next screen

    -

  • Bold fields must be filled in to create a new bibilo and item.

    -

  • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received. -
-
-

 

-printend -; - -print endmenu('acquisitions'); - -print endpage; diff --git a/acqui/order.pl b/acqui/order.pl index f077ced3f2..4c55a4383e 100755 --- a/acqui/order.pl +++ b/acqui/order.pl @@ -68,12 +68,11 @@ for (my $i=0; $i<$count; $i++) { my @loop_basket; for (my $i2=0;$i2<$ordcount;$i2++){ my %inner_line; - warn "bask : ".$orders->[$i2]->{'basketno'}; - $inner_line{basketno} =$orders->[$i2]->{'basketno'}; - $inner_line{total} =$orders->[$i2]->{'count(*)'}; - $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'}; - $inner_line{entrydate} = $orders->[$i2]->{'entrydate'}; - push @loop_basket, \%inner_line; + $inner_line{basketno} =$orders->[$i2]->{'basketno'}; + $inner_line{total} =$orders->[$i2]->{'count(*)'}; + $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'}; + $inner_line{entrydate} = $orders->[$i2]->{'entrydate'}; + push @loop_basket, \%inner_line; } $line{loop_basket} = \@loop_basket; push @loop_suppliers, \%line; diff --git a/acqui/receive.pl b/acqui/receive.pl index 3b339099b1..cf3c3ec11f 100755 --- a/acqui/receive.pl +++ b/acqui/receive.pl @@ -23,14 +23,18 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +use C4::Auth; use C4::Catalogue; use C4::Biblio; use C4::Output; use CGI; +use C4::Interface::CGI::Output; +use C4::Database; +use HTML::Template; +use C4::Catalogue; use strict; my $input=new CGI; -print $input->header(); my $id=$input->param('id'); my ($count,@booksellers)=bookseller($id); my $invoice=$input->param('invoice'); @@ -38,125 +42,75 @@ my $freight=$input->param('freight'); my $gst=$input->param('gst'); my $user=$input->remote_user; my $date=localtime(time); -print startpage; - -print startmenu('acquisitions'); - -print < -Invoice: $invoice
-Received By: $user
-$date - -Receipt Summary For : $booksellers[0]->{'name'} -
-
- - - +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "acqui/recieve.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {acquisition => 1}, + debug => 1, + }); -Search ISBN or Title: -
-

-

- - - - - - - - - - - - -EOP -; my @results; ($count,@results)=invoice($invoice); if ($invoice eq ''){ - ($count,@results)=getallorders($id); + ($count,@results)=getallorders($id); } -print $count; my $totalprice=0; my $totalfreight=0; my $totalquantity=0; my $total; my $tototal; +my $toggle; +my @loop_orders = (); for (my$i=0;$i<$count;$i++){ - $total=($results[$i]->{'unitprice'} + $results[$i]->{'freight'}) * $results[$i]->{'quantityreceived'}; -$results[$i]->{'unitprice'}+=0; -print < - - - - - - - - - -EOP -; -$totalprice+=$results[$i]->{'unitprice'}; -$totalfreight+=$results[$i]->{'freight'}; -$totalquantity+=$results[$i]->{'quantityreceived'}; -$tototal+=$total; + warn "nb : ".$results[$i]->{'ordernumber'}; + $total=($results[$i]->{'unitprice'} + $results[$i]->{'freight'}) * $results[$i]->{'quantityreceived'}; + $results[$i]->{'unitprice'}+=0; + my %line; + if ($toggle==0){ + $line{color}='#ffffcc'; + $toggle=1; + } else { + $line{color}='white'; + $toggle=0; + } + $line{basketno} = $results[$i]->{'basketno'}; + $line{isbn} = $results[$i]->{'isbn'}; + $line{ordernumber} = $results[$i]->{'ordernumber'}; + $line{biblionumber} = $results[$i]->{'biblionumber'}; + $line{invoice} = $invoice; + $line{gst} = $gst; + $line{title} = $results[$i]->{'title'}; + $line{author} = $results[$i]->{'author'}; + $line{unitprice} = $results[$i]->{'unitprice'}; + $line{quantityrecieved} = $results[$i]->{'quantityreceived'}; + $line{total} = $total; + push @loop_orders, \%line; + $totalprice+=$results[$i]->{'unitprice'}; + $totalfreight+=$results[$i]->{'freight'}; + $totalquantity+=$results[$i]->{'quantityreceived'}; + $tototal+=$total; } + $totalfreight=$freight; $tototal=$tototal+$freight; -my $grandtot=$tototal+$gst; -print < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BASKETISBNTITLEAUTHORACTUALP&PQTYTOTAL
$results[$i]->{'basketno'}$results[$i]->{'isbn'}$results[$i]->{'title'}$results[$i]->{'author'}\$$results[$i]->{'unitprice'}$results[$i]->{'quantityreceived'}\$ $total
-
SUBTOTALS\$$totalprice$totalfreight$totalquantity\$$tototal
-HELP -
-The total at the bottom of the page should be within a few cents of the total for the invoice.

-When you have finished this invoice save the changes. -

GST\$$gst
TOTAL\$$grandtot
-
-EOP -; - - -print endmenu('acquisitions'); - -print endpage; +$template->param(invoice => $invoice, + user => $user, + date => $date, + name => $booksellers[0]->{'name'}, + gst => $gst, + freight => $freight, + invoice => $invoice, + count => $count, + loop_orders => \@loop_orders, + totalprice => $totalprice, + totalfreight => $totalfreight, + totalquantity => $totalquantity, + tototal => $tototal, + gst => $gst, + grandtot => $tototal+$gst, + ); +output_html_with_http_headers $input, $cookie, $template->output; diff --git a/acqui/recieveorder.pl b/acqui/recieveorder.pl index 1351ecbdc7..02083b3ec4 100755 --- a/acqui/recieveorder.pl +++ b/acqui/recieveorder.pl @@ -22,58 +22,27 @@ # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA - -use C4::Catalogue; -use C4::Biblio; -use C4::Output; -use CGI; use strict; +use CGI; +use C4::Auth; +use C4::Output; +use C4::Interface::CGI::Output; +use C4::Database; +use HTML::Template; +use C4::Catalogue; my $input=new CGI; -print $input->header(); my $id=$input->param('id'); my ($count,@booksellers)=bookseller($id); -print startpage; - -print startmenu('acquisitions'); - -print <Receive Orders From Supplier $booksellers[0]->{'name'} -

-

- - -

- - - - - - - - - - - - - - - - - - -
SUPPLIER INVOICE INFORMATION
Supplier Invoice Number -
GST -
Freight -
-
-

- -EOP -; - - -print endmenu('acquisitions'); -print endpage; +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "acqui/recieveorder.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {acquisition => 1}, + debug => 1, + }); +$template->param(name => $booksellers[0]->{'name'},id => $id,); + +output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket.tmpl new file mode 100644 index 0000000000..4832d33260 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket.tmpl @@ -0,0 +1,36 @@ + + +Shopping Basket for
+(Our Reference: , #, authorised by: )
+Ph: , Fax:
+,
+,
+

+ +"> +"> + Search Keyword or Title: + + + + + + + + + + + + + > + + + + + + + +
OrderIsbnTitleAuthorQty
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl index 065f384e5b..cdf814a63c 100755 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl @@ -31,8 +31,8 @@ You searched on
Results to displayed. -"> - +
+ @@ -41,7 +41,7 @@ You searched on - "> + "> + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl new file mode 100644 index 0000000000..d94aa46a78 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl @@ -0,0 +1,172 @@ + + +
+ + +"> +"> +"> +"> +"> +"> +"> +"> +"> +"> + + " value=""> + + +>View Basket + - Order Details
+Shopping Basket For: +

+

+
TITLE AUTHOR ©
&author=©right=&id=&basket=&biblio=&title="> @@ -71,7 +71,7 @@ You searched on -
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CATALOGUE DETAILS
Title *">
Author" >
Copyright Date"> +
Format
ISBN">
Series">
Branch
Item Barcode">
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ACCOUNTING DETAILS
Quantity" onchange='update(this.form)' >
Bookfund
Suppliers List Price" onchange='update(this.form)'>
Replacement Cost
" onchange='update(this.form)'> +
Budgeted Cost
(NZ\$ ex GST, inc discount) 		" onchange='update(this.form)'>
Budgeted GST
BUDGETED TOTAL
Actual Cost
Invoice Number *
Notes">
+ + + +
HELP
+
    +
  • If ordering more than one copy of an item you will be prompted to choose additional bookfunds, and put in additional barcodes at the next screen

    +

  • Bold fields must be filled in to create a new bibilo and item.

    +

  • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received. +
+
+

 

+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl index 7b62af3f88..af38515689 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl @@ -6,10 +6,10 @@
You searched on supplier , results found

- - - - + + +
 Company +
 Company @@ -24,7 +24,7 @@ You searched on supplier , > diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl new file mode 100644 index 0000000000..8afdc0c989 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl @@ -0,0 +1,86 @@ + + +
+Invoice:
+Received By:
+ +
+Receipt Summary For : +
+ +
+"> +"> +"> + +Search ISBN or Title: + +

+
+ +

Basket
- ">New Basket + ">New Basket ">Receive Order ">
+ + + + + + + + + + + + + "> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
BASKETISBNTITLEAUTHORACTUALP&PQTYTOTAL
&biblio=&invoice=&gst=&freight=">$$
+
SUBTOTALS$$
+ HELP +
+ The total at the bottom of the page should be within a few cents of the total for the invoice.

+ When you have finished this invoice save the changes. +

GST$
TOTAL$
+ +
+ + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl new file mode 100644 index 0000000000..c4dad51f72 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl @@ -0,0 +1,34 @@ + + +Receive Orders From Supplier +

+

+ +> +

+ + + + + + + + + + + + + + + + + + +
SUPPLIER INVOICE INFORMATION
Supplier Invoice Number +
GST +
Freight +
+
+

+ + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl index 90db94ac24..fe707711eb 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl @@ -7,92 +7,99 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
COMPANY DETAILS
Company Name"> -
Postal Address
Physical Address -
Phone"> -
Fax"> -
Website"> -
CONTACT DETAILS
Contact Name"> -
Position"> -
Phone"> -
Alternative Phone"> -
Fax"> -
E-mail"> -
Notes -
COMPANY DETAILS
Company Name"> +
Postal Address + +
Physical Address +
Phone"> +
Fax"> +
Website"> +
CONTACT DETAILS
Contact Name">
Position"> +
Phone"> +
Alternative Phone"> +
Fax"> +
E-mail"> +
Notes +
- - + + - - + + -- 2.39.5
CURRENT STATUS
CURRENT STATUS
Supplier is checked>Active checked>Inactive
ORDERING INFORMATION
ORDERING INFORMATION
Publishers and Imprints