@@ -, +, @@
overdues
---
C4/Overdues.pm | 8 +-
...h-and-barcode-columns-in-accountlines-table.sql | 4 +
installer/data/mysql/kohastructure.sql | 6 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 4 +
t/db_dependent/Circulation.t | 75 ++++++++++++-----
t/db_dependent/Circulation/UpdateFine.t | 94 ++++++++++++++++++++++
6 files changed, 165 insertions(+), 26 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_16461-Add-branch-and-barcode-columns-in-accountlines-table.sql
create mode 100644 t/db_dependent/Circulation/UpdateFine.t
--- a/C4/Overdues.pm
+++ a/C4/Overdues.pm
@@ -595,14 +595,14 @@ sub UpdateFine {
} else {
if ( $amount ) { # Don't add new fines with an amount of 0
my $sth4 = $dbh->prepare(
- "SELECT title FROM biblio LEFT JOIN items ON biblio.biblionumber=items.biblionumber WHERE items.itemnumber=?"
+ "SELECT title,holdingbranch,barcode FROM biblio LEFT JOIN items ON biblio.biblionumber=items.biblionumber WHERE items.itemnumber=?"
);
$sth4->execute($itemnum);
- my $title = $sth4->fetchrow;
+ my ($title,$holdingbranch,$barcode) = $sth4->fetchrow;
my $nextaccntno = C4::Accounts::getnextacctno($borrowernumber);
- my $desc = ( $type ? "$type " : '' ) . "$title $due"; # FIXEDME, avoid whitespace prefix on empty $type
+ my $desc = ( $type ? "$type " : '' ) . "$title $due"; # FIXEDME, avoid whitespace prefix on empty $type;
my $accountline = Koha::Account::Line->new(
{
@@ -616,6 +616,8 @@ sub UpdateFine {
lastincrement => $amount,
accountno => $nextaccntno,
issue_id => $issue_id,
+ barcode => $barcode,
+ branchcode => $holdingbranch
}
)->store();
}
--- a/installer/data/mysql/atomicupdate/bug_16461-Add-branch-and-barcode-columns-in-accountlines-table.sql
+++ a/installer/data/mysql/atomicupdate/bug_16461-Add-branch-and-barcode-columns-in-accountlines-table.sql
@@ -0,0 +1,4 @@
+ALTER TABLE accountlines ADD barcode varchar(20) NULL DEFAULT NULL;
+ALTER TABLE accountlines ADD CONSTRAINT accountlines_ibfk_3 FOREIGN KEY (barcode) REFERENCES items (barcode) ON DELETE SET NULL ON UPDATE SET NULL;
+ALTER TABLE accountlines ADD branchcode varchar(10) NULL DEFAULT NULL;
+ALTER TABLE accountlines ADD CONSTRAINT accountlines_ibfk_4 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE SET NULL;
--- a/installer/data/mysql/kohastructure.sql
+++ a/installer/data/mysql/kohastructure.sql
@@ -2703,12 +2703,16 @@ CREATE TABLE `accountlines` (
`notify_level` int(2) NOT NULL default 0,
`note` text NULL default NULL,
`manager_id` int(11) NULL,
+ `barcode` varchar(20) NULL default '',
+ `branchcode` varchar(10) NULL default '',
PRIMARY KEY (`accountlines_id`),
KEY `acctsborridx` (`borrowernumber`),
KEY `timeidx` (`timestamp`),
KEY `itemnumber` (`itemnumber`),
CONSTRAINT `accountlines_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
- CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL
+ CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL,
+ CONSTRAINT `accountlines_ibfk_3` FOREIGN KEY (`barcode`) REFERENCES `items` (`barcode`) ON DELETE SET NULL ON UPDATE SET NULL,
+ CONSTRAINT `accountlines_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE SET NULL ON UPDATE SET NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
--
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -76,6 +76,8 @@ function enableCheckboxActions(){
Fines & charges
Description
+
Barcode
+
Library
Payment note
Account type
Notify id
@@ -141,6 +143,8 @@ function enableCheckboxActions(){
[%- IF line.description %], [% line.description %][% END %]
[% IF line.title %]([% line.title %])[% END %]
+