MT2268 : Guided Reports Fix columns.def

Reports Guided : removing \n when reading columns.def
Adding some more fields to columns.def

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index 51e608b..da45de4 100644 (file)
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -724,8 +724,9 @@ sub _get_column_defs {
        my $full_path_to_columns_def_file="$htdocs/$theme/$lang/$columns_def_file";    
        open (COLUMNS,$full_path_to_columns_def_file);
        while (my $input = <COLUMNS>){
+               chomp $input;
                my @row =split(/\t/,$input);
-               $columns{$row[0]}=$row[1];
+               $columns{$row[0]}= $row[1];
        }
 
        close COLUMNS;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def
index 4aa6637..b5a5695 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def
+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def
@@ -78,6 +78,8 @@ items.itemnotes       Item Notes
 items.holdingbranch    Holding Branch
 items.paidfor  Has Item been lost and then paid for
 items.timestamp        Timestamp
+items.date_due Due Date
+items.issuedate        Issue Date
 items.location Location
 items.ccode    Koha Collection
 items.itype    Item-level Item Type
@@ -96,6 +98,7 @@ statistics.itemnumber Item Number
 statistics.itemtype    Item Type
 statistics.borrowernumber      Borrower Number
 biblio.frameworkcode   Framework Code
+biblio.author  Author
 biblio.datecreated     Creation Date
 biblio.timestamp       Modification Date
 biblioitems.biblioitemnumber   Biblioitem Number