X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FAcquisition.pm;h=e431bd20d7b2f702ec9ad55aadfb8ab0349f0a56;hb=3bd7461b639c32816f031e3a4ab7914a327ed5a2;hp=4616d695893637adf28f1a8dbd78e8f0a2c6532e;hpb=e594317f4de5a052c8cb4d331136ce4ad280ddef;p=koha.git diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 4616d69589..e431bd20d7 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -128,16 +128,11 @@ orders, basket and parcels. =head3 GetBasket -=over 4 - -$aqbasket = &GetBasket($basketnumber); + $aqbasket = &GetBasket($basketnumber); get all basket informations in aqbasket for a given basket -return : -informations for a given basket returned as a hashref. - -=back +B informations for a given basket returned as a hashref. =cut @@ -162,15 +157,12 @@ sub GetBasket { =head3 NewBasket -=over 4 - -$basket = &NewBasket( $booksellerid, $authorizedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber ); - -=back + $basket = &NewBasket( $booksellerid, $authorizedby, $basketname, + $basketnote, $basketbooksellernote, $basketcontractnumber ); Create a new basket in aqbasket table -=over 2 +=over =item C<$booksellerid> is a foreign key in the aqbasket table @@ -204,14 +196,10 @@ sub NewBasket { =head3 CloseBasket -=over 4 - -&CloseBasket($basketno); + &CloseBasket($basketno); close a basket (becomes unmodifiable,except for recieves) -=back - =cut sub CloseBasket { @@ -230,15 +218,12 @@ sub CloseBasket { =head3 GetBasketAsCSV -=over 4 - -&GetBasketAsCSV($basketno); + &GetBasketAsCSV($basketno); Export a basket as CSV -=back - =cut + sub GetBasketAsCSV { my ($basketno) = @_; my $basket = GetBasket($basketno); @@ -290,14 +275,10 @@ sub GetBasketAsCSV { =head3 CloseBasketgroup -=over 4 - -&CloseBasketgroup($basketgroupno); + &CloseBasketgroup($basketgroupno); close a basketgroup -=back - =cut sub CloseBasketgroup { @@ -315,14 +296,10 @@ sub CloseBasketgroup { =head3 ReOpenBaskergroup($basketgroupno) -=over 4 - -&ReOpenBaskergroup($basketgroupno); + &ReOpenBaskergroup($basketgroupno); reopen a basketgroup -=back - =cut sub ReOpenBasketgroup { @@ -341,21 +318,18 @@ sub ReOpenBasketgroup { =head3 DelBasket -=over 4 - -&DelBasket($basketno); + &DelBasket($basketno); Deletes the basket that has basketno field $basketno in the aqbasket table. -=over 2 +=over =item C<$basketno> is the primary key of the basket in the aqbasket table. =back -=back - =cut + sub DelBasket { my ( $basketno ) = @_; my $query = "DELETE FROM aqbasket WHERE basketno=?"; @@ -369,21 +343,18 @@ sub DelBasket { =head3 ModBasket -=over 4 - -&ModBasket($basketinfo); + &ModBasket($basketinfo); Modifies a basket, using a hashref $basketinfo for the relevant information, only $basketinfo->{'basketno'} is required. -=over 2 +=over =item C<$basketno> is the primary key of the basket in the aqbasket table. =back -=back - =cut + sub ModBasket { my $basketinfo = shift; my $query = "UPDATE aqbasket SET "; @@ -412,13 +383,11 @@ sub ModBasket { =head3 ModBasketHeader -=over 4 - -&ModBasketHeader($basketno, $basketname, $note, $booksellernote, $contractnumber); + &ModBasketHeader($basketno, $basketname, $note, $booksellernote, $contractnumber); Modifies a basket's header. -=over 2 +=over =item C<$basketno> is the "basketno" field in the "aqbasket" table; @@ -432,9 +401,8 @@ Modifies a basket's header. =back -=back - =cut + sub ModBasketHeader { my ($basketno, $basketname, $note, $booksellernote, $contractnumber) = @_; my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=? WHERE basketno=?"; @@ -454,24 +422,20 @@ sub ModBasketHeader { =head3 GetBasketsByBookseller -=over 4 - -@results = &GetBasketsByBookseller($booksellerid, $extra); + @results = &GetBasketsByBookseller($booksellerid, $extra); Returns a list of hashes of all the baskets that belong to bookseller 'booksellerid'. -=over 2 +=over =item C<$booksellerid> is the 'id' field of the bookseller in the aqbooksellers table =item C<$extra> is the extra sql parameters, can be -- $extra->{groupby}: group baskets by column + $extra->{groupby}: group baskets by column ex. $extra->{groupby} = aqbasket.basketgroupid -- $extra->{orderby}: order baskets by column -- $extra->{limit}: limit number of results (can be helpful for pagination) - -=back + $extra->{orderby}: order baskets by column + $extra->{limit}: limit number of results (can be helpful for pagination) =back @@ -503,18 +467,10 @@ sub GetBasketsByBookseller { =head3 GetBasketsByBasketgroup -=over 4 - -$baskets = &GetBasketsByBasketgroup($basketgroupid); - -=over 2 + $baskets = &GetBasketsByBasketgroup($basketgroupid); Returns a reference to all baskets that belong to basketgroup $basketgroupid. -=back - -=back - =cut sub GetBasketsByBasketgroup { @@ -533,11 +489,7 @@ sub GetBasketsByBasketgroup { =head3 NewBasketgroup -=over 4 - -$basketgroupid = NewBasketgroup(\%hashref); - -=over 2 + $basketgroupid = NewBasketgroup(\%hashref); Adds a basketgroup to the aqbasketgroups table, and add the initial baskets to it. @@ -553,10 +505,6 @@ $hashref->{'deliverycomment'} is the 'deliverycomment' field of the basketgroup $hashref->{'closed'} is the 'closed' field of the aqbasketgroups table, it is false if 0, true otherwise. -=back - -=back - =cut sub NewBasketgroup { @@ -594,11 +542,7 @@ sub NewBasketgroup { =head3 ModBasketgroup -=over 4 - -ModBasketgroup(\%hashref); - -=over 2 + ModBasketgroup(\%hashref); Modifies a basketgroup in the aqbasketgroups table, and add the baskets to it. @@ -616,10 +560,6 @@ $hashref->{'deliverycomment'} is the 'deliverycomment' field of the basketgroup $hashref->{'closed'} is the 'closed' field of the aqbasketgroups table, it is false if 0, true otherwise. -=back - -=back - =cut sub ModBasketgroup { @@ -628,7 +568,7 @@ sub ModBasketgroup { my $dbh = C4::Context->dbh; my $query = "UPDATE aqbasketgroups SET "; my @params; - foreach my $field (qw(name billingplace deliveryplace deliverycomment closed)) { + foreach my $field (qw(name billingplace deliveryplace freedeliveryplace deliverycomment closed)) { if ( defined $basketgroupinfo->{$field} ) { $query .= "$field=?, "; push(@params, $basketgroupinfo->{$field}); @@ -658,15 +598,11 @@ sub ModBasketgroup { =head3 DelBasketgroup -=over 4 - -DelBasketgroup($basketgroupid); - -=back + DelBasketgroup($basketgroupid); Deletes a basketgroup in the aqbasketgroups table, and removes the reference to it from the baskets, -=over 2 +=over =item C<$basketgroupid> is the 'id' field of the basket in the aqbasketgroup table @@ -689,26 +625,12 @@ sub DelBasketgroup { =head2 FUNCTIONS ABOUT ORDERS -=over 2 - -=cut - -=back - =head3 GetBasketgroup -=over 4 - -$basketgroup = &GetBasketgroup($basketgroupid); - -=over 2 + $basketgroup = &GetBasketgroup($basketgroupid); Returns a reference to the hash containing all infermation about the basketgroup. -=back - -=back - =cut sub GetBasketgroup { @@ -727,24 +649,16 @@ sub GetBasketgroup { =head3 GetBasketgroups -=over 4 - -$basketgroups = &GetBasketgroups($booksellerid); - -=over 2 + $basketgroups = &GetBasketgroups($booksellerid); Returns a reference to the array of all the basketgroups of bookseller $booksellerid. -=back - -=back - =cut sub GetBasketgroups { my $booksellerid = shift; die "bookseller id is required to edit a basketgroup" unless $booksellerid; - my $query = "SELECT * FROM aqbasketgroups WHERE booksellerid=?"; + my $query = "SELECT * FROM aqbasketgroups WHERE booksellerid=? ORDER BY `id` DESC"; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare($query); $sth->execute($booksellerid); @@ -763,9 +677,7 @@ sub GetBasketgroups { =head3 GetPendingOrders -=over 4 - -$orders = &GetPendingOrders($booksellerid, $grouped, $owner); + $orders = &GetPendingOrders($booksellerid, $grouped, $owner); Finds pending orders from the bookseller with the given ID. Ignores completed and cancelled orders. @@ -779,7 +691,7 @@ reference-to-hash with the following fields: C<$grouped> is a boolean that, if set to 1 will group all order lines of the same basket in a single result line -=over 2 +=over =item C @@ -787,12 +699,10 @@ in a single result line =item C -These give the value of the corresponding field in the aqorders table -of the Koha database. - =back -=back +These give the value of the corresponding field in the aqorders table +of the Koha database. Results are ordered from most to least recent. @@ -847,9 +757,7 @@ sub GetPendingOrders { =head3 GetOrders -=over 4 - -@orders = &GetOrders($basketnumber, $orderby); + @orders = &GetOrders($basketnumber, $orderby); Looks up the pending (non-cancelled) orders with the given basket number. If C<$booksellerID> is non-empty, only orders from that seller @@ -860,8 +768,6 @@ C<&basket> returns a two-element array. C<@orders> is an array of references-to-hash, whose keys are the fields from the aqorders, biblio, and biblioitems tables in the Koha database. -=back - =cut sub GetOrders { @@ -893,23 +799,20 @@ sub GetOrders { =head3 GetOrderNumber -=over 4 - -$ordernumber = &GetOrderNumber($biblioitemnumber, $biblionumber); - -=back + $ordernumber = &GetOrderNumber($biblioitemnumber, $biblionumber); Looks up the ordernumber with the given biblionumber and biblioitemnumber. Returns the number of this order. -=over 4 +=over =item C<$ordernumber> is the order number. =back =cut + sub GetOrderNumber { my ( $biblionumber,$biblioitemnumber ) = @_; my $dbh = C4::Context->dbh; @@ -929,17 +832,13 @@ sub GetOrderNumber { =head3 GetOrder -=over 4 - -$order = &GetOrder($ordernumber); + $order = &GetOrder($ordernumber); Looks up an order by order number. Returns a reference-to-hash describing the order. The keys of C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha database. -=back - =cut sub GetOrder { @@ -964,19 +863,16 @@ sub GetOrder { =head3 NewOrder -=over 4 - -&NewOrder(\%hashref); + &NewOrder(\%hashref); Adds a new order to the database. Any argument that isn't described below is the new value of the field with the same name in the aqorders table of the Koha database. -=over 4 +=over =item $hashref->{'basketno'} is the basketno foreign key in aqorders, it is mandatory - =item $hashref->{'ordernumber'} is a "minimum order number." =item $hashref->{'budgetdate'} is effectively ignored. @@ -993,8 +889,6 @@ The following keys are used: "biblionumber", "title", "basketno", "quantity", "n =back -=back - =cut sub NewOrder { @@ -1029,12 +923,7 @@ sub NewOrder { =head3 NewOrderItem -=over 4 - -&NewOrderItem(); - - -=back + &NewOrderItem(); =cut @@ -1055,19 +944,12 @@ sub NewOrderItem { =head3 ModOrder -=over 4 - -&ModOrder(\%hashref); - -=over 2 + &ModOrder(\%hashref); Modifies an existing order. Updates the order with order number -$hashref->{'ordernumber'} and biblionumber $hashref->{'biblionumber'}. All other keys of the hash -update the fields with the same name in the aqorders table of the Koha database. - -=back - -=back +$hashref->{'ordernumber'} and biblionumber $hashref->{'biblionumber'}. All +other keys of the hash update the fields with the same name in the aqorders +table of the Koha database. =cut @@ -1079,6 +961,10 @@ sub ModOrder { my $dbh = C4::Context->dbh; my @params; + + # update uncertainprice to an integer, just in case (under FF, checked boxes have the value "ON" by default) + $orderinfo->{uncertainprice}=1 if $orderinfo->{uncertainprice}; + # delete($orderinfo->{'branchcode'}); # the hash contains a lot of entries not in aqorders, so get the columns ... my $sth = $dbh->prepare("SELECT * FROM aqorders LIMIT 1;"); @@ -1106,18 +992,15 @@ sub ModOrder { =head3 ModOrderItem -=over 4 - -&ModOrderItem(\%hashref); - -=over 2 + &ModOrderItem(\%hashref); Modifies the itemnumber in the aqorders_items table. The input hash needs three entities: -- itemnumber: the old itemnumber -- ordernumber: the order this item is attached to -- newitemnumber: the new itemnumber we want to attach the line to -=back +=over + +=item - itemnumber: the old itemnumber +=item - ordernumber: the order this item is attached to +=item - newitemnumber: the new itemnumber we want to attach the line to =back @@ -1133,8 +1016,6 @@ sub ModOrderItem { my $query = "UPDATE aqorders_items set itemnumber=? where itemnumber=? and ordernumber=?"; my @params = ($orderiteminfo->{'newitemnumber'}, $orderiteminfo->{'itemnumber'}, $orderiteminfo->{'ordernumber'}); - warn $query; - warn Data::Dumper::Dumper(@params); my $sth = $dbh->prepare($query); $sth->execute(@params); return 0; @@ -1145,15 +1026,11 @@ sub ModOrderItem { =head3 ModOrderBibliotemNumber -=over 4 - -&ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber); + &ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber); Modifies the biblioitemnumber for an existing order. Updates the order with order number C<$ordernum> and biblionumber C<$biblionumber>. -=back - =cut #FIXME: is this used at all? @@ -1173,9 +1050,7 @@ sub ModOrderBiblioitemNumber { =head3 ModReceiveOrder -=over 4 - -&ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user, + &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user, $unitprice, $booksellerinvoicenumber, $biblioitemnumber, $freight, $bookfund, $rrp); @@ -1189,8 +1064,6 @@ portion must have a booksellerinvoicenumber. Updates the order with bibilionumber C<$biblionumber> and ordernumber C<$ordernumber>. -=back - =cut @@ -1331,16 +1204,12 @@ sub SearchOrder { =head3 DelOrder -=over 4 - -&DelOrder($biblionumber, $ordernumber); + &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. -=back - =cut sub DelOrder { @@ -1364,9 +1233,7 @@ sub DelOrder { =head3 GetParcel -=over 4 - -@results = &GetParcel($booksellerid, $code, $date); + @results = &GetParcel($booksellerid, $code, $date); Looks up all of the received items from the supplier with the given bookseller ID at the given date, for the given code (bookseller Invoice number). Ignores cancelled and completed orders. @@ -1376,8 +1243,6 @@ the aqorders, biblio, and biblioitems tables of the Koha database. C<@results> is sorted alphabetically by book title. -=back - =cut sub GetParcel { @@ -1437,16 +1302,13 @@ sub GetParcel { =head3 GetParcels -=over 4 + $results = &GetParcels($bookseller, $order, $code, $datefrom, $dateto); -$results = &GetParcels($bookseller, $order, $code, $datefrom, $dateto); get a lists of parcels. -=back - * Input arg : -=over 4 +=over =item $bookseller is the bookseller this function has to get parcels. @@ -1460,9 +1322,13 @@ is the booksellerinvoicenumber. =item $datefrom & $dateto to know on what date this function has to filter its search. +=back + * return: a pointer on a hash list containing parcel informations as such : +=over + =item Creation date =item Last operation @@ -1523,17 +1389,13 @@ sub GetParcels { =head3 GetLateOrders -=over 4 - -@results = &GetLateOrders; + @results = &GetLateOrders; Searches for bookseller with late orders. return: the table of supplier with late issues. This table is full of hashref. -=back - =cut sub GetLateOrders { @@ -1556,7 +1418,7 @@ sub GetLateOrders { aqbudgets.budget_name AS budget, borrowers.branchcode AS branch, aqbooksellers.name AS supplier, - biblio.author, + biblio.author, biblio.title, biblioitems.publishercode AS publisher, biblioitems.publicationyear, "; @@ -1625,9 +1487,7 @@ sub GetLateOrders { =head3 GetHistory -=over 4 - -(\@order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on ); + (\@order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on ); Retreives some acquisition history information @@ -1653,8 +1513,6 @@ returns: $total_price is the cost of each in $order_loop times the quantity $total_qtyreceived is the sum of all of the quantityreceived entries in $order_loop -=back - =cut sub GetHistory { @@ -1700,6 +1558,7 @@ sub GetHistory { if ( defined $title ) { $query .= " AND biblio.title LIKE ? "; + $title =~ s/\s+/%/g; push @query_params, "%$title%"; } @@ -1731,7 +1590,6 @@ sub GetHistory { } } $query .= " ORDER BY id"; - warn $query; my $sth = $dbh->prepare($query); $sth->execute( @query_params ); my $cnt = 1; @@ -1751,7 +1609,7 @@ sub GetHistory { =head2 GetRecentAcqui -$results = GetRecentAcqui($days); + $results = GetRecentAcqui($days); C<$results> is a ref to a table which containts hashref @@ -1774,17 +1632,13 @@ sub GetRecentAcqui { =head3 GetContracts -=over 4 - -$contractlist = &GetContracts($booksellerid, $activeonly); - -=back + $contractlist = &GetContracts($booksellerid, $activeonly); Looks up the contracts that belong to a bookseller Returns a list of contracts -=over 2 +=over =item C<$booksellerid> is the "id" field in the "aqbooksellers" table. @@ -1793,6 +1647,7 @@ Returns a list of contracts =back =cut + sub GetContracts { my ( $booksellerid, $activeonly ) = @_; my $dbh = C4::Context->dbh; @@ -1823,17 +1678,14 @@ sub GetContracts { =head3 GetContract -=over 4 - -$contract = &GetContract($contractID); + $contract = &GetContract($contractID); Looks up the contract that has PRIMKEY (contractnumber) value $contractID Returns a contract -=back - =cut + sub GetContract { my ( $contractno ) = @_; my $dbh = C4::Context->dbh; @@ -1854,6 +1706,6 @@ __END__ =head1 AUTHOR -Koha Developement team +Koha Development Team =cut