Bug 5385: POD Cleanups (part 1)

[koha.git] / acqui / neworderempty.pl

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 1bbb71f..61f0962 100755 (executable)
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -16,9 +16,9 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 =head1 NAME
@@ -26,6 +26,7 @@
 neworderempty.pl
 
 =head1 DESCRIPTION
+
 this script allows to create a new record to order it. This record shouldn't exist
 on database.
 
@@ -92,7 +93,7 @@ use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/;
 
 my $input           = new CGI;
 my $booksellerid    = $input->param('booksellerid');   # FIXME: else ERROR!
-my $budget_id       = $input->param('budget_id');      # FIXME: else ERROR!
+my $budget_id       = $input->param('budget_id') || 0; # FIXME: else ERROR!
 my $title           = $input->param('title');
 my $author          = $input->param('author');
 my $publicationyear = $input->param('publicationyear');
@@ -125,7 +126,7 @@ my $contract = &GetContract($basket->{contractnumber});
 
 #simple parameters reading (all in one :-)
 my $params = $input->Vars;
-my $listprice; # the price, that can be in MARC record if we have one
+my $listprice=0; # the price, that can be in MARC record if we have one
 if ( $ordernumber eq '' and defined $params->{'breedingid'}){
 #we want to import from the breeding reservoir (from a z3950 search)
     my ($marcrecord, $encoding) = MARCfindbreeding($params->{'breedingid'});
@@ -230,23 +231,19 @@ my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});
 
 my $budget =  GetBudget($budget_id);
 # build budget list
-my %labels;
-my @values;
-my $budgets = GetBudgetHierarchy('','',$borrower->{'borrowernumber'});
-foreach my $r (@$budgets) {
-    $labels{"$r->{budget_id}"} = $r->{budget_name};
-    next if  sprintf ("%00d",  $r->{budget_amount})  ==   0;
-    push @values, $r->{budget_id};
+my $budget_loop = [];
+my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+foreach my $r (@{$budgets}) {
+    if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+        next;
+    }
+    push @{$budget_loop}, {
+        b_id  => $r->{budget_id},
+        b_txt => $r->{budget_name},
+        b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
+    };
 }
-# if no budget_id is passed then its an add
-my $budget_dropbox = CGI::scrolling_list(
-    -name    => 'budget_id',
-    -id      => 'budget_id',
-    -values  => \@values,
-    -size    => 1,
-    -labels  => \%labels,
-    -onChange   => "fetchSortDropbox(this.form)",
-);
+
 
 if ($close) {
     $budget_id      =  $data->{'budget_id'};
@@ -339,20 +336,20 @@ $template->param(
     name             => $bookseller->{'name'},
     cur_active_sym   => $cur->{'symbol'},
     cur_active       => $cur->{'currency'},
-    currency         => $bookseller->{'listprice'}, # eg: 'EUR'
+    currency         => $bookseller->{'listprice'} || $cur->{'currency'}, # eg: 'EUR'
     loop_currencies  => \@loop_currency,
     orderexists      => ( $new eq 'yes' ) ? 0 : 1,
     title            => $data->{'title'},
     author           => $data->{'author'},
-    publicationyear  => $data->{'publicationyear'},
-    budget_dropbox   => $budget_dropbox,
+    publicationyear  => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
+    budget_loop      => $budget_loop,
     isbn             => $data->{'isbn'},
     seriestitle      => $data->{'seriestitle'},
     quantity         => $data->{'quantity'},
     quantityrec      => $data->{'quantity'},
     rrp              => $data->{'rrp'},
     listprice        => sprintf("%.2f", $data->{'listprice'}||$listprice),
-    total            => sprintf("%.2f", $data->{'ecost'}*$data->{'quantity'} ),
+    total            => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
     ecost            => $data->{'ecost'},
     notes            => $data->{'notes'},
     publishercode    => $data->{'publishercode'},
@@ -367,9 +364,9 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 
 
-=item MARCfindbreeding
+=head2 MARCfindbreeding
 
-    $record = MARCfindbreeding($breedingid);
+  $record = MARCfindbreeding($breedingid);
 
 Look up the import record repository for the record with
 record with id $breedingid.  If found, returns the decoded