use Modern::Perl;
-use Carp;
+use Carp qw( carp croak );
+use Text::CSV_XS;
use C4::Context;
-use C4::Debug;
-use C4::Suggestions;
-use C4::Biblio;
-use C4::Contract;
-use C4::Debug;
+use C4::Suggestions qw( GetSuggestion GetSuggestionFromBiblionumber ModSuggestion );
+use C4::Biblio qw( GetMarcFromKohaField GetMarcStructure IsMarcStructureInternal );
+use C4::Contract qw( GetContract );
+use C4::Log qw( logaction );
use C4::Templates qw(gettemplate);
use Koha::DateUtils qw( dt_from_string output_pref );
-use Koha::Acquisition::Order;
-use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Baskets;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use Koha::Biblios;
+use Koha::Exceptions;
+use Koha::Items;
use Koha::Number::Price;
use Koha::Libraries;
+use Koha::CsvProfiles;
+use Koha::Patrons;
use C4::Koha;
use MARC::Field;
-use MARC::Record;
+use JSON qw( to_json );
-use Time::localtime;
-
-use vars qw(@ISA @EXPORT);
+our (@ISA, @EXPORT_OK);
BEGIN {
require Exporter;
- @ISA = qw(Exporter);
- @EXPORT = qw(
- &GetBasket &NewBasket &CloseBasket &ReopenBasket &DelBasket &ModBasket
- &GetBasketAsCSV &GetBasketGroupAsCSV
- &GetBasketsByBookseller &GetBasketsByBasketgroup
- &GetBasketsInfosByBookseller
-
- &GetBasketUsers &ModBasketUsers
- &CanUserManageBasket
-
- &ModBasketHeader
-
- &ModBasketgroup &NewBasketgroup &DelBasketgroup &GetBasketgroup &CloseBasketgroup
- &GetBasketgroups &ReOpenBasketgroup
-
- &DelOrder &ModOrder &GetOrder &GetOrders &GetOrdersByBiblionumber
- &GetLateOrders &GetOrderFromItemnumber
- &SearchOrders &GetHistory &GetRecentAcqui
- &ModReceiveOrder &CancelReceipt
- &TransferOrder
- &GetLastOrderNotReceivedFromSubscriptionid &GetLastOrderReceivedFromSubscriptionid
- &ModItemOrder
-
- &GetParcels
-
- &GetInvoices
- &GetInvoice
- &GetInvoiceDetails
- &AddInvoice
- &ModInvoice
- &CloseInvoice
- &ReopenInvoice
- &DelInvoice
- &MergeInvoices
-
- &GetItemnumbersFromOrder
-
- &AddClaim
- &GetBiblioCountByBasketno
-
- &GetOrderUsers
- &ModOrderUsers
- &NotifyOrderUsers
-
- &FillWithDefaultValues
+ @ISA = qw(Exporter);
+ @EXPORT_OK = qw(
+ GetBasket NewBasket ReopenBasket ModBasket
+ GetBasketAsCSV GetBasketGroupAsCSV
+ GetBasketsByBookseller GetBasketsByBasketgroup
+ GetBasketsInfosByBookseller
+
+ GetBasketUsers ModBasketUsers
+ CanUserManageBasket
+
+ ModBasketHeader
+
+ ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroup CloseBasketgroup
+ GetBasketgroups ReOpenBasketgroup
+
+ ModOrder GetOrder GetOrders GetOrdersByBiblionumber
+ GetOrderFromItemnumber
+ SearchOrders GetHistory GetRecentAcqui
+ ModReceiveOrder CancelReceipt
+ populate_order_with_prices
+ TransferOrder
+ ModItemOrder
+
+ GetParcels
+
+ GetInvoices
+ GetInvoice
+ GetInvoiceDetails
+ AddInvoice
+ ModInvoice
+ CloseInvoice
+ ReopenInvoice
+ DelInvoice
+ MergeInvoices
+
+ AddClaim
+ GetBiblioCountByBasketno
+
+ GetOrderUsers
+ ModOrderUsers
+ NotifyOrderUsers
+
+ FillWithDefaultValues
+
+ get_rounded_price
+ get_rounding_sql
);
}
}
-# Returns the itemnumber(s) associated with the ordernumber given in parameter
-sub GetItemnumbersFromOrder {
- my ($ordernumber) = @_;
- my $dbh = C4::Context->dbh;
- my $query = "SELECT itemnumber FROM aqorders_items WHERE ordernumber=?";
- my $sth = $dbh->prepare($query);
- $sth->execute($ordernumber);
- my @tab;
-
- while (my $order = $sth->fetchrow_hashref) {
- push @tab, $order->{'itemnumber'};
- }
-
- return @tab;
-
-}
-
-
-
-
-
-
=head1 NAME
C4::Acquisition - Koha functions for dealing with orders and acquisitions
=head3 NewBasket
$basket = &NewBasket( $booksellerid, $authorizedby, $basketname,
- $basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace, $is_standing );
+ $basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace, $is_standing, $create_items );
Create a new basket in aqbasket table
sub NewBasket {
my ( $booksellerid, $authorisedby, $basketname, $basketnote,
$basketbooksellernote, $basketcontractnumber, $deliveryplace,
- $billingplace, $is_standing ) = @_;
+ $billingplace, $is_standing, $create_items ) = @_;
my $dbh = C4::Context->dbh;
my $query =
'INSERT INTO aqbasket (creationdate,booksellerid,authorisedby) '
$basketnote ||= q{};
$basketbooksellernote ||= q{};
ModBasketHeader( $basket, $basketname, $basketnote, $basketbooksellernote,
- $basketcontractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing );
- return $basket;
-}
-
-#------------------------------------------------------------#
-
-=head3 CloseBasket
-
- &CloseBasket($basketno);
-
-close a basket (becomes unmodifiable, except for receives)
-
-=cut
-
-sub CloseBasket {
- my ($basketno) = @_;
- my $dbh = C4::Context->dbh;
- $dbh->do('UPDATE aqbasket SET closedate=now() WHERE basketno=?', {}, $basketno );
+ $basketcontractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items );
+
+ # Log the basket creation
+ if (C4::Context->preference("AcquisitionLog")) {
+ my $created = Koha::Acquisition::Baskets->find( $basket );
+ logaction(
+ 'ACQUISITIONS',
+ 'ADD_BASKET',
+ $basket,
+ to_json($created->unblessed)
+ );
+ }
- $dbh->do( q{UPDATE aqorders SET orderstatus = 'ordered' WHERE basketno = ? AND orderstatus != 'complete'},
- {}, $basketno);
- return;
+ return $basket;
}
=head3 ReopenBasket
UPDATE aqorders
SET orderstatus = 'new'
WHERE basketno = ?
- AND orderstatus != 'complete'
+ AND orderstatus NOT IN ( 'complete', 'cancelled' )
}, {}, $basketno);
+
+ # Log the basket reopening
+ if (C4::Context->preference("AcquisitionLog")) {
+ my $reopened = Koha::Acquisition::Baskets->find( $basketno );
+ logaction(
+ 'ACQUISITIONS',
+ 'REOPEN_BASKET',
+ $basketno,
+ to_json($reopened->unblessed)
+ );
+ }
return;
}
=cut
sub GetBasketAsCSV {
- my ($basketno, $cgi) = @_;
+ my ($basketno, $cgi, $csv_profile_id) = @_;
my $basket = GetBasket($basketno);
my @orders = GetOrders($basketno);
my $contract = GetContract({
});
my $template = C4::Templates::gettemplate("acqui/csv/basket.tt", "intranet", $cgi);
-
my @rows;
- foreach my $order (@orders) {
- my $bd = GetBiblioData( $order->{'biblionumber'} );
- my $row = {
- contractname => $contract->{'contractname'},
- ordernumber => $order->{'ordernumber'},
- entrydate => $order->{'entrydate'},
- isbn => $order->{'isbn'},
- author => $bd->{'author'},
- title => $bd->{'title'},
- publicationyear => $bd->{'publicationyear'},
- publishercode => $bd->{'publishercode'},
- collectiontitle => $bd->{'collectiontitle'},
- notes => $order->{'order_vendornote'},
- quantity => $order->{'quantity'},
- rrp => $order->{'rrp'},
- deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
- billingplace => C4::Branch::GetBranchName( $basket->{'billingplace'} ),
- };
- foreach(qw(
- contractname author title publishercode collectiontitle notes
- deliveryplace billingplace
- ) ) {
- # Double the quotes to not be interpreted as a field end
- $row->{$_} =~ s/"/""/g if $row->{$_};
+ if ($csv_profile_id) {
+ my $csv_profile = Koha::CsvProfiles->find( $csv_profile_id );
+ Koha::Exceptions::ObjectNotFound->throw( 'There is no valid csv profile given') unless $csv_profile;
+
+ my $csv = Text::CSV_XS->new({'quote_char'=>'"','escape_char'=>'"','sep_char'=>$csv_profile->csv_separator,'binary'=>1});
+ my $csv_profile_content = $csv_profile->content;
+ my ( @headers, @fields );
+ while ( $csv_profile_content =~ /
+ ([^=\|]+) # header
+ =?
+ ([^\|]*) # fieldname (table.row or row)
+ \|? /gxms
+ ) {
+ my $header = $1;
+ my $field = ($2 eq '') ? $1 : $2;
+
+ $header =~ s/^\s+|\s+$//g; # Trim whitespaces
+ push @headers, $header;
+
+ $field =~ s/[^\.]*\.{1}//; # Remove the table name if exists.
+ $field =~ s/^\s+|\s+$//g; # Trim whitespaces
+ push @fields, $field;
}
- push @rows, $row;
+ for my $order (@orders) {
+ my @row;
+ my $biblio = Koha::Biblios->find( $order->{biblionumber} );
+ my $biblioitem = $biblio->biblioitem;
+ $order = { %$order, %{ $biblioitem->unblessed } };
+ if ($contract) {
+ $order = {%$order, %$contract};
+ }
+ $order = {%$order, %$basket, %{ $biblio->unblessed }};
+ for my $field (@fields) {
+ push @row, $order->{$field};
+ }
+ push @rows, \@row;
+ }
+ my $content = join( $csv_profile->csv_separator, @headers ) . "\n";
+ for my $row ( @rows ) {
+ $csv->combine(@$row);
+ my $string = $csv->string;
+ $content .= $string . "\n";
+ }
+ return $content;
}
+ else {
+ foreach my $order (@orders) {
+ my $biblio = Koha::Biblios->find( $order->{biblionumber} );
+ my $biblioitem = $biblio->biblioitem;
+ my $row = {
+ contractname => $contract->{'contractname'},
+ ordernumber => $order->{'ordernumber'},
+ entrydate => $order->{'entrydate'},
+ isbn => $order->{'isbn'},
+ author => $biblio->author,
+ title => $biblio->title,
+ publicationyear => $biblioitem->publicationyear,
+ publishercode => $biblioitem->publishercode,
+ collectiontitle => $biblioitem->collectiontitle,
+ notes => $order->{'order_vendornote'},
+ quantity => $order->{'quantity'},
+ rrp => $order->{'rrp'},
+ };
+ for my $place ( qw( deliveryplace billingplace ) ) {
+ if ( my $library = Koha::Libraries->find( $row->{deliveryplace} ) ) {
+ $row->{$place} = $library->branchname
+ }
+ }
+ foreach(qw(
+ contractname author title publishercode collectiontitle notes
+ deliveryplace billingplace
+ ) ) {
+ # Double the quotes to not be interpreted as a field end
+ $row->{$_} =~ s/"/""/g if $row->{$_};
+ }
+ push @rows, $row;
+ }
- @rows = sort {
- if(defined $a->{publishercode} and defined $b->{publishercode}) {
- $a->{publishercode} cmp $b->{publishercode};
- }
- } @rows;
+ @rows = sort {
+ if(defined $a->{publishercode} and defined $b->{publishercode}) {
+ $a->{publishercode} cmp $b->{publishercode};
+ }
+ } @rows;
- $template->param(rows => \@rows);
+ $template->param(rows => \@rows);
- return $template->output;
+ return $template->output;
+ }
}
my $contract = GetContract({
contractnumber => $basket->{contractnumber}
});
- my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $basket->{booksellerid} });
+ my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} );
my $basketgroup = GetBasketgroup( $$basket{basketgroupid} );
foreach my $order (@orders) {
- my $bd = GetBiblioData( $order->{'biblionumber'} );
+ my $biblio = Koha::Biblios->find( $order->{biblionumber} );
+ my $biblioitem = $biblio->biblioitem;
my $row = {
- clientnumber => $bookseller->{accountnumber},
+ clientnumber => $bookseller->accountnumber,
basketname => $basket->{basketname},
ordernumber => $order->{ordernumber},
- author => $bd->{author},
- title => $bd->{title},
- publishercode => $bd->{publishercode},
- publicationyear => $bd->{publicationyear},
- collectiontitle => $bd->{collectiontitle},
+ author => $biblio->author,
+ title => $biblio->title,
+ publishercode => $biblioitem->publishercode,
+ publicationyear => $biblioitem->publicationyear,
+ collectiontitle => $biblioitem->collectiontitle,
isbn => $order->{isbn},
quantity => $order->{quantity},
- rrp => $order->{rrp},
- discount => $bookseller->{discount},
- ecost => $order->{ecost},
+ rrp_tax_included => $order->{rrp_tax_included},
+ rrp_tax_excluded => $order->{rrp_tax_excluded},
+ discount => $bookseller->discount,
+ ecost_tax_included => $order->{ecost_tax_included},
+ ecost_tax_excluded => $order->{ecost_tax_excluded},
notes => $order->{order_vendornote},
entrydate => $order->{entrydate},
- booksellername => $bookseller->{name},
- bookselleraddress => $bookseller->{address1},
- booksellerpostal => $bookseller->{postal},
+ booksellername => $bookseller->name,
+ bookselleraddress => $bookseller->address1,
+ booksellerpostal => $bookseller->postal,
contractnumber => $contract->{contractnumber},
contractname => $contract->{contractname},
- basketgroupdeliveryplace => C4::Branch::GetBranchName( $basketgroup->{deliveryplace} ),
- basketgroupbillingplace => C4::Branch::GetBranchName( $basketgroup->{billingplace} ),
- basketdeliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),
- basketbillingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
};
+ my $temp = {
+ basketgroupdeliveryplace => $basketgroup->{deliveryplace},
+ basketgroupbillingplace => $basketgroup->{billingplace},
+ basketdeliveryplace => $basket->{deliveryplace},
+ basketbillingplace => $basket->{billingplace},
+ };
+ for my $place (qw( basketgroupdeliveryplace basketgroupbillingplace basketdeliveryplace basketbillingplace )) {
+ if ( my $library = Koha::Libraries->find( $temp->{$place} ) ) {
+ $row->{$place} = $library->branchname;
+ }
+ }
foreach(qw(
basketname author title publishercode collectiontitle notes
booksellername bookselleraddress booksellerpostal contractname
#------------------------------------------------------------#
-
-=head3 DelBasket
-
- &DelBasket($basketno);
-
-Deletes the basket that has basketno field $basketno in the aqbasket table.
-
-=over
-
-=item C<$basketno> is the primary key of the basket in the aqbasket table.
-
-=back
-
-=cut
-
-sub DelBasket {
- my ( $basketno ) = @_;
- my $query = "DELETE FROM aqbasket WHERE basketno=?";
- my $dbh = C4::Context->dbh;
- my $sth = $dbh->prepare($query);
- $sth->execute($basketno);
- return;
-}
-
-#------------------------------------------------------------#
-
=head3 ModBasket
&ModBasket($basketinfo);
my $sth = $dbh->prepare($query);
$sth->execute(@params);
+ # Log the basket update
+ if (C4::Context->preference("AcquisitionLog")) {
+ my $modified = Koha::Acquisition::Baskets->find(
+ $basketinfo->{basketno}
+ );
+ logaction(
+ 'ACQUISITIONS',
+ 'MODIFY_BASKET',
+ $basketinfo->{basketno},
+ to_json($modified->unblessed)
+ );
+ }
+
return;
}
=item C<$is_standing> is the "is_standing" field in the aqbasket table.
+=item C<$create_items> should be set to 'ordering', 'receiving' or 'cataloguing' (or undef, in which
+case the AcqCreateItem syspref takes precedence).
+
=back
=cut
sub ModBasketHeader {
- my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing) = @_;
+ my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items) = @_;
+
+ $is_standing ||= 0;
my $query = qq{
UPDATE aqbasket
- SET basketname=?, note=?, booksellernote=?, booksellerid=?, deliveryplace=?, billingplace=?, is_standing=?
+ SET basketname=?, note=?, booksellernote=?, booksellerid=?, deliveryplace=?, billingplace=?, is_standing=?, create_items=?
WHERE basketno=?
};
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare($query);
- $sth->execute($basketname, $note, $booksellernote, $booksellerid, $deliveryplace, $billingplace, $is_standing, $basketno);
+ $sth->execute($basketname, $note, $booksellernote, $booksellerid, $deliveryplace, $billingplace, $is_standing, $create_items || undef, $basketno);
if ( $contractnumber ) {
my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?";
my $sth2 = $dbh->prepare($query2);
$sth2->execute($contractnumber,$basketno);
}
+
+ # Log the basket update
+ if (C4::Context->preference("AcquisitionLog")) {
+ my $modified = Koha::Acquisition::Baskets->find(
+ $basketno
+ );
+ logaction(
+ 'ACQUISITIONS',
+ 'MODIFY_BASKET_HEADER',
+ $basketno,
+ to_json($modified->unblessed)
+ );
+ }
+
return;
}
my $dbh = C4::Context->dbh;
my $query = q{
- SELECT aqbasket.*,
+ SELECT aqbasket.basketno, aqbasket.basketname, aqbasket.note, aqbasket.booksellernote, aqbasket.contractnumber, aqbasket.creationdate, aqbasket.closedate, aqbasket.booksellerid, aqbasket.authorisedby, aqbasket.booksellerinvoicenumber, aqbasket.basketgroupid, aqbasket.deliveryplace, aqbasket.billingplace, aqbasket.branch, aqbasket.is_standing, aqbasket.create_items,
SUM(aqorders.quantity) AS total_items,
SUM(
IF ( aqorders.orderstatus = 'cancelled', aqorders.quantity, 0 )
AND aqorders.datecancellationprinted IS NULL
, aqorders.quantity
, 0)
- ) AS expected_items
+ ) AS expected_items,
+ SUM( aqorders.uncertainprice ) AS uncertainprices
FROM aqbasket
LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno
WHERE booksellerid = ?};
+ $query.=" GROUP BY aqbasket.basketno, aqbasket.basketname, aqbasket.note, aqbasket.booksellernote, aqbasket.contractnumber, aqbasket.creationdate, aqbasket.closedate, aqbasket.booksellerid, aqbasket.authorisedby, aqbasket.booksellerinvoicenumber, aqbasket.basketgroupid, aqbasket.deliveryplace, aqbasket.billingplace, aqbasket.branch, aqbasket.is_standing, aqbasket.create_items";
+
unless ( $allbaskets ) {
- $query.=" AND (closedate IS NULL OR (aqorders.quantity > aqorders.quantityreceived AND datecancellationprinted IS NULL))";
+ # Don't show the basket if it's NOT CLOSED or is FULLY RECEIVED
+ $query.=" HAVING (closedate IS NULL OR (
+ SUM(
+ IF(aqorders.datereceived IS NULL
+ AND aqorders.datecancellationprinted IS NULL
+ , aqorders.quantity
+ , 0)
+ ) > 0))"
}
- $query.=" GROUP BY aqbasket.basketno";
my $sth = $dbh->prepare($query);
$sth->execute($supplierid);
foreach my $basketuser_id (@basketusers_ids) {
$sth->execute($basketno, $basketuser_id);
}
+
+ # Log the basket update
+ if (C4::Context->preference("AcquisitionLog")) {
+ logaction(
+ 'ACQUISITIONS',
+ 'MODIFY_BASKET_USERS',
+ $basketno,
+ to_json({
+ basketno => $basketno,
+ basketusers => @basketusers_ids
+ })
+ );
+ }
+
return;
}
branch).
First parameter can be either a borrowernumber or a hashref as returned by
-C4::Members::GetMember.
+Koha::Patron->unblessed
Second parameter can be either a basketno or a hashref as returned by
C4::Acquisition::GetBasket.
my ($borrower, $basket, $userflags) = @_;
if (!ref $borrower) {
- $borrower = C4::Members::GetMember(borrowernumber => $borrower);
+ # FIXME This needs to be replaced
+ # We should not accept both scalar and array
+ # Tests need to be updated
+ $borrower = Koha::Patrons->find( $borrower )->unblessed;
}
if (!ref $basket) {
$basket = GetBasket($basket);
if ($AcqViewBaskets eq 'user'
&& $basket->{authorisedby} != $borrowernumber
- && grep($borrowernumber, GetBasketUsers($basketno)) == 0) {
- return 0;
+ && ! grep { $borrowernumber eq $_ } GetBasketUsers($basketno)) {
+ return 0;
}
if ($AcqViewBaskets eq 'branch' && defined $basket->{branch}
if ($cancelled) {
$orderby ||= q|biblioitems.publishercode, biblio.title|;
$query .= q|
- AND (datecancellationprinted IS NOT NULL
- AND datecancellationprinted <> '0000-00-00')
+ AND datecancellationprinted IS NOT NULL
|;
}
else {
$orderby ||=
q|aqorders.datecancellationprinted desc, aqorders.timestamp desc|;
$query .= q|
- AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
+ AND datecancellationprinted IS NULL
|;
}
biblioitems.publishercode,
aqorders.rrp AS unitpricesupplier,
aqorders.ecost AS unitpricelib,
- aqorders.claims_count AS claims_count,
- aqorders.claimed_date AS claimed_date,
aqbudgets.budget_name AS budget,
aqbooksellers.name AS supplier,
aqbooksellers.id AS supplierid,
return $result_set->[0];
}
-=head3 GetLastOrderNotReceivedFromSubscriptionid
-
- $order = &GetLastOrderNotReceivedFromSubscriptionid($subscriptionid);
-
-Returns a reference-to-hash describing the last order not received for a subscription.
-
-=cut
-
-sub GetLastOrderNotReceivedFromSubscriptionid {
- my ( $subscriptionid ) = @_;
- my $dbh = C4::Context->dbh;
- my $query = qq|
- SELECT * FROM aqorders
- LEFT JOIN subscription
- ON ( aqorders.subscriptionid = subscription.subscriptionid )
- WHERE aqorders.subscriptionid = ?
- AND aqorders.datereceived IS NULL
- LIMIT 1
- |;
- my $result_set =
- $dbh->selectall_arrayref( $query, { Slice => {} }, $subscriptionid );
-
- # result_set assumed to contain 1 match
- return $result_set->[0];
-}
-
-=head3 GetLastOrderReceivedFromSubscriptionid
-
- $order = &GetLastOrderReceivedFromSubscriptionid($subscriptionid);
-
-Returns a reference-to-hash describing the last order received for a subscription.
-
-=cut
-
-sub GetLastOrderReceivedFromSubscriptionid {
- my ( $subscriptionid ) = @_;
- my $dbh = C4::Context->dbh;
- my $query = qq|
- SELECT * FROM aqorders
- LEFT JOIN subscription
- ON ( aqorders.subscriptionid = subscription.subscriptionid )
- WHERE aqorders.subscriptionid = ?
- AND aqorders.datereceived =
- (
- SELECT MAX( aqorders.datereceived )
- FROM aqorders
- LEFT JOIN subscription
- ON ( aqorders.subscriptionid = subscription.subscriptionid )
- WHERE aqorders.subscriptionid = ?
- AND aqorders.datereceived IS NOT NULL
- )
- ORDER BY ordernumber DESC
- LIMIT 1
- |;
- my $result_set =
- $dbh->selectall_arrayref( $query, { Slice => {} }, $subscriptionid, $subscriptionid );
-
- # result_set assumed to contain 1 match
- return $result_set->[0];
-
-}
-
-#------------------------------------------------------------#
-
=head3 ModOrder
&ModOrder(\%hashref);
foreach my $orderinfokey (grep(!/ordernumber/, keys %$orderinfo)){
# ... and skip hash entries that are not in the aqorders table
# FIXME : probably not the best way to do it (would be better to have a correct hash)
- next unless grep(/^$orderinfokey$/, @$colnames);
+ next unless grep { $_ eq $orderinfokey } @$colnames;
$query .= "$orderinfokey=?, ";
push(@params, $orderinfo->{$orderinfokey});
}
=head3 ModReceiveOrder
- &ModReceiveOrder({
- biblionumber => $biblionumber,
- ordernumber => $ordernumber,
- quantityreceived => $quantityreceived,
- user => $user,
- cost => $cost,
- ecost => $ecost,
- invoiceid => $invoiceid,
- rrp => $rrp,
- budget_id => $budget_id,
- datereceived => $datereceived,
- received_itemnumbers => \@received_itemnumbers,
- order_internalnote => $order_internalnote,
- order_vendornote => $order_vendornote,
- });
+ my ( $date_received, $new_ordernumber ) = ModReceiveOrder(
+ {
+ biblionumber => $biblionumber,
+ order => $order,
+ quantityreceived => $quantityreceived,
+ user => $user,
+ invoice => $invoice,
+ budget_id => $budget_id,
+ datereceived => $datereceived,
+ received_itemnumbers => \@received_itemnumbers,
+ }
+ );
Updates an order, to reflect the fact that it was received, at least
-in part. All arguments not mentioned below update the fields with the
-same name in the aqorders table of the Koha database.
+in part.
If a partial order is received, splits the order into two.
-Updates the order with bibilionumber C<$biblionumber> and ordernumber
-C<$ordernumber>.
+Updates the order with biblionumber C<$biblionumber> and ordernumber
+C<$order->{ordernumber}>.
=cut
sub ModReceiveOrder {
- my ( $params ) = @_;
- my $biblionumber = $params->{biblionumber};
- my $ordernumber = $params->{ordernumber};
- my $quantrec = $params->{quantityreceived};
- my $user = $params->{user};
- my $cost = $params->{cost};
- my $ecost = $params->{ecost};
- my $invoiceid = $params->{invoiceid};
- my $rrp = $params->{rrp};
- my $budget_id = $params->{budget_id};
- my $datereceived = $params->{datereceived};
+ my ($params) = @_;
+ my $biblionumber = $params->{biblionumber};
+ my $order = { %{ $params->{order} } }; # Copy the order, we don't want to modify it
+ my $invoice = $params->{invoice};
+ my $quantrec = $params->{quantityreceived};
+ my $user = $params->{user};
+ my $budget_id = $params->{budget_id};
+ my $datereceived = $params->{datereceived};
my $received_items = $params->{received_items};
- my $order_internalnote = $params->{order_internalnote};
- my $order_vendornote = $params->{order_vendornote};
my $dbh = C4::Context->dbh;
$datereceived = output_pref(
dateonly => 1,
}
);
+
my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber );
if ($suggestionid) {
ModSuggestion( {suggestionid=>$suggestionid,
);
}
- my $result_set = $dbh->selectall_arrayref(
-q{SELECT *, aqbasket.is_standing FROM aqorders LEFT JOIN aqbasket USING (basketno) WHERE biblionumber=? AND aqorders.ordernumber=?},
- { Slice => {} }, $biblionumber, $ordernumber
- );
-
- # we assume we have a unique order
- my $order = $result_set->[0];
+ my $result_set = $dbh->selectrow_arrayref(
+ q{SELECT aqbasket.is_standing
+ FROM aqbasket
+ WHERE basketno=?},{ Slice => {} }, $order->{basketno});
+ my $is_standing = $result_set->[0]; # we assume we have a unique basket
- my $new_ordernumber = $ordernumber;
- if ( $order->{is_standing} || $order->{quantity} > $quantrec ) {
+ my $new_ordernumber = $order->{ordernumber};
+ if ( $is_standing || $order->{quantity} > $quantrec ) {
# Split order line in two parts: the first is the original order line
# without received items (the quantity is decreased),
# the second part is a new order line with quantity=quantityrec
UPDATE aqorders
SET quantity = ?,
orderstatus = 'partial'|;
- $query .= q|, order_internalnote = ?| if defined $order_internalnote;
- $query .= q|, order_vendornote = ?| if defined $order_vendornote;
$query .= q| WHERE ordernumber = ?|;
my $sth = $dbh->prepare($query);
$sth->execute(
- ( $order->{is_standing} ? 1 : ( $order->{quantity} - $quantrec ) ),
- ( defined $order_internalnote ? $order_internalnote : () ),
- ( defined $order_vendornote ? $order_vendornote : () ),
- $ordernumber
+ ( $is_standing ? 1 : ($order->{quantity} - $quantrec) ),
+ $order->{ordernumber}
);
- delete $order->{'ordernumber'};
- $order->{'budget_id'} = ( $budget_id || $order->{'budget_id'} );
- $order->{'quantity'} = $quantrec;
- $order->{'quantityreceived'} = $quantrec;
- $order->{'datereceived'} = $datereceived;
- $order->{'invoiceid'} = $invoiceid;
- $order->{'unitprice'} = $cost;
- $order->{'rrp'} = $rrp;
- $order->{ecost} = $ecost;
- $order->{'orderstatus'} = 'complete';
- $new_ordernumber = Koha::Acquisition::Order->new($order)->insert->{ordernumber};
+ if ( not $order->{subscriptionid} && defined $order->{order_internalnote} ) {
+ $dbh->do(
+ q|UPDATE aqorders
+ SET order_internalnote = ?
+ WHERE ordernumber = ?|, {},
+ $order->{order_internalnote}, $order->{ordernumber}
+ );
+ }
+
+ # Recalculate tax_value
+ $dbh->do(q|
+ UPDATE aqorders
+ SET
+ tax_value_on_ordering = quantity * | . get_rounding_sql(q|ecost_tax_excluded|) . q| * tax_rate_on_ordering,
+ tax_value_on_receiving = quantity * | . get_rounding_sql(q|unitprice_tax_excluded|) . q| * tax_rate_on_receiving
+ WHERE ordernumber = ?
+ |, undef, $order->{ordernumber});
+
+ delete $order->{ordernumber};
+ $order->{budget_id} = ( $budget_id || $order->{budget_id} );
+ $order->{quantity} = $quantrec;
+ $order->{quantityreceived} = $quantrec;
+ $order->{ecost_tax_excluded} //= 0;
+ $order->{tax_rate_on_ordering} //= 0;
+ $order->{unitprice_tax_excluded} //= 0;
+ $order->{tax_rate_on_receiving} //= 0;
+ $order->{tax_value_on_ordering} = $order->{quantity} * get_rounded_price($order->{ecost_tax_excluded}) * $order->{tax_rate_on_ordering};
+ $order->{tax_value_on_receiving} = $order->{quantity} * get_rounded_price($order->{unitprice_tax_excluded}) * $order->{tax_rate_on_receiving};
+ $order->{datereceived} = $datereceived;
+ $order->{invoiceid} = $invoice->{invoiceid};
+ $order->{orderstatus} = 'complete';
+ $new_ordernumber = Koha::Acquisition::Order->new($order)->store->ordernumber; # TODO What if the store fails?
if ($received_items) {
foreach my $itemnumber (@$received_items) {
}
} else {
my $query = q|
- update aqorders
- set quantityreceived=?,datereceived=?,invoiceid=?,
- unitprice=?,rrp=?,ecost=?,budget_id=?,orderstatus='complete'|;
- $query .= q|, order_internalnote = ?| if defined $order_internalnote;
- $query .= q|, order_vendornote = ?| if defined $order_vendornote;
+ UPDATE aqorders
+ SET quantityreceived = ?,
+ datereceived = ?,
+ invoiceid = ?,
+ budget_id = ?,
+ orderstatus = 'complete'
+ |;
+
+ $query .= q|
+ , replacementprice = ?
+ | if defined $order->{replacementprice};
+
+ $query .= q|
+ , unitprice = ?, unitprice_tax_included = ?, unitprice_tax_excluded = ?
+ | if defined $order->{unitprice};
+
+ $query .= q|
+ ,tax_value_on_receiving = ?
+ | if defined $order->{tax_value_on_receiving};
+
+ $query .= q|
+ ,tax_rate_on_receiving = ?
+ | if defined $order->{tax_rate_on_receiving};
+
+ $query .= q|
+ , order_internalnote = ?
+ | if defined $order->{order_internalnote};
+
$query .= q| where biblionumber=? and ordernumber=?|;
+
my $sth = $dbh->prepare( $query );
- $sth->execute(
- $quantrec,
- $datereceived,
- $invoiceid,
- $cost,
- $rrp,
- $ecost,
- ( $budget_id ? $budget_id : $order->{budget_id} ),
- ( defined $order_internalnote ? $order_internalnote : () ),
- ( defined $order_vendornote ? $order_vendornote : () ),
- $biblionumber,
- $ordernumber
- );
+ my @params = ( $quantrec, $datereceived, $invoice->{invoiceid}, ( $budget_id ? $budget_id : $order->{budget_id} ) );
+
+ if ( defined $order->{replacementprice} ) {
+ push @params, $order->{replacementprice};
+ }
+
+ if ( defined $order->{unitprice} ) {
+ push @params, $order->{unitprice}, $order->{unitprice_tax_included}, $order->{unitprice_tax_excluded};
+ }
+
+ if ( defined $order->{tax_value_on_receiving} ) {
+ push @params, $order->{tax_value_on_receiving};
+ }
+
+ if ( defined $order->{tax_rate_on_receiving} ) {
+ push @params, $order->{tax_rate_on_receiving};
+ }
+
+ if ( defined $order->{order_internalnote} ) {
+ push @params, $order->{order_internalnote};
+ }
+
+ push @params, ( $biblionumber, $order->{ordernumber} );
+
+ $sth->execute( @params );
# All items have been received, sent a notification to users
- NotifyOrderUsers( $ordernumber );
+ NotifyOrderUsers( $order->{ordernumber} );
}
return ($datereceived, $new_ordernumber);
my $parent_ordernumber = $order->{'parent_ordernumber'};
- my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
+ my $order_obj = Koha::Acquisition::Orders->find( $ordernumber ); # FIXME rewrite all this subroutine using this object
+ my @itemnumbers = $order_obj->items->get_column('itemnumber');
if($parent_ordernumber == $ordernumber || not $parent_ordernumber) {
# The order line has no parent, just mark it as not received
};
$sth = $dbh->prepare($query);
$sth->execute(0, undef, undef, $ordernumber);
- _cancel_items_receipt( $ordernumber );
+ _cancel_items_receipt( $order_obj );
} else {
# The order line has a parent, increase parent quantity and delete
# the order line.
- $query = qq{
- SELECT quantity, datereceived
- FROM aqorders
- WHERE ordernumber = ?
- };
- $sth = $dbh->prepare($query);
- $sth->execute($parent_ordernumber);
- my $parent_order = $sth->fetchrow_hashref;
- unless($parent_order) {
- warn "Parent order $parent_ordernumber does not exist.";
- return;
- }
- if($parent_order->{'datereceived'}) {
- warn "CancelReceipt: parent order is received.".
- " Can't cancel receipt.";
- return;
- }
- $query = qq{
- UPDATE aqorders
- SET quantity = ?,
- orderstatus = 'ordered'
- WHERE ordernumber = ?
- };
- $sth = $dbh->prepare($query);
- my $rv = $sth->execute(
- $order->{'quantity'} + $parent_order->{'quantity'},
- $parent_ordernumber
- );
- unless($rv) {
- warn "Cannot update parent order line, so do not cancel".
- " receipt";
- return;
+ unless ( $order_obj->basket->is_standing ) {
+ $query = qq{
+ SELECT quantity, datereceived
+ FROM aqorders
+ WHERE ordernumber = ?
+ };
+ $sth = $dbh->prepare($query);
+ $sth->execute($parent_ordernumber);
+ my $parent_order = $sth->fetchrow_hashref;
+ unless($parent_order) {
+ warn "Parent order $parent_ordernumber does not exist.";
+ return;
+ }
+ if($parent_order->{'datereceived'}) {
+ warn "CancelReceipt: parent order is received.".
+ " Can't cancel receipt.";
+ return;
+ }
+ $query = qq{
+ UPDATE aqorders
+ SET quantity = ?,
+ orderstatus = 'ordered'
+ WHERE ordernumber = ?
+ };
+ $sth = $dbh->prepare($query);
+ my $rv = $sth->execute(
+ $order->{'quantity'} + $parent_order->{'quantity'},
+ $parent_ordernumber
+ );
+ unless($rv) {
+ warn "Cannot update parent order line, so do not cancel".
+ " receipt";
+ return;
+ }
+
+ # Recalculate tax_value
+ $dbh->do(q|
+ UPDATE aqorders
+ SET
+ tax_value_on_ordering = quantity * | . get_rounding_sql(q|ecost_tax_excluded|) . q| * tax_rate_on_ordering,
+ tax_value_on_receiving = quantity * | . get_rounding_sql(q|unitprice_tax_excluded|) . q| * tax_rate_on_receiving
+ WHERE ordernumber = ?
+ |, undef, $parent_ordernumber);
}
- _cancel_items_receipt( $ordernumber, $parent_ordernumber );
+
+ _cancel_items_receipt( $order_obj, $parent_ordernumber );
# Delete order line
$query = qq{
DELETE FROM aqorders
}
- if(C4::Context->preference('AcqCreateItem') eq 'ordering') {
+ if( $order_obj->basket->effective_create_items eq 'ordering' ) {
my @affects = split q{\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceiptIsCancelled");
if ( @affects ) {
for my $in ( @itemnumbers ) {
- my $biblionumber = C4::Biblio::GetBiblionumberFromItemnumber( $in );
- my $frameworkcode = GetFrameworkCode($biblionumber);
- my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber', $frameworkcode );
- my $item = C4::Items::GetMarcItem( $biblionumber, $in );
+ my $item = Koha::Items->find( $in ); # FIXME We do not need that, we already have Koha::Items from $order_obj->items
+ my $biblio = $item->biblio;
+ my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber' );
+ my $item_marc = C4::Items::GetMarcItem( $biblio->biblionumber, $in );
for my $affect ( @affects ) {
my ( $sf, $v ) = split q{=}, $affect, 2;
- foreach ( $item->field($itemfield) ) {
+ foreach ( $item_marc->field($itemfield) ) {
$_->update( $sf => $v );
}
}
- C4::Items::ModItemFromMarc( $item, $biblionumber, $in );
+ C4::Items::ModItemFromMarc( $item_marc, $biblio->biblionumber, $in );
}
}
}
}
sub _cancel_items_receipt {
- my ( $ordernumber, $parent_ordernumber ) = @_;
- $parent_ordernumber ||= $ordernumber;
+ my ( $order, $parent_ordernumber ) = @_;
+ $parent_ordernumber ||= $order->ordernumber;
- my @itemnumbers = GetItemnumbersFromOrder($ordernumber);
- if(C4::Context->preference('AcqCreateItem') eq 'receiving') {
+ my $items = $order->items;
+ if ( $order->basket->effective_create_items eq 'receiving' ) {
# Remove items that were created at receipt
my $query = qq{
DELETE FROM items, aqorders_items
};
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare($query);
- foreach my $itemnumber (@itemnumbers) {
- $sth->execute($itemnumber, $itemnumber);
+ while ( my $item = $items->next ) {
+ $sth->execute($item->itemnumber, $item->itemnumber);
}
} else {
# Update items
- foreach my $itemnumber (@itemnumbers) {
- ModItemOrder($itemnumber, $parent_ordernumber);
+ while ( my $item = $items->next ) {
+ ModItemOrder($item->itemnumber, $parent_ordernumber);
}
}
}
@results = &SearchOrders({
ordernumber => $ordernumber,
search => $search,
- biblionumber => $biblionumber,
ean => $ean,
booksellerid => $booksellerid,
basketno => $basketno,
+ basketname => $basketname,
+ basketgroupname => $basketgroupname,
owner => $owner,
pending => $pending
ordered => $ordered
+ biblionumber => $biblionumber,
+ budget_id => $budget_id
});
-Searches for orders.
+Searches for orders filtered by criteria.
+C<$ordernumber> Finds matching orders or transferred orders by ordernumber.
+C<$search> Finds orders matching %$search% in title, author, or isbn.
C<$owner> Finds order for the logged in user.
C<$pending> Finds pending orders. Ignores completed and cancelled orders.
C<$ordered> Finds orders to receive only (status 'ordered' or 'partial').
biblio.*,
biblioitems.isbn,
biblioitems.biblioitemnumber,
+ biblioitems.publishercode,
+ biblioitems.publicationyear,
aqbasket.authorisedby,
aqbasket.booksellerid,
aqbasket.closedate,
#------------------------------------------------------------#
-=head3 DelOrder
-
- &DelOrder($biblionumber, $ordernumber);
-
-Cancel the order with the given order and biblio numbers. It does not
-delete any entries in the aqorders table, it merely marks them as
-cancelled.
-
-=cut
-
-sub DelOrder {
- my ( $bibnum, $ordernumber, $delete_biblio, $reason ) = @_;
-
- my $error;
- my $dbh = C4::Context->dbh;
- my $query = "
- UPDATE aqorders
- SET datecancellationprinted=now(), orderstatus='cancelled'
- ";
- if($reason) {
- $query .= ", cancellationreason = ? ";
- }
- $query .= "
- WHERE biblionumber=? AND ordernumber=?
- ";
- my $sth = $dbh->prepare($query);
- if($reason) {
- $sth->execute($reason, $bibnum, $ordernumber);
- } else {
- $sth->execute( $bibnum, $ordernumber );
- }
- $sth->finish;
-
- my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
- foreach my $itemnumber (@itemnumbers){
- my $delcheck = C4::Items::DelItemCheck( $bibnum, $itemnumber );
-
- if($delcheck != 1) {
- $error->{'delitem'} = 1;
- }
- }
-
- if($delete_biblio) {
- # We get the number of remaining items
- my $itemcount = C4::Items::GetItemsCount($bibnum);
-
- # If there are no items left,
- if ( $itemcount == 0 ) {
- # We delete the record
- my $delcheck = DelBiblio($bibnum);
-
- if($delcheck) {
- $error->{'delbiblio'} = 1;
- }
- }
- }
-
- return $error;
-}
-
=head3 TransferOrder
my $newordernumber = TransferOrder($ordernumber, $basketno);
return unless ($ordernumber and $basketno);
- my $order = GetOrder( $ordernumber );
- return if $order->{datereceived};
+ my $order = Koha::Acquisition::Orders->find( $ordernumber ) or return;
+ return if $order->datereceived;
+
+ $order = $order->unblessed;
+
my $basket = GetBasket($basketno);
return unless $basket;
delete $order->{parent_ordernumber};
$order->{'basketno'} = $basketno;
- my $newordernumber = Koha::Acquisition::Order->new($order)->insert->{ordernumber};
+ my $newordernumber = Koha::Acquisition::Order->new($order)->store->ordernumber;
$query = q{
UPDATE aqorders_items
return $newordernumber;
}
+=head3 get_rounding_sql
+
+ $rounding_sql = get_rounding_sql($column_name);
+
+returns the correct SQL routine based on OrderPriceRounding system preference.
+
+=cut
+
+sub get_rounding_sql {
+ my ( $round_string ) = @_;
+ my $rounding_pref = C4::Context->preference('OrderPriceRounding') // q{};
+ if ( $rounding_pref eq "nearest_cent" ) {
+ return "CAST($round_string*100 AS SIGNED)/100";
+ }
+ return $round_string;
+}
+
+=head3 get_rounded_price
+
+ $rounded_price = get_rounded_price( $price );
+
+returns a price rounded as specified in OrderPriceRounding system preference.
+
+=cut
+
+sub get_rounded_price {
+ my ( $price ) = @_;
+ my $rounding_pref = C4::Context->preference('OrderPriceRounding') // q{};
+ if( $rounding_pref eq 'nearest_cent' ) {
+ return Koha::Number::Price->new( $price )->round();
+ }
+ return $price;
+}
+
+
=head2 FUNCTIONS ABOUT PARCELS
=head3 GetParcels
#------------------------------------------------------------#
-=head3 GetLateOrders
-
- @results = &GetLateOrders;
-
-Searches for bookseller with late orders.
-
-return:
-the table of supplier with late issues. This table is full of hashref.
-
-=cut
-
-sub GetLateOrders {
- my $delay = shift;
- my $supplierid = shift;
- my $branch = shift;
- my $estimateddeliverydatefrom = shift;
- my $estimateddeliverydateto = shift;
-
- my $dbh = C4::Context->dbh;
-
- #BEWARE, order of parenthesis and LEFT JOIN is important for speed
- my $dbdriver = C4::Context->config("db_scheme") || "mysql";
-
- my @query_params = ();
- my $select = "
- SELECT aqbasket.basketno,
- aqorders.ordernumber,
- DATE(aqbasket.closedate) AS orderdate,
- aqbasket.basketname AS basketname,
- aqbasket.basketgroupid AS basketgroupid,
- aqbasketgroups.name AS basketgroupname,
- aqorders.rrp AS unitpricesupplier,
- aqorders.ecost AS unitpricelib,
- aqorders.claims_count AS claims_count,
- aqorders.claimed_date AS claimed_date,
- aqbudgets.budget_name AS budget,
- borrowers.branchcode AS branch,
- aqbooksellers.name AS supplier,
- aqbooksellers.id AS supplierid,
- biblio.author, biblio.title,
- biblioitems.publishercode AS publisher,
- biblioitems.publicationyear,
- ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
- ";
- my $from = "
- FROM
- aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber
- LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber
- LEFT JOIN aqbudgets ON aqorders.budget_id = aqbudgets.budget_id,
- aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber
- LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
- LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid = aqbasketgroups.id
- WHERE aqorders.basketno = aqbasket.basketno
- AND ( datereceived = ''
- OR datereceived IS NULL
- OR aqorders.quantityreceived < aqorders.quantity
- )
- AND aqbasket.closedate IS NOT NULL
- AND (aqorders.datecancellationprinted IS NULL OR aqorders.datecancellationprinted='0000-00-00')
- ";
- my $having = "";
- if ($dbdriver eq "mysql") {
- $select .= "
- aqorders.quantity - COALESCE(aqorders.quantityreceived,0) AS quantity,
- (aqorders.quantity - COALESCE(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
- DATEDIFF(CAST(now() AS date),closedate) AS latesince
- ";
- if ( defined $delay ) {
- $from .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? DAY)) " ;
- push @query_params, $delay;
- }
- $having = "
- HAVING quantity <> 0
- AND unitpricesupplier <> 0
- AND unitpricelib <> 0
- ";
- } else {
- # FIXME: account for IFNULL as above
- $select .= "
- aqorders.quantity AS quantity,
- aqorders.quantity * aqorders.rrp AS subtotal,
- (CAST(now() AS date) - closedate) AS latesince
- ";
- if ( defined $delay ) {
- $from .= " AND (closedate <= (CAST(now() AS date) -(INTERVAL ? DAY)) ";
- push @query_params, $delay;
- }
- }
- if (defined $supplierid) {
- $from .= ' AND aqbasket.booksellerid = ? ';
- push @query_params, $supplierid;
- }
- if (defined $branch) {
- $from .= ' AND borrowers.branchcode LIKE ? ';
- push @query_params, $branch;
- }
-
- if ( defined $estimateddeliverydatefrom or defined $estimateddeliverydateto ) {
- $from .= ' AND aqbooksellers.deliverytime IS NOT NULL ';
- }
- if ( defined $estimateddeliverydatefrom ) {
- $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) >= ?';
- push @query_params, $estimateddeliverydatefrom;
- }
- if ( defined $estimateddeliverydateto ) {
- $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= ?';
- push @query_params, $estimateddeliverydateto;
- }
- if ( defined $estimateddeliverydatefrom and not defined $estimateddeliverydateto ) {
- $from .= ' AND ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) <= CAST(now() AS date)';
- }
- if (C4::Context->preference("IndependentBranches")
- && !C4::Context->IsSuperLibrarian() ) {
- $from .= ' AND borrowers.branchcode LIKE ? ';
- push @query_params, C4::Context->userenv->{branch};
- }
- $from .= " AND orderstatus <> 'cancelled' ";
- my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier";
- $debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params);
- my $sth = $dbh->prepare($query);
- $sth->execute(@query_params);
- my @results;
- while (my $data = $sth->fetchrow_hashref) {
- push @results, $data;
- }
- return @results;
-}
-
-#------------------------------------------------------------#
-
=head3 GetHistory
\@order_loop = GetHistory( %params );
budget
orderstatus (note that orderstatus '' will retrieve orders
of any status except cancelled)
+ is_standing
+ managing_library
biblionumber
get_canceled_order (if set to a true value, cancelled orders will
be included)
'ordernumber' => '1',
'quantity' => 1,
'quantityreceived' => undef,
- 'title' => 'The Adventures of Huckleberry Finn'
+ 'title' => 'The Adventures of Huckleberry Finn',
+ 'managing_library' => 'CPL'
+ 'is_standing' => '1'
}
=cut
my $basketgroupname = $params{basketgroupname};
my $budget = $params{budget};
my $orderstatus = $params{orderstatus};
+ my $is_standing = $params{is_standing};
my $biblionumber = $params{biblionumber};
my $get_canceled_order = $params{get_canceled_order} || 0;
my $ordernumber = $params{ordernumber};
my $search_children_too = $params{search_children_too} || 0;
my $created_by = $params{created_by} || [];
+ my $managing_library = $params{managing_library};
+ my $ordernumbers = $params{ordernumbers} || [];
+ my $additional_fields = $params{additional_fields} // [];
- my @order_loop;
my $total_qty = 0;
my $total_qtyreceived = 0;
my $total_price = 0;
+ #get variation of isbn
+ my @isbn_params;
+ my @isbns;
+ if ($isbn){
+ if ( C4::Context->preference("SearchWithISBNVariations") ){
+ @isbns = C4::Koha::GetVariationsOfISBN( $isbn );
+ foreach my $isb (@isbns){
+ push @isbn_params, '?';
+ }
+ }
+ unless (@isbns){
+ push @isbns, $isbn;
+ push @isbn_params, '?';
+ }
+ }
+
my $dbh = C4::Context->dbh;
my $query ="
SELECT
aqbasket.basketname,
aqbasket.basketgroupid,
aqbasket.authorisedby,
+ aqbasket.is_standing,
concat( borrowers.firstname,' ',borrowers.surname) AS authorisedbyname,
+ branch as managing_library,
aqbasketgroups.name as groupname,
aqbooksellers.name,
aqbasket.creationdate,
$query .= " WHERE 1 ";
unless ($get_canceled_order or (defined $orderstatus and $orderstatus eq 'cancelled')) {
- $query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') ";
+ $query .= " AND datecancellationprinted IS NULL ";
}
my @query_params = ();
push @query_params, "%$author%";
}
- if ( $isbn ) {
- $query .= " AND biblioitems.isbn LIKE ? ";
- push @query_params, "%$isbn%";
+ if ( @isbns ) {
+ $query .= " AND ( biblioitems.isbn LIKE " . join (" OR biblioitems.isbn LIKE ", @isbn_params ) . ")";
+ foreach my $isb (@isbns){
+ push @query_params, "%$isb%";
+ }
}
+
if ( $ean ) {
$query .= " AND biblioitems.ean = ? ";
push @query_params, "$ean";
push @query_params, "$orderstatus";
}
+ if ( $is_standing ) {
+ $query .= " AND is_standing = ? ";
+ push @query_params, $is_standing;
+ }
+
if ($basket) {
if ($basket =~ m/^\d+$/) {
$query .= " AND aqorders.basketno = ? ";
push @query_params, @$created_by;
}
+ if ( $managing_library ) {
+ $query .= " AND aqbasket.branch = ? ";
+ push @query_params, $managing_library;
+ }
+
+ if ( @$ordernumbers ) {
+ $query .= ' AND (aqorders.ordernumber IN ( ' . join (',', ('?') x @$ordernumbers ) . '))';
+ push @query_params, @$ordernumbers;
+ }
+ if ( @$additional_fields ) {
+ my @baskets = Koha::Acquisition::Baskets->filter_by_additional_fields($additional_fields);
+
+ return [] unless @baskets;
+
+ # No parameterization because record IDs come directly from DB
+ $query .= ' AND aqbasket.basketno IN ( ' . join( ',', map { $_->basketno } @baskets ) . ' )';
+ }
if ( C4::Context->preference("IndependentBranches") ) {
unless ( C4::Context->IsSuperLibrarian() ) {
$results = GetRecentAcqui($days);
-C<$results> is a ref to a table which containts hashref
+C<$results> is a ref to a table which contains hashref
=cut
my $dbh = C4::Context->dbh;
my $query = qq{
- SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
+ SELECT aqinvoices.invoiceid, aqinvoices.invoicenumber, aqinvoices.booksellerid, aqinvoices.shipmentdate, aqinvoices.billingdate, aqinvoices.closedate, aqinvoices.shipmentcost, aqinvoices.shipmentcost_budgetid, aqinvoices.message_id,
+ aqbooksellers.name AS suppliername,
COUNT(
DISTINCT IF(
aqorders.datereceived IS NOT NULL,
}
$query .= " WHERE " . join(" AND ", @bind_strs) if @bind_strs;
- $query .= " GROUP BY aqinvoices.invoiceid ";
+ $query .= " GROUP BY aqinvoices.invoiceid, aqinvoices.invoicenumber, aqinvoices.booksellerid, aqinvoices.shipmentdate, aqinvoices.billingdate, aqinvoices.closedate, aqinvoices.shipmentcost, aqinvoices.shipmentcost_budgetid, aqinvoices.message_id, aqbooksellers.name";
if($args{order_by}) {
my ($column, $direction) = split / /, $args{order_by};
- if(grep /^$column$/, @columns) {
+ if(grep { $_ eq $column } @columns) {
$direction ||= 'ASC';
$query .= " ORDER BY $column $direction";
}
SELECT aqorders.*,
biblio.*,
biblio.copyrightdate,
+ biblioitems.isbn,
biblioitems.publishercode,
biblioitems.publicationyear,
aqbasket.basketname,
my @set_strs;
my @set_args;
foreach my $key (keys %invoice) {
- if(0 < grep(/^$key$/, @columns)) {
+ if(0 < grep { $_ eq $key } @columns) {
push @set_strs, "$key = ?";
push @set_args, ($invoice{$key} || undef);
}
my @set_strs;
my @set_args;
foreach my $key (keys %invoice) {
- if(0 < grep(/^$key$/, @columns)) {
+ if(0 < grep { $_ eq $key } @columns) {
push @set_strs, "$key = ?";
push @set_args, ($invoice{$key} || undef);
}
SELECT COUNT( DISTINCT( biblionumber ) )
FROM aqorders
WHERE basketno = ?
- AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
+ AND datecancellationprinted IS NULL
";
my $sth = $dbh->prepare($query);
return $sth->fetchrow;
}
-# This is *not* the good way to calcul prices
-# But it's how it works at the moment into Koha
-# This will be fixed later.
-# Note this subroutine should be moved to Koha::Acquisition::Order
-# Will do when a DBIC decision will be taken.
+=head3 populate_order_with_prices
+
+$order = populate_order_with_prices({
+ order => $order #a hashref with the order values
+ booksellerid => $booksellerid #FIXME - should obtain from order basket
+ receiving => 1 # boolean representing order stage, should pass only this or ordering
+ ordering => 1 # boolean representing order stage
+});
+
+
+Sets calculated values for an order - all values are stored with full precision
+regardless of rounding preference except for tax value which is calculated
+on rounded values if requested
+
+For ordering the values set are:
+ rrp_tax_included
+ rrp_tax_excluded
+ ecost_tax_included
+ ecost_tax_excluded
+ tax_value_on_ordering
+For receiving the value set are:
+ unitprice_tax_included
+ unitprice_tax_excluded
+ tax_value_on_receiving
+
+Note: When receiving, if the rounded value of the unitprice matches the rounded
+value of the ecost then then ecost (full precision) is used.
+
+Returns a hashref of the order
+
+FIXME: Move this to Koha::Acquisition::Order.pm
+
+=cut
+
sub populate_order_with_prices {
my ($params) = @_;
my $booksellerid = $params->{booksellerid};
return unless $booksellerid;
- my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+ my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
my $receiving = $params->{receiving};
my $ordering = $params->{ordering};
my $discount = $order->{discount};
$discount /= 100 if $discount > 1;
- $order->{rrp} = Koha::Number::Price->new( $order->{rrp} )->round;
- $order->{ecost} = Koha::Number::Price->new( $order->{ecost} )->round;
if ($ordering) {
- if ( $bookseller->{listincgst} ) {
- $order->{rrpgsti} = $order->{rrp};
- $order->{rrpgste} = Koha::Number::Price->new(
- $order->{rrpgsti} / ( 1 + $order->{gstrate} ) )->round;
- $order->{ecostgsti} = $order->{ecost};
- $order->{ecostgste} = Koha::Number::Price->new(
- $order->{ecost} / ( 1 + $order->{gstrate} ) )->round;
- $order->{gstvalue} = Koha::Number::Price->new(
- ( $order->{ecostgsti} - $order->{ecostgste} ) *
- $order->{quantity} )->round;
- $order->{totalgste} = $order->{ecostgste} * $order->{quantity};
- $order->{totalgsti} = $order->{ecostgsti} * $order->{quantity};
+ $order->{tax_rate_on_ordering} //= $order->{tax_rate};
+ if ( $bookseller->listincgst ) {
+
+ # The user entered the prices tax included
+ $order->{unitprice} += 0;
+ $order->{unitprice_tax_included} = $order->{unitprice};
+ $order->{rrp_tax_included} = $order->{rrp};
+
+ # price tax excluded = price tax included / ( 1 + tax rate )
+ $order->{unitprice_tax_excluded} = $order->{unitprice_tax_included} / ( 1 + $order->{tax_rate_on_ordering} );
+ $order->{rrp_tax_excluded} = $order->{rrp_tax_included} / ( 1 + $order->{tax_rate_on_ordering} );
+
+ # ecost tax included = rrp tax included ( 1 - discount )
+ $order->{ecost_tax_included} = $order->{rrp_tax_included} * ( 1 - $discount );
+
+ # ecost tax excluded = rrp tax excluded * ( 1 - discount )
+ $order->{ecost_tax_excluded} = $order->{rrp_tax_excluded} * ( 1 - $discount );
+
+ # tax value = quantity * ecost tax excluded * tax rate
+ # we should use the unitprice if included
+ my $cost_tax_included = $order->{unitprice_tax_included} == 0 ? $order->{ecost_tax_included} : $order->{unitprice_tax_included};
+ my $cost_tax_excluded = $order->{unitprice_tax_excluded} == 0 ? $order->{ecost_tax_excluded} : $order->{unitprice_tax_excluded};
+ $order->{tax_value_on_ordering} = ( get_rounded_price($cost_tax_included) - get_rounded_price($cost_tax_excluded) ) * $order->{quantity};
+
}
else {
- $order->{rrpgste} = $order->{rrp};
- $order->{rrpgsti} = Koha::Number::Price->new(
- $order->{rrp} * ( 1 + $order->{gstrate} ) )->round;
- $order->{ecostgste} = $order->{ecost};
- $order->{ecostgsti} = Koha::Number::Price->new(
- $order->{ecost} * ( 1 + $order->{gstrate} ) )->round;
- $order->{gstvalue} = Koha::Number::Price->new(
- ( $order->{ecostgsti} - $order->{ecostgste} ) *
- $order->{quantity} )->round;
- $order->{totalgste} = $order->{ecostgste} * $order->{quantity};
- $order->{totalgsti} = $order->{ecostgsti} * $order->{quantity};
+ # The user entered the prices tax excluded
+ $order->{unitprice_tax_excluded} = $order->{unitprice};
+ $order->{rrp_tax_excluded} = $order->{rrp};
+
+ # price tax included = price tax excluded * ( 1 - tax rate )
+ $order->{unitprice_tax_included} = $order->{unitprice_tax_excluded} * ( 1 + $order->{tax_rate_on_ordering} );
+ $order->{rrp_tax_included} = $order->{rrp_tax_excluded} * ( 1 + $order->{tax_rate_on_ordering} );
+
+ # ecost tax excluded = rrp tax excluded * ( 1 - discount )
+ $order->{ecost_tax_excluded} = $order->{rrp_tax_excluded} * ( 1 - $discount );
+
+ # ecost tax included = rrp tax excluded * ( 1 + tax rate ) * ( 1 - discount ) = ecost tax excluded * ( 1 + tax rate )
+ $order->{ecost_tax_included} = $order->{ecost_tax_excluded} * ( 1 + $order->{tax_rate_on_ordering} );
+
+ # tax value = quantity * ecost tax included * tax rate
+ # we should use the unitprice if included
+ my $cost_tax_excluded = $order->{unitprice_tax_excluded} == 0 ? $order->{ecost_tax_excluded} : $order->{unitprice_tax_excluded};
+ $order->{tax_value_on_ordering} = $order->{quantity} * get_rounded_price($cost_tax_excluded) * $order->{tax_rate_on_ordering};
}
}
if ($receiving) {
- if ( $bookseller->{listincgst} ) {
- $order->{unitpricegsti} = Koha::Number::Price->new( $order->{unitprice} )->round;
- $order->{unitpricegste} = Koha::Number::Price->new(
- $order->{unitpricegsti} / ( 1 + $order->{gstrate} ) )->round;
+ $order->{tax_rate_on_receiving} //= $order->{tax_rate};
+ if ( $bookseller->invoiceincgst ) {
+ # Trick for unitprice. If the unit price rounded value is the same as the ecost rounded value
+ # we need to keep the exact ecost value
+ if ( Koha::Number::Price->new( $order->{unitprice} )->round == Koha::Number::Price->new( $order->{ecost_tax_included} )->round ) {
+ $order->{unitprice} = $order->{ecost_tax_included};
+ }
+
+ # The user entered the unit price tax included
+ $order->{unitprice_tax_included} = $order->{unitprice};
+
+ # unit price tax excluded = unit price tax included / ( 1 + tax rate )
+ $order->{unitprice_tax_excluded} = $order->{unitprice_tax_included} / ( 1 + $order->{tax_rate_on_receiving} );
}
else {
- $order->{unitpricegste} = Koha::Number::Price->new( $order->{unitprice} )->round;
- $order->{unitpricegsti} = Koha::Number::Price->new(
- $order->{unitpricegste} * ( 1 + $order->{gstrate} ) )->round;
+ # Trick for unitprice. If the unit price rounded value is the same as the ecost rounded value
+ # we need to keep the exact ecost value
+ if ( Koha::Number::Price->new( $order->{unitprice} )->round == Koha::Number::Price->new( $order->{ecost_tax_excluded} )->round ) {
+ $order->{unitprice} = $order->{ecost_tax_excluded};
+ }
+
+ # The user entered the unit price tax excluded
+ $order->{unitprice_tax_excluded} = $order->{unitprice};
+
+
+ # unit price tax included = unit price tax included * ( 1 + tax rate )
+ $order->{unitprice_tax_included} = $order->{unitprice_tax_excluded} * ( 1 + $order->{tax_rate_on_receiving} );
}
- $order->{gstvalue} = Koha::Number::Price->new(
- ( $order->{unitpricegsti} - $order->{unitpricegste} )
- * $order->{quantityreceived} )->round;
- $order->{totalgste} = $order->{unitpricegste} * $order->{quantity};
- $order->{totalgsti} = $order->{unitpricegsti} * $order->{quantity};
+ # tax value = quantity * unit price tax excluded * tax rate
+ $order->{tax_value_on_receiving} = $order->{quantity} * get_rounded_price($order->{unitprice_tax_excluded}) * $order->{tax_rate_on_receiving};
}
return $order;
my $order = GetOrder( $ordernumber );
for my $borrowernumber (@borrowernumbers) {
- my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
- my $library = Koha::Libraries->find( $borrower->{branchcode} )->unblessed;
- my $biblio = C4::Biblio::GetBiblio( $order->{biblionumber} );
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ my $library = $patron->library->unblessed;
+ my $biblio = Koha::Biblios->find( $order->{biblionumber} )->unblessed;
my $letter = C4::Letters::GetPreparedLetter(
module => 'acquisition',
letter_code => 'ACQ_NOTIF_ON_RECEIV',
branchcode => $library->{branchcode},
+ lang => $patron->lang,
tables => {
'branches' => $library,
- 'borrowers' => $borrower,
+ 'borrowers' => $patron->unblessed,
'biblio' => $biblio,
'aqorders' => $order,
},
=head3 FillWithDefaultValues
-FillWithDefaultValues( $marc_record );
+FillWithDefaultValues( $marc_record, $params );
This will update the record with default value defined in the ACQ framework.
For all existing fields, if a default value exists and there are no subfield, it will be created.
If the field does not exist, it will be created too.
+If the parameter only_mandatory => 1 is passed via $params, only the mandatory
+defaults are being applied to the record.
+
=cut
sub FillWithDefaultValues {
- my ($record) = @_;
- my $tagslib = C4::Biblio::GetMarcStructure( 1, 'ACQ' );
+ my ( $record, $params ) = @_;
+ my $mandatory = $params->{only_mandatory};
+ my $tagslib = C4::Biblio::GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
if ($tagslib) {
my ($itemfield) =
- C4::Biblio::GetMarcFromKohaField( 'items.itemnumber', '' );
+ C4::Biblio::GetMarcFromKohaField( 'items.itemnumber' );
for my $tag ( sort keys %$tagslib ) {
next unless $tag;
next if $tag == $itemfield;
for my $subfield ( sort keys %{ $tagslib->{$tag} } ) {
next if IsMarcStructureInternal($tagslib->{$tag}{$subfield});
+ next if $mandatory && !$tagslib->{$tag}{$subfield}{mandatory};
my $defaultvalue = $tagslib->{$tag}{$subfield}{defaultvalue};
if ( defined $defaultvalue and $defaultvalue ne '' ) {
my @fields = $record->field($tag);
if (@fields) {
for my $field (@fields) {
- unless ( defined $field->subfield($subfield) ) {
+ if ( $field->is_control_field ) {
+ $field->update($defaultvalue) if not defined $field->data;
+ }
+ elsif ( not defined $field->subfield($subfield) ) {
$field->add_subfields(
$subfield => $defaultvalue );
}
}
}
else {
- $record->insert_fields_ordered(
- MARC::Field->new(
- $tag, '', '', $subfield => $defaultvalue
- )
- );
+ if ( $tag < 10 ) { # is_control_field
+ $record->insert_fields_ordered(
+ MARC::Field->new(
+ $tag, $defaultvalue
+ )
+ );
+ }
+ else {
+ $record->insert_fields_ordered(
+ MARC::Field->new(
+ $tag, '', '', $subfield => $defaultvalue
+ )
+ );
+ }
}
}
}
projects / srvgit / blobdiff