budget limit not working

[srvgit] / acqui / neworderempty.pl

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6be14ec..562a146 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
@@ -45,7 +45,7 @@ the author of this new record.
 =item publication year
 the publication year of this new record.
 
-=item ordnum
+=item ordernumber
 the number of this order.
 
 =item biblio
@@ -97,7 +97,7 @@ my $title           = $input->param('title');
 my $author          = $input->param('author');
 my $publicationyear = $input->param('publicationyear');
 my $bookseller      = GetBookSellerFromId($booksellerid);      # FIXME: else ERROR!
-my $ordnum          = $input->param('ordnum') || '';
+my $ordernumber          = $input->param('ordernumber') || '';
 my $biblionumber    = $input->param('biblionumber');
 my $basketno        = $input->param('basketno');
 my $suggestionid    = $input->param('suggestionid');
@@ -126,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
-if ( $ordnum eq '' and defined $params->{'breedingid'}){
+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'});
     die("Could not find the selected record in the reservoir, bailing") unless $marcrecord;
@@ -161,7 +161,6 @@ if ( $ordnum eq '' and defined $params->{'breedingid'}){
                 $listprice = 0;
             }
         }
-        $listprice=100;
         SetImportRecordStatus($params->{'breedingid'}, 'imported');
     }
 }
@@ -169,10 +168,10 @@ if ( $ordnum eq '' and defined $params->{'breedingid'}){
 
 my $cur = GetCurrency();
 
-if ( $ordnum eq '' ) {    # create order
+if ( $ordernumber eq '' ) {    # create order
     $new = 'yes';
 
-    #  $ordnum=newordernum;
+    #  $ordernumber=newordernum;
     if ( $biblionumber && !$suggestionid ) {
         $data = GetBiblioData($biblionumber);
     }
@@ -184,7 +183,7 @@ if ( $ordnum eq '' ) {    # create order
     }
 }
 else {    #modify order
-    $data   = GetOrder($ordnum);
+    $data   = GetOrder($ordernumber);
     $biblionumber = $data->{'biblionumber'};
     $budget_id = $data->{'budget_id'};
 
@@ -231,23 +230,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'};
@@ -291,7 +286,7 @@ if ($CGIsort2) {
     $template->param( sort2 => $data->{'sort2'} );
 }
 
-if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordnum) {
+if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
     # prepare empty item form
     my $cell = PrepareItemrecordDisplay('','','','ACQ');
 #     warn "==> ".Data::Dumper::Dumper($cell);
@@ -314,7 +309,7 @@ $template->param(
 
 $template->param(
     existing         => $biblionumber,
-    ordnum           => $ordnum,
+    ordernumber           => $ordernumber,
     # basket informations
     basketno             => $basketno,
     basketname           => $basket->{'basketname'},
@@ -340,19 +335,19 @@ $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,
+    budget_loop      => $budget_loop,
     isbn             => $data->{'isbn'},
     seriestitle      => $data->{'seriestitle'},
     quantity         => $data->{'quantity'},
     quantityrec      => $data->{'quantity'},
     rrp              => $data->{'rrp'},
-    list_price       => sprintf("%.2f", $data->{'listprice'}||$listprice),
+    listprice        => sprintf("%.2f", $data->{'listprice'}||$listprice),
     total            => sprintf("%.2f", $data->{'ecost'}*$data->{'quantity'} ),
     ecost            => $data->{'ecost'},
     notes            => $data->{'notes'},