X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Forderreceive.pl;h=ee244d76c6db375ddf95bfe458a9770984abadd9;hb=f55b8493460116c06e88058af6d86de6700c7b37;hp=7b050134249e3ce8c9aca033bafde25865a8af0c;hpb=d019f86f671771a36006f8847712317e0337c02f;p=koha.git

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 7b05013424..ee244d76c6 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -63,7 +63,6 @@ use warnings;
 
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Koha;   # GetKohaAuthorisedValues GetItemTypes
 use C4::Acquisition;
 use C4::Auth;
 use C4::Output;
@@ -72,9 +71,12 @@ use C4::Members;
 use C4::Items;
 use C4::Biblio;
 use C4::Suggestions;
+use C4::Koha;
 
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Booksellers;
 use Koha::DateUtils qw( dt_from_string );
+use Koha::ItemTypes;
+use Koha::Patrons;
 
 my $input      = new CGI;
 
@@ -85,7 +87,7 @@ my $booksellerid   = $invoice->{booksellerid};
 my $freight      = $invoice->{shipmentcost};
 my $ordernumber  = $input->param('ordernumber');
 
-my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
 my $results;
 $results = SearchOrders({
     ordernumber => $ordernumber
@@ -128,66 +130,68 @@ if ($AcqCreateItem eq 'receiving') {
     my @items;
     foreach (@itemnumbers) {
         my $item = GetItem($_);
-        my $av;
-        $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} });
-        $item->{notforloan} = $av->count ? $av->next->lib : '';
+        my $descriptions;
+        $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} });
+        $item->{notforloan} = $descriptions->{lib} // '';
 
-        $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->{restricted} });
-        $item->{restricted} = $av->count ? $av->next->lib : '';
+        $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->{restricted} });
+        $item->{restricted} = $descriptions->{lib} // '';
 
-        $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} });
-        $item->{location} = $av->count ? $av->next->lib : '';
+        $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} });
+        $item->{location} = $descriptions->{lib} // '';
 
-        $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} });
-        $item->{collection} = $av->count ? $av->next->lib : '';
+        $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} });
+        $item->{collection} = $descriptions->{lib} // '';
 
-        $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} });
-        $item->{materials} = $av->count ? $av->next->lib : '';
+        $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} });
+        $item->{materials} = $descriptions->{lib} // '';
 
-        my $itemtype = getitemtypeinfo($item->{itype});
-        $item->{itemtype} = $itemtype->{description};
+        my $itemtype = Koha::ItemTypes->find( $item->{itype} );
+        $item->{itemtype} = $itemtype->description; # FIXME Should not it be translated_description?
         push @items, $item;
     }
     $template->param(items => \@items);
 }
 
 $order->{quantityreceived} = '' if $order->{quantityreceived} == 0;
-$order->{unitprice} = '' if $order->{unitprice} == 0;
-
-my $rrp;
-my $ecost;
-my $unitprice;
-if ( $bookseller->{listincgst} ) {
-    if ( $bookseller->{invoiceincgst} ) {
-        $rrp = $order->{rrp};
-        $ecost = $order->{ecost};
-        $unitprice = $order->{unitprice};
-    } else {
-        $rrp = $order->{rrp} / ( 1 + $order->{gstrate} );
-        $ecost = $order->{ecost} / ( 1 + $order->{gstrate} );
-        $unitprice = $order->{unitprice} / ( 1 + $order->{gstrate} );
+
+my $unitprice = $order->{unitprice};
+my ( $rrp, $ecost );
+if ( $bookseller->invoiceincgst ) {
+    $rrp = $order->{rrp_tax_included};
+    $ecost = $order->{ecost_tax_included};
+    unless ( $unitprice != 0 and defined $unitprice) {
+        $unitprice = $order->{ecost_tax_included};
     }
 } else {
-    if ( $bookseller->{invoiceincgst} ) {
-        $rrp = $order->{rrp} * ( 1 + $order->{gstrate} );
-        $ecost = $order->{ecost} * ( 1 + $order->{gstrate} );
-        $unitprice = $order->{unitprice} * ( 1 + $order->{gstrate} );
-    } else {
-        $rrp = $order->{rrp};
-        $ecost = $order->{ecost};
-        $unitprice = $order->{unitprice};
+    $rrp = $order->{rrp_tax_excluded};
+    $ecost = $order->{ecost_tax_excluded};
+    unless ( $unitprice != 0 and defined $unitprice) {
+        $unitprice = $order->{ecost_tax_excluded};
     }
- }
+}
+
+my $tax_rate;
+if( defined $order->{tax_rate_on_receiving} ) {
+    $tax_rate = $order->{tax_rate_on_receiving} + 0.0;
+} else {
+    $tax_rate = $order->{tax_rate_on_ordering} + 0.0;
+}
 
 my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber});
 
 my $authorisedby = $order->{authorisedby};
-my $member = GetMember( borrowernumber => $authorisedby );
+my $authorised_patron = Koha::Patrons->find( $authorisedby );
 
 my $budget = GetBudget( $order->{budget_id} );
 
 my $datereceived = $order->{datereceived} ? dt_from_string( $order->{datereceived} ) : dt_from_string;
 
+# get option values for gist syspref
+my @gst_values = map {
+    option => $_ + 0.0
+}, split( '\|', C4::Context->preference("gist") );
+
 $template->param(
     AcqCreateItem         => $AcqCreateItem,
     count                 => 1,
@@ -196,7 +200,7 @@ $template->param(
     subscriptionid        => $order->{subscriptionid},
     booksellerid          => $order->{'booksellerid'},
     freight               => $freight,
-    name                  => $bookseller->{'name'},
+    name                  => $bookseller->name,
     title                 => $order->{'title'},
     author                => $order->{'author'},
     copyrightdate         => $order->{'copyrightdate'},
@@ -206,10 +210,12 @@ $template->param(
     quantity              => $order->{'quantity'},
     quantityreceivedplus1 => $order->{'quantityreceived'} + 1,
     quantityreceived      => $order->{'quantityreceived'},
-    rrp                   => sprintf( "%.2f", $rrp ),
-    ecost                 => sprintf( "%.2f", $ecost ),
-    memberfirstname       => $member->{firstname} || "",
-    membersurname         => $member->{surname} || "",
+    rrp                   => $rrp,
+    ecost                 => $ecost,
+    unitprice             => $unitprice,
+    tax_rate              => $tax_rate,
+    memberfirstname       => $authorised_patron->firstname || "",
+    membersurname         => $authorised_patron->surname || "",
     invoiceid             => $invoice->{invoiceid},
     invoice               => $invoice->{invoicenumber},
     datereceived          => $datereceived,
@@ -218,9 +224,10 @@ $template->param(
     suggestionid          => $suggestion->{suggestionid},
     surnamesuggestedby    => $suggestion->{surnamesuggestedby},
     firstnamesuggestedby  => $suggestion->{firstnamesuggestedby},
+    gst_values            => \@gst_values,
 );
 
-my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
+my $patron = Koha::Patrons->find( $loggedinuser )->unblessed;
 my @budget_loop;
 my $periods = GetBudgetPeriods( );
 foreach my $period (@$periods) {
@@ -231,7 +238,7 @@ foreach my $period (@$periods) {
     my $budget_hierarchy = GetBudgetHierarchy( $period->{'budget_period_id'} );
     my @funds;
     foreach my $r ( @{$budget_hierarchy} ) {
-        next unless ( CanUserUseBudget( $borrower, $r, $userflags ) );
+        next unless ( CanUserUseBudget( $patron, $r, $userflags ) );
         if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
             next;
         }
@@ -255,15 +262,6 @@ foreach my $period (@$periods) {
 
 $template->{'VARS'}->{'budget_loop'} = \@budget_loop;
 
-# regardless of the content of $unitprice e.g 0 or '' or any string will return in these cases 0.00
-# and the 'IF' in the .tt will show 0.00 and not 'ecost' (see BZ 7129)
-# So if $unitprice == 0 we don't create unitprice
-if ( $unitprice != 0) {
-    $template->param(
-        unitprice             => sprintf( "%.2f", $unitprice),
-    );
-}
-
 my $op = $input->param('op');
 if ($op and $op eq 'edit'){
     $template->param(edit   =>   1);