Bugzilla – Attachment 8676 Details for
Bug 6634
manager_id not populated when paying fines
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix 3 other cases of manager_id not populated
0001-bug-6634-3-more-cases-of-manager_id-not-populated.patch (text/plain), 3.72 KB, created by
Maxime Pelletier
on 2012-03-28 21:28:36 UTC
(
hide
)
Description:
Fix 3 other cases of manager_id not populated
Filename:
MIME Type:
Creator:
Maxime Pelletier
Created:
2012-03-28 21:28:36 UTC
Size:
3.72 KB
patch
obsolete
>From bf3ae370713ca105e3fd157e219d383f5e9bd697 Mon Sep 17 00:00:00 2001 >From: Maxime Pelletier <maxime.pelletier@libeo.com> >Date: Wed, 28 Mar 2012 17:26:01 -0400 >Subject: [PATCH] bug 6634 : 3 more cases of manager_id not populated > >--- > C4/Accounts.pm | 24 +++++++++++++++--------- > 1 files changed, 15 insertions(+), 9 deletions(-) > >diff --git a/C4/Accounts.pm b/C4/Accounts.pm >index d2517c2..a94836a 100644 >--- a/C4/Accounts.pm >+++ b/C4/Accounts.pm >@@ -83,6 +83,8 @@ sub recordpayment { > my $accdata = ""; > my $branch = C4::Context->userenv->{'branch'}; > my $amountleft = $data; >+ my $manager_id = 0; >+ $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; > > # begin transaction > my $nextaccntno = getnextacctno($borrowernumber); >@@ -125,10 +127,10 @@ sub recordpayment { > # create new line > my $usth = $dbh->prepare( > "INSERT INTO accountlines >- (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding) >- VALUES (?,?,now(),?,'Payment,thanks','Pay',?)" >+ (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id) >+ VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?)" > ); >- $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, 0 - $amountleft ); >+ $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, 0 - $amountleft, $manager_id ); > $usth->finish; > UpdateStats( $branch, 'payment', $data, '', '', '', $borrowernumber, $nextaccntno ); > $sth->finish; >@@ -293,15 +295,17 @@ sub chargelostitem{ > > # OK, they haven't > unless ($existing_charge_hashref) { >+ my $manager_id = 0; >+ $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; > # This item is on issue ... add replacement cost to the borrower's record and mark it returned > # Note that we add this to the account even if there's no replacement price, allowing some other > # process (or person) to update it, since we don't handle any defaults for replacement prices. > my $accountno = getnextacctno($borrowernumber); > my $sth2=$dbh->prepare("INSERT INTO accountlines >- (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber) >- VALUES (?,?,now(),?,?,'L',?,?)"); >+ (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber,manager_id) >+ VALUES (?,?,now(),?,?,'L',?,?,?)"); > $sth2->execute($borrowernumber,$accountno,$amount, >- $description,$amount,$itemnumber); >+ $description,$amount,$itemnumber,$manager_id); > $sth2->finish; > # FIXME: Log this ? > } >@@ -680,6 +684,8 @@ sub recordpayment_selectaccts { > my $accdata = q{}; > my $branch = C4::Context->userenv->{branch}; > my $amountleft = $amount; >+ my $manager_id = 0; >+ $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; > my $sql = 'SELECT * FROM accountlines WHERE (borrowernumber = ?) ' . > 'AND (amountoutstanding<>0) '; > if (@{$accts} ) { >@@ -714,9 +720,9 @@ sub recordpayment_selectaccts { > > # create new line > $sql = 'INSERT INTO accountlines ' . >- '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding) ' . >- q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?)|; >- $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft ); >+ '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id) ' . >+ q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?)|; >+ $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft, $manager_id ); > UpdateStats( $branch, 'payment', $amount, '', '', '', $borrowernumber, $nextaccntno ); > return; > } >-- >1.7.2.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6634
:
4743
|
4745
|
4754
|
4991
|
7478
|
7527
| 8676