Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'Bug3514' into ptfs-master

Conflicts:

	installer/data/mysql/en/mandatory/sysprefs.sql
  • Loading branch information...
commit 38ddef75baeb3f3bd4487cfc25340be9dc2baa4c 2 parents 1f1540f + 5d3b694
J. David Bavousett authored
View
1  admin/systempreferences.pl
@@ -209,6 +209,7 @@ =head1 systempreferences.pl
$tabsysprefs{EnhancedMessagingPreferences} = "Patrons";
$tabsysprefs{'SMSSendDriver'} = 'Patrons';
$tabsysprefs{HidePatronName} = "Patrons";
+$tabsysprefs{'PatronDisplayReturn'} = 'Patrons';
# I18N/L10N
View
3  circ/circulation.pl
@@ -61,7 +61,7 @@
$session->param('branch', $branch);
$session->param('branchname', GetBranchName($branch));
}
-
+my $dispreturn = C4::Context->preference('PatronDisplayReturn');
my $printer = $query->param('printer');
if ($printer){
# update our session so the userenv is updated
@@ -669,6 +669,7 @@
findborrower => $findborrower,
borrower => $borrower,
borrowernumber => $borrowernumber,
+ dispreturn => $dispreturn,
branch => $branch,
branchname => GetBranchName($borrower->{'branchcode'}),
printer => $printer,
View
1  installer/data/mysql/en/mandatory/sysprefs.sql
@@ -263,3 +263,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('D
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any message','','YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'If ON, displays patron image when a patron uses web-based self-checkout', '', 'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbagName','Cart','Allows libraries to define a different name for the OPAC Cart feature, such as Bookbag or Personal Shelf. If no name is defined, it will default to Cart.','70|10','Textarea');
+INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('PatronDisplayReturn', '1', '', 'If ON, allows items to be returned in the patron details display checkout list.', 'YesNo');
View
12 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -612,7 +612,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<th scope="col">Charge</th>
<th scope="col">Price</th>
<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
+<!-- TMPL_IF NAME="dispreturn" -->
<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
+<!-- /TMPL_IF -->
</tr>
<!-- TMPL_IF NAME="todayissues" --></thead>
<tfoot>
@@ -693,9 +695,11 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<!-- TMPL_IF NAME="return_failed" -->
<td class="problem">Checkin Failed</td>
<!--TMPL_ELSE-->
+<!-- TMPL_IF NAME="dispreturn" -->
<td><input type="checkbox" name="barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
<input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
</td>
+<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="renew_failed" -->
<td>Renewal Failed</td>
@@ -758,9 +762,11 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<!-- TMPL_IF NAME="return_failed" -->
<td class="problem">Checkin Failed</td>
<!--TMPL_ELSE-->
+<!-- TMPL_IF NAME="dispreturn" -->
<td><input type="checkbox" name="barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
<input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
</td>
+<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="renew_failed" -->
<td>Renewal Failed</td>
@@ -779,9 +785,15 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
<input type="checkbox" name="override_limit" id="override_limit" value="1" />
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="dispreturn" -->
<input type="submit" name="renew_checked" value="Renew or Return checked items" />
+<!--TMPL_ELSE-->
+ <input type="submit" name="renew_checked" value="Renew checked items" />
+<!-- /TMPL_IF -->
<input type="submit" id="renew_all" name="renew_all" value="Renew all" />
+<!-- TMPL_IF NAME="dispreturn" -->
<input type="submit" id="return_all" name="return_all" value="Return all" />
+<!-- /TMPL_IF -->
</fieldset>
<!-- /TMPL_IF -->
</form>
View
10 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -401,7 +401,9 @@ if (nodename =="barcodes[]"){
<th scope="col">Charge</th>
<th scope="col">Price</th>
<th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
+ <!-- TMPL_IF NAME="dispreturn" -->
<th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
+ <!-- /TMPL_IF>
</tr></thead>
<tfoot>
<tr>
@@ -484,6 +486,7 @@ if (nodename =="barcodes[]"){
<!-- /TMPL_IF -->
</td>
<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="dispreturn" -->
<!-- TMPL_IF NAME="return_failed" -->
<td class="problem">Checkin Failed</td>
<!--TMPL_ELSE-->
@@ -491,6 +494,7 @@ if (nodename =="barcodes[]"){
<input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
</td>
<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
</tr>
<!-- /tmpl_loop -->
</tbody>
@@ -502,9 +506,15 @@ if (nodename =="barcodes[]"){
<input type="checkbox" name="override_limit" id="override_limit" value="1" />
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="dispreturn" -->
<input type="submit" name="renew_checked" value="Renew or Return checked items" />
+ <!--TMPL_ELSE-->
+ <input type="submit" name="renew_checked" value="Renew checked items" />
+ <!-- /TMPL_IF -->
<input type="submit" id="renew_all" name="renew_all" value="Renew all" />
+ <!-- TMPL_IF NAME="dispreturn" -->
<input type="submit" id="return_all" name="return_all" value="Return all" />
+ <!-- /TMPL_IF -->
</fieldset>
</form><!-- TMPL_ELSE --><p>Patron has nothing checked out.</p><!-- /TMPL_IF -->
</div>
View
1  members/moremember.pl
@@ -413,6 +413,7 @@ BEGIN
roaddetails => $roaddetails,
borrowernumber => $borrowernumber,
categoryname => $data->{'description'},
+ dispreturn => C4::Context->preference('PatronDisplayReturn'),
reregistration => $reregistration,
branch => $branch,
totalprice => sprintf("%.2f", $totalprice),
Please sign in to comment.
Something went wrong with that request. Please try again.