Bugzilla – Attachment 20808 Details for
Bug 7595
Add branchcode to accountlines
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7595 - Add branchcode to accountlines
Bug-7595---Add-branchcode-to-accountlines.patch (text/plain), 9.58 KB, created by
Kyle M Hall (khall)
on 2013-09-05 17:05:51 UTC
(
hide
)
Description:
Bug 7595 - Add branchcode to accountlines
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-09-05 17:05:51 UTC
Size:
9.58 KB
patch
obsolete
>From a766cd3a2077536ff5299c7979ac99e5af08dc84 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 24 Feb 2012 14:26:05 -0500 >Subject: [PATCH] Bug 7595 - Add branchcode to accountlines > >Adds a branchcode column to the accountlines table. For payments, >this inserts the branchcode of the library where the payment was >recorded. For manual invoices, it insert the branchcode of the >library where the manual invoice was created. > >Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> > >I tested with creating manual invoices, and paying partial fines, >entire fine lines, and writing off fines. All actions record the branch >where the action took place properly. >--- > C4/Accounts.pm | 91 +++++++++++++++++++++----------- > installer/data/mysql/kohastructure.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 +++ > 3 files changed, 68 insertions(+), 31 deletions(-) > >diff --git a/C4/Accounts.pm b/C4/Accounts.pm >index f087b7a..d1795cb 100644 >--- a/C4/Accounts.pm >+++ b/C4/Accounts.pm >@@ -145,10 +145,11 @@ sub recordpayment { > # create new line > my $usth = $dbh->prepare( > "INSERT INTO accountlines >- (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id) >- VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?)" >+ (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id,branchcode) >+ VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?,?)" > ); >- $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, 0 - $amountleft, $manager_id ); >+ >+ $usth->execute( $borrowernumber, $nextaccntno, 0 - $data, 0 - $amountleft, $manager_id, $branch ); > > UpdateStats( $branch, 'payment', $data, '', '', '', $borrowernumber, $nextaccntno ); > >@@ -230,14 +231,22 @@ sub makepayment { > my $payment = 0 - $amount; > $payment_note //= ""; > >- my $ins = >- $dbh->prepare( >- "INSERT >- INTO accountlines (borrowernumber, accountno, date, amount, itemnumber, description, accounttype, amountoutstanding, manager_id, note) >- VALUES ( ?, ?, now(), ?, ?, 'Payment,thanks', 'Pay', 0, ?, ?)" >- ); >- $ins->execute($borrowernumber, $nextaccntno, $payment, $data->{'itemnumber'}, $manager_id, $payment_note); >- $ins->finish; >+ my $ins = $dbh->prepare(q{ >+ INSERT INTO accountlines ( >+ borrowernumber, accountno, date, amount, itemnumber, description, accounttype, amountoutstanding, manager_id, note, branchcode >+ ) VALUES ( >+ ?, ?, NOW(), ?, ?, 'Payment,thanks', 'Pay', 0, ?, ?, ? >+ ) >+ }); >+ $ins->execute( >+ $borrowernumber, >+ $nextaccntno, >+ $payment, >+ $data->{'itemnumber'}, >+ $manager_id, >+ $payment_note, >+ C4::Context->userenv->{'branch'} >+ ); > } > > if ( C4::Context->preference("FinesLog") ) { >@@ -360,10 +369,10 @@ sub chargelostitem{ > # 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,manager_id) >- VALUES (?,?,now(),?,?,'L',?,?,?)"); >+ (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber,manager_id,branchcode) >+ VALUES (?,?,now(),?,?,'L',?,?,?,?)"); > $sth2->execute($borrowernumber,$accountno,$amount, >- $description,$amount,$itemnumber,$manager_id); >+ $description,$amount,$itemnumber,$manager_id,C4::Context->userenv->{'branch'}); > $sth2->finish; > > if ( C4::Context->preference("FinesLog") ) { >@@ -413,6 +422,7 @@ sub manualinvoice { > my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_; > my $manager_id = 0; > $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv; >+ my $branchcode = C4::Context->userenv->{'branch'}; > my $dbh = C4::Context->dbh; > my $notifyid = 0; > my $insert; >@@ -463,16 +473,16 @@ sub manualinvoice { > $desc .= ' ' . $itemnum; > my $sth = $dbh->prepare( > 'INSERT INTO accountlines >- (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber,notify_id, note, manager_id) >- VALUES (?, ?, now(), ?,?, ?,?,?,?,?,?)'); >- $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum,$notifyid, $note, $manager_id) || return $sth->errstr; >+ (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber,notify_id, note, manager_id, branchcode) >+ VALUES (?, ?, now(), ?,?, ?,?,?,?,?,?,?)'); >+ $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum,$notifyid, $note, $manager_id, $branchcode) || return $sth->errstr; > } else { > my $sth=$dbh->prepare("INSERT INTO accountlines >- (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,notify_id, note, manager_id) >- VALUES (?, ?, now(), ?, ?, ?, ?,?,?,?)" >+ (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,notify_id, note, manager_id, branchcode) >+ VALUES (?, ?, now(), ?, ?, ?, ?,?,?,?,?)" > ); > $sth->execute( $borrowernumber, $accountno, $amount, $desc, $type, >- $amountleft, $notifyid, $note, $manager_id ); >+ $amountleft, $notifyid, $note, $manager_id, $branchcode ); > } > > if ( C4::Context->preference("FinesLog") ) { >@@ -848,10 +858,19 @@ sub recordpayment_selectaccts { > } > > # create new line >- $sql = 'INSERT INTO accountlines ' . >- '(borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding,manager_id,note) ' . >- q|VALUES (?,?,now(),?,'Payment,thanks','Pay',?,?,?)|; >- $dbh->do($sql,{},$borrowernumber, $nextaccntno, 0 - $amount, 0 - $amountleft, $manager_id, $note ); >+ $sql = q{ >+ INSERT INTO accountlines ( >+ borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, manager_id, note, branchcode >+ ) VALUES ( >+ ?, ?, NOW(), ?, 'Payment,thanks', 'Pay', ?, ?, ?, ? >+ ) >+ }; >+ $dbh->do( >+ $sql, {}, $borrowernumber, >+ $nextaccntno, 0 - $amount, 0 - $amountleft, >+ $manager_id, $note, $branch >+ ); >+ > UpdateStats( $branch, 'payment', $amount, '', '', '', $borrowernumber, $nextaccntno ); > > if ( C4::Context->preference("FinesLog") ) { >@@ -889,7 +908,7 @@ sub makepartialpayment { > 'SELECT * FROM accountlines WHERE accountlines_id=?',undef,$accountlines_id); > my $new_outstanding = $data->{amountoutstanding} - $amount; > >- my $update = 'UPDATE accountlines SET amountoutstanding = ? WHERE accountlines_id = ? '; >+ my $update = 'UPDATE accountlines SET amountoutstanding = ? WHERE accountlines_id = ? '; > $dbh->do( $update, undef, $new_outstanding, $accountlines_id); > > if ( C4::Context->preference("FinesLog") ) { >@@ -906,12 +925,22 @@ sub makepartialpayment { > } > > # create new line >- my $insert = 'INSERT INTO accountlines (borrowernumber, accountno, date, amount, ' >- . 'description, accounttype, amountoutstanding, itemnumber, manager_id, note) ' >- . ' VALUES (?, ?, now(), ?, ?, ?, 0, ?, ?, ?)'; >- >- $dbh->do( $insert, undef, $borrowernumber, $nextaccntno, $amount, >- "Payment, thanks - $user", 'Pay', $data->{'itemnumber'}, $manager_id, $payment_note); >+ my $insert = q{ >+ INSERT INTO accountlines ( >+ borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber, manager_id, note, branchcode >+ ) VALUES ( >+ ?, ?, NOW(), ?, ?, ?, 0, ?, ?, ?, ? >+ ) >+ }; >+ >+ $dbh->do( >+ $insert, undef, >+ $borrowernumber, $nextaccntno, >+ $amount, "Payment, thanks - $user", >+ 'Pay', $data->{'itemnumber'}, >+ $manager_id, $payment_note, >+ C4::Context->userenv->{'branch'} >+ ); > > UpdateStats( $user, 'payment', $amount, '', '', '', $borrowernumber, $accountno ); > >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 7628983..505894f 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -2636,6 +2636,7 @@ CREATE TABLE `accountlines` ( > `notify_level` int(2) NOT NULL default 0, > `note` text NULL default NULL, > `manager_id` int(11) NULL, >+ `branchcode` VARCHAR( 10 ) NULL DEFAULT NULL, -- the branchcode of the library where a payment was made, a manual invoice created, etc. > PRIMARY KEY (`accountlines_id`), > KEY `acctsborridx` (`borrowernumber`), > KEY `timeidx` (`timestamp`), >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 74aeb3e..43e718a 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -7067,6 +7067,13 @@ if ( CheckVersion($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion = "3.13.00.XXX"; >+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { >+ $dbh->do("ALTER TABLE accountlines ADD branchcode VARCHAR( 10 ) NULL DEFAULT NULL AFTER manager_id"); >+ print "Upgrade to $DBversion done (Added column branchcode to accountlines)\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >-- >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 7595
:
7866
|
7867
|
7868
|
7869
|
7870
|
8037
|
8162
|
12394
|
12395
|
12717
|
12719
|
14814
|
14815
|
20808
|
20809
|
23306
|
23308
|
27337
|
30946
|
30947
|
30950
|
38150
|
38225
|
38235
|
52909
|
52910
|
52911
|
54262
|
54263
|
54264