[Koha-patches] [PATCH 33/78] addorder changes
paul.poulain at biblibre.com
paul.poulain at biblibre.com
Thu May 28 18:32:43 CEST 2009
From: Paul Poulain <paul.poulain at biblibre.com>
* deal with granular permissions
* deal with uncertain prices
* replace bookfund by budget
* changes in API
* create items if syspref set
---
acqui/addorder.pl | 128 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 105 insertions(+), 23 deletions(-)
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 58b4867..1cb4c23 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -73,6 +73,9 @@ the quantity to order.
=item C<list_price>
the price of this order.
+=item C<uncertainprice>
+uncertain price, can't close basket until prices of all orders are known.
+
=item C<branch>
the branch where this order will be received.
@@ -81,8 +84,8 @@ the branch where this order will be received.
=item C<notes>
Notes on this basket.
-=item C<bookfund>
-bookfund use to pay this order.
+=item C<budget_id>
+budget_id used to pay this order.
=item C<sort1> & C<sort2>
@@ -113,17 +116,22 @@ if it is an order from an existing suggestion : the id of this suggestion.
=cut
use strict;
+use warnings;
use CGI;
use C4::Auth; # get_template_and_user
use C4::Acquisition; # NewOrder DelOrder ModOrder
use C4::Suggestions; # ModStatus
use C4::Biblio; # AddBiblio TransformKohaToMarc
+use C4::Items;
use C4::Output;
+### "-------------------- addorder.pl ----------"
+
# FIXME: This needs to do actual error checking and possibly return user to the same form,
# not just blindly call C4 functions and print a redirect.
my $input = new CGI;
+### $input
# get_template_and_user used only to check auth & get user id
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -132,7 +140,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { acquisition => 1 },
+ flagsrequired => { acquisition => 'order_manage' },
debug => 1,
}
);
@@ -152,7 +160,7 @@ my $listprice = $input->param('list_price') || 0;
my $branch = $input->param('branch');
my $series = $input->param('series');
my $notes = $input->param('notes');
-my $bookfund = $input->param('bookfund');
+my $budget_id = $input->param('budget_id');
my $sort1 = $input->param('sort1');
my $sort2 = $input->param('sort2');
my $rrp = $input->param('rrp');
@@ -165,7 +173,12 @@ my $purchaseorder = $input->param('purchaseordernumber');
my $invoice = $input->param('invoice');
my $publishercode = $input->param('publishercode');
my $suggestionid = $input->param('suggestionid');
-my $biblionumber = $input->param('biblionumber');
+my $user = $input->remote_user;
+my $uncertainprice = $input->param('uncertainprice');
+
+#warn "CREATEBIBITEM = $input->param('createbibitem')";
+#warn Dumper $input->param('createbibitem');
+my $createbibitem = $input->param('createbibitem');
# create, modify or delete biblio
# create if $quantity>=0 and $existing='no'
@@ -173,8 +186,8 @@ my $biblionumber = $input->param('biblionumber');
# delete if $quantity has been set to 0 by the librarian
my $bibitemnum;
if ( $quantity ne '0' ) {
- #check to see if biblio exists
- if ( $existing eq 'no' ) {
+ #TODO:check to see if biblio exists
+ unless ( $biblionumber ) {
#if it doesnt create it
my $record = TransformKohaToMarc(
@@ -189,33 +202,102 @@ if ( $quantity ne '0' ) {
});
# create the record in catalogue, with framework ''
($biblionumber,$bibitemnum) = AddBiblio($record,'');
-
# change suggestion status if applicable
if ($suggestionid) {
ModStatus( $suggestionid, 'ORDERED', '', $biblionumber );
}
}
+
# if we already have $ordnum, then it's an ordermodif
if ($ordnum) {
- ModOrder(
- $title, $ordnum, $quantity, $listprice,
- $biblionumber, $basketno, $booksellerid, $loggedinuser,
- $notes, $bookfund, $bibitemnum, $rrp,
- $ecost, $gst, $budget, $cost,
- $invoice, $sort1, $sort2, $purchaseorder, $branch
- );
+ my %orderinfo = ("biblionumber", $biblionumber,
+ "ordernumber", $ordnum,
+ "basketno", $basketno,
+ "quantity", $quantity,
+ "listprice", $listprice,
+ "notes", $notes,
+ "biblioitemnumber", $bibitemnum,
+ "rrp", $rrp,
+ "ecost", $ecost,
+ "gst", $gst,
+ "unitprice", $cost,
+ "subscription", $sub,
+ "sort1", $sort1,
+ "sort2", $sort2,
+# "budgetdate", $budget,
+ "purchaseordernumber", $purchaseorder,
+ "branchcode", $branch,
+ "booksellerinvoicenumber", $invoice,
+ "budget_id", $budget_id,
+ "uncertainprice", $uncertainprice);
+ ModOrder( \%orderinfo);
}
else { # else, it's a new line
- ( $basketno, $ordnum ) = NewOrder(
- $basketno, $biblionumber, $title, $quantity,
- $listprice, $booksellerid, $loggedinuser, $notes,
- $bookfund, $bibitemnum, $rrp, $ecost,
- $gst, $budget, $cost, $sub,
- $invoice, $sort1, $sort2, $purchaseorder,
- $branch
- );
+ my %orderinfo = ("biblionumber", $biblionumber,
+ "ordernumber", $ordnum,
+ "basketno", $basketno,
+ "quantity", $quantity,
+ "listprice", $listprice,
+ "notes", $notes,
+ "biblioitemnumber", $bibitemnum,
+ "rrp", $rrp,
+ "ecost", $ecost,
+ "gst", $gst,
+ "unitprice", $cost,
+ "subscription", $sub,
+ "sort1", $sort1,
+ "sort2", $sort2,
+# "budgetdate", $budget,
+ "purchaseordernumber", $purchaseorder,
+ "branchcode", $branch,
+ "booksellerinvoicenumber", $invoice,
+ "budget_id", $budget_id,
+ "uncertainprice", $uncertainprice);
+ ( $basketno, $ordnum ) = NewOrder(\%orderinfo);
}
+
+ # now, add items if applicable
+ if (C4::Context->preference('AcqCreateItem') eq 'ordering') {
+
+ my @tags = $input->param('tag');
+ my @subfields = $input->param('subfield');
+ my @field_values = $input->param('field_value');
+ my @serials = $input->param('serial');
+ my @itemid = $input->param('itemid');
+ my @ind_tag = $input->param('ind_tag');
+ my @indicator = $input->param('indicator');
+ #Rebuilding ALL the data for items into a hash
+ # parting them on $itemid.
+
+ my %itemhash;
+ my $countdistinct;
+ my $range=scalar(@itemid);
+ for (my $i=0; $i<$range; $i++){
+ unless ($itemhash{$itemid[$i]}){
+ $countdistinct++;
+ }
+ push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
+ push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
+ push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
+ push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
+ push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
+ }
+ foreach my $item (keys %itemhash){
+
+ my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
+ $itemhash{$item}->{'subfields'},
+ $itemhash{$item}->{'field_values'},
+ $itemhash{$item}->{'ind_tag'},
+ $itemhash{$item}->{'indicator'});
+ my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+ my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+ NewOrderItem($itemnumber, $ordnum);
+
+ }
+ }
+
}
+
else { # qty=0, delete the line
$biblionumber = $input->param('biblionumber');
DelOrder( $biblionumber, $ordnum );
--
1.6.0.4
More information about the Koha-patches
mailing list