Fixes from merge conflicts

liblime · May 5, 2010 · 518fb54 · 518fb54
1 parent 3670951
commit 518fb54
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 47 deletions.
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
@@ -58,7 +58,6 @@ BEGIN {
 
 	# FIXME subs that should probably be elsewhere
 	push @EXPORT, qw(
-		&FixOverduesOnReturn
 		&barcodedecode
 	);
 
@@ -1424,7 +1423,6 @@ sub AddReturn {
     $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
     my $messages;
     my $borrower;
-    my $biblio;
     my $doreturn       = 1;
     my $validTransfert = 0;
 
@@ -1617,18 +1615,6 @@ sub AddReturn {
     logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'biblionumber'})
         if C4::Context->preference("ReturnLog");
 
-        # fix up the overdues in accounts...
-        FixOverduesOnReturn( $borrower->{'borrowernumber'},
-            $issue->{'itemnumber'}, $exemptfine, $dropbox );
-
-        # find reserves.....
-        # if we don't have a reserve with the status W, we launch the Checkreserves routine
-        my ( $resfound, $resrec ) = C4::Reserves::CheckReserves( $issue->{'itemnumber'} );
-        if ($resfound) {
-              $resrec->{'ResFound'} = $resfound;
-            $messages->{'ResFound'} = $resrec;
-        }
-
     # FIXME: make this comment intelligible.
     #adding message if holdingbranch is non equal a userenv branch to return the document to homebranch
     #we check, if we don't have reserv or transfert for this document, if not, return it to homebranch .

diff --git a/C4/Members.pm b/C4/Members.pm
@@ -1227,7 +1227,7 @@ sub GetMemberAccountRecords {
           $total += int(100 * $data->{'amountoutstanding'}); # convert float to integer to avoid round-off errors
         }
     }
-    $total /= 1000;
+    $total /= 100;
     $sth->finish;
     return ( $total, \@acctlines,$numlines);
 }

diff --git a/C4/Overdues.pm b/C4/Overdues.pm
@@ -26,6 +26,7 @@ use C4::Context;
 use C4::Accounts;
 use C4::Log; # logaction
 use C4::Debug;
+use C4::Stats;
 
 use vars qw($VERSION @ISA @EXPORT);
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -493,7 +493,11 @@ if (nodename =="barcodes[]"){
                     </script>
                 </p>
                 <p>
-                    <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
+                    <!-- TMPL_IF NAME="CAN_user_circulate_exempt_fines" -->
+                    Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" />
+                    <!-- TMPL_ELSE -->
+                    <input type="hidden" name="exemptfine" value="0" />
+                    <!-- /TMPL_IF -->
                 </p>
             </td>
         </tr>
@@ -565,34 +569,6 @@ if (nodename =="barcodes[]"){
       <!-- /TMPL_IF -->
         </tr>
         <!-- /tmpl_loop --></tbody>
-        <tr>
-            <td colspan="4" style="text-align: right; font-weight:bold;">Totals:</td>
-			<td><!-- TMPL_VAR NAME="totaldue" --></td>
-            <td><!-- TMPL_VAR NAME="totalprice" --></td>
-            <td colspan="2">      
-                <p>
-                    Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="<!-- TMPL_VAR Name="newduedate" -->" />
-                    <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" />
-                    <script type="text/javascript">
-                        //<![CDATA[
-                        Calendar.setup({
-                            inputField : "newduedate",
-                            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                            button : "newduedate_button"
-                        });
-                        //]]>
-                    </script>
-                </p>
-                <p>
-                    <!-- TMPL_IF NAME="CAN_user_circulate_exempt_fines" -->
-                    Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" />
-                    <!-- TMPL_ELSE -->
-                    <input type="hidden" name="exemptfine" value="0" />
-                    <!-- /TMPL_IF -->
-
-                </p>
-            </td>
-        </tr>
         </table>
         <fieldset class="action">
         <!-- TMPL_IF NAME="CAN_user_circulate_override_renewals" -->
@@ -626,6 +602,7 @@ if (nodename =="barcodes[]"){
 			<th>Hold Date</th>
 			<th>Hold Expiration Date</th>
 			<th>Title</th>
+                        <th>Item Type</th>
 			<th>Call Number</th>
 			<th>Barcode</th>
 			<th>Priority</th>

diff --git a/members/pay.pl b/members/pay.pl
@@ -212,9 +212,9 @@ sub add_accounts_to_template {
                     notify_id         => $acct->{notify_id},
                     notify_level      => $acct->{notify_level},
                 };
-                if ($acct->{amountoutstanding} > 0 ) {
-                    $line->{net_balance} = 1;
-                }
+                $line->{'net_balance'} =  1 if($acct->{'amountoutstanding'} > 0);
+                $line->{'net_balance'} = undef if ((C4::Context->preference("EnableOverdueAccruedAmount")) && ($acct->{'accounttype'} eq "FU"));
+
                 push @{ $pay_loop}, $line;
                 ++$line_id;
             }