From 3dbc6185ce3247ad0a60673322907f5cdb4cec01 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 11 Dec 2013 11:10:14 -0500 Subject: [PATCH] Bug 6427 [Part 10] - Update reports wizard --- C4/Reports/Guided.pm | 29 +++++++++++++------- .../prog/en/modules/help/reports/guided_reports.tt | 18 ------------ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm index 22a23dd..8440576 100644 --- a/C4/Reports/Guided.pm +++ b/C4/Reports/Guided.pm @@ -92,18 +92,27 @@ my %table_areas = ( CAT => [ 'items', 'biblioitems', 'biblio' ], PAT => ['borrowers'], ACQ => [ 'aqorders', 'biblio', 'items' ], - ACC => [ 'borrowers', 'accountlines' ], + ACC => [ 'borrowers', 'account_credits', 'account_debits' ], ); my %keys = ( - CIRC => [ 'statistics.borrowernumber=borrowers.borrowernumber', - 'items.itemnumber = statistics.itemnumber', - 'biblioitems.biblioitemnumber = items.biblioitemnumber' ], - CAT => [ 'items.biblioitemnumber=biblioitems.biblioitemnumber', - 'biblioitems.biblionumber=biblio.biblionumber' ], - PAT => [], - ACQ => [ 'aqorders.biblionumber=biblio.biblionumber', - 'biblio.biblionumber=items.biblionumber' ], - ACC => ['borrowers.borrowernumber=accountlines.borrowernumber'], + CIRC => [ + 'statistics.borrowernumber=borrowers.borrowernumber', + 'items.itemnumber = statistics.itemnumber', + 'biblioitems.biblioitemnumber = items.biblioitemnumber' + ], + CAT => [ + 'items.biblioitemnumber=biblioitems.biblioitemnumber', + 'biblioitems.biblionumber=biblio.biblionumber' + ], + PAT => [], + ACQ => [ + 'aqorders.biblionumber=biblio.biblionumber', + 'biblio.biblionumber=items.biblionumber' + ], + ACC => [ + 'borrowers.borrowernumber=account_credits.borrowernumber', + 'borrowers.borrowernumber=account_debits.borrowernumber' + ], ); # have to do someting here to know if its dropdown, free text, date etc diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt index 2af7d47..29d96ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt @@ -108,24 +108,6 @@

DB table value for reports

-

Question: What do the codes in the accounttype field in the accountlines table stand for?

- -

Answer:

- - -

Question: What are the possible codes for the type field in the statistics table?

Answer:

-- 1.7.2.5