Permalink
Browse files

Merge branch 'Bug3510' into ptfs-master

Conflicts:

	circ/returns.pl
	installer/data/mysql/en/mandatory/userpermissions.sql
	koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
  • Loading branch information...
2 parents d6854f0 + ae17597 commit 1c4579cf94e2430d33b8332fc99411a5b76894ce J. David Bavousett committed Apr 27, 2010
Showing with 26 additions and 13 deletions.
  1. +13 −2 C4/Circulation.pm
  2. +10 −10 circ/returns.pl
  3. +3 −1 installer/data/mysql/en/mandatory/userpermissions.sql
View
@@ -1444,7 +1444,7 @@ sub AddReturn {
$doreturn = 0;
}
}
-
+
my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed";
# full item data, but no borrowernumber or checkout info (no issue)
# we know GetItem should work because GetItemnumberFromBarcode worked
@@ -1492,7 +1492,18 @@ sub AddReturn {
}
if ($borrowernumber) {
- MarkIssueReturned($borrowernumber, $item->{'itemnumber'}, $circControlBranch);
+ if ($returndate ) { # over ride in effect
+ MarkIssueReturned(
+ $borrower->{'borrowernumber'},
+ $issue->{'itemnumber'},
+ $circControlBranch,
+ $returndate);
+ } else {
+ MarkIssueReturned(
+ $borrower->{'borrowernumber'},
+ $issue->{'itemnumber'},
+ $circControlBranch);
+ }
$messages->{'WasReturned'} = 1; # FIXME is the "= 1" right? This could be the borrower hash.
}
View
@@ -548,20 +548,20 @@ =head1 returns.pl
$template->param(
riloop => \@riloop,
- genbrname => $branches->{$userenv_branch}->{'branchname'},
- genprname => $printers->{$printer}->{'printername'},
- branchname => $branches->{$userenv_branch}->{'branchname'},
- printer => $printer,
- errmsgloop => \@errmsgloop,
- exemptfine => $exemptfine,
- dropboxmode => $dropboxmode,
- dropboxdate => $dropboxdate->output(),
- overduecharges => $overduecharges,
HoldButtonConfirm => $HoldButtonConfirm,
HoldButtonIgnore => $HoldButtonIgnore,
HoldButtonPrintConfirm => $HoldButtonPrintConfirm,
+ genbrname => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
+ genprname => $printers->{$printer}->{'printername'},
+ branchname => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
+ printer => $printer,
+ errmsgloop => \@errmsgloop,
+ exemptfine => $exemptfine,
+ dropboxmode => $dropboxmode,
+ dropboxdate => $dropboxdate->output(),
+ overduecharges => $overduecharges,
DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
- AllowCheckInDateChange => C4::Context->preference('AllowCheckInDateChange')
+ AllowCheckInDateChange => C4::Context->preference('AllowCheckInDateChange'),
);
# actually print the page!
@@ -5,6 +5,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
( 1, 'bookdrop', 'User can activate bookdrop mode in Check In'),
( 1, 'override_checkout_max', 'User can override the checkout maximum'),
( 1, 'override_non_circ', 'User can override the not for loan check'),
+ ( 1, 'override_max_renewals', 'User can override the maximum renewals check'),
( 1, 'override_max_fines', 'User can override block for patron over max fine limit'),
( 1, 'change_lost_status', 'User can set the item lost status'),
( 1, 'change_due_date', 'User can specify a due date other than in the circulation rules'),
@@ -29,6 +30,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
( 9, 'add_bibliographic', 'Create a bibliographic record'),
( 9, 'edit_bibliographic', 'Edit a bibliographic record'),
( 9, 'delete_bibliographic', 'Delete a bibliographic record'),
+ ( 6, 'delete_pending_holds', 'User can delete holds from the pending list'),
( 9, 'add_items', 'Create or copy a new item'),
( 9, 'delete_items', 'Delete an item'),
( 9, 'edit_items', 'Edit an item record'),
@@ -53,4 +55,4 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'),
(13, 'batch_edit_items', 'User can access the batch edit items function'),
(13, 'schedule_tasks', 'Schedule tasks to run')
-;
+;

0 comments on commit 1c4579c

Please sign in to comment.