[koha-commits] main Koha release repository branch master updated. v16.05.00-1207-g0bc8f1f

Fri Oct 28 13:51:38 CEST 2016

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  0bc8f1fd462c4bf9fc37af883c9fb776ab9a0f85 (commit)
       via  00ea6fb5d147ac2407e4f0cc4e3b42dcf8f6b5c7 (commit)
       via  a27b57c32715739a25c69c3ea7b33ea7356a68d4 (commit)
       via  337be9f10e07020fd1673ab70836a41f974c8aeb (commit)
       via  eb000bbcdc87cb1898da1e0e0960a72cb93c1bed (commit)
       via  085a2c4834d01d4f223a62482005e3e60250e259 (commit)
       via  385563ca48dbab787a8a9921a162df79909ab05a (commit)
       via  f4ef34c13603e8f373451b2739dd4528f8aba6df (commit)
       via  311f6b400b1783dba49950c427832aa46857bef1 (commit)
       via  9346aabd1317c7ca546e3c30a4215adf576022ec (commit)
       via  03e654ee2e5763f556372747a50996acb2bdaa87 (commit)
       via  4ed68d1e71f6ab84aa49e59411dfe7bf247b3be8 (commit)
       via  7b10c7ccb613ec969782b801d946b049756e992d (commit)
       via  0c1413d0ff4b26aeddbcdd760ac5ed941af1b72c (commit)
       via  caf0a0200566091d4294eb552efcbe3c1a59775e (commit)
      from  f74e467550c4d6f6e8e9becdc61b7df572de5f09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0bc8f1fd462c4bf9fc37af883c9fb776ab9a0f85
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Mon Oct 24 14:45:18 2016 +0200

    Bug 6934: Fix tiny capitalization issue missed before

    Account Management Fee

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 00ea6fb5d147ac2407e4f0cc4e3b42dcf8f6b5c7
Author: Bouzid Fergani <bouzid.fergani at inlibro.com>
Date:   Thu Sep 29 12:43:39 2016 -0400

    Bug 6934 - Fix problem C4::Branch::GetBranchesLoop not exist

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer  <katrin.fischer at bsz-bw.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit a27b57c32715739a25c69c3ea7b33ea7356a68d4
Author: Bouzid Fergani <bouzid.fergani at inlibro.com>
Date:   Thu Aug 4 14:56:33 2016 -0400

    Bug 6934: rename active transaction with All payments to the library and grouping in it the relevant account types 'Pay' 'C'

        rename Patron carnumber on Patron card number
        fix src databales.js

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 337be9f10e07020fd1673ab70836a41f974c8aeb
Author: Bouzid Fergani <bouzid.fergani at inlibro.com>
Date:   Thu Jul 28 09:38:01 2016 -0400

    Bug 6934: fix errors pointed out by the QA script

    Also fix forbidden patterns in koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit eb000bbcdc87cb1898da1e0e0960a72cb93c1bed
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Fri Jul 22 09:12:47 2016 -0600

    Bug 6934: Fix the href for datables in link rel stylesheet

    Fix the new path for 'datatables.css'

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 085a2c4834d01d4f223a62482005e3e60250e259
Author: Bouzid Fergani <bouzid.fergani at inlibro.com>
Date:   Tue Jul 19 14:56:41 2016 -0400

    Bug 6934: Make CSV header column translatable and add total amounts in csv file

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 385563ca48dbab787a8a9921a162df79909ab05a
Author: Bouzid Fergani <bouzid.fergani at inlibro.com>
Date:   Tue Jul 19 12:05:14 2016 -0400

    Bug 6934: fix problem when export it open in LibreOffice - show values of itype and use TT plugin

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit f4ef34c13603e8f373451b2739dd4528f8aba6df
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Apr 28 19:58:32 2016 +0200

    Bug 6934: QA follow-up

    - fixed tabs
    - fixed capitalization on reports start page

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 311f6b400b1783dba49950c427832aa46857bef1
Author: remi <remi.mayrand-provencher at inLibro.com>
Date:   Tue Apr 19 12:11:50 2016 -0400

    Bug 6934: fixed encoding issue

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Encoding issue fixed

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 9346aabd1317c7ca546e3c30a4215adf576022ec
Author: remi <remi.mayrand-provencher at inLibro.com>
Date:   Fri Mar 4 16:13:14 2016 -0500

    Bug 6934: second fix to calendars

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 03e654ee2e5763f556372747a50996acb2bdaa87
Author: remi <remi.mayrand-provencher at inLibro.com>
Date:   Fri Mar 4 15:10:57 2016 -0500

    Bug 6934: Fixed Calendar and removed used of unexisting and unused C4::Budgets getCurrency

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 4ed68d1e71f6ab84aa49e59411dfe7bf247b3be8
Author: remi <remi.mayrand-provencher at inLibro.com>
Date:   Thu Mar 3 11:14:12 2016 -0500

    Bug 6934: QA Follow-up

    Tried to address every single thing that QA mentioned :
    1)Removed isNull function
    2)Changed datepicker properly
    3)We have to fill in two dates not to be flooded with old entries if we don't want to.
    4)The first two fieldsets are now in one bigger field set
    5)Removed the use of $fullreportname variable
    6)Removed the use of dt_from_string when it already recieved a DT.
    7)Removed comments starting with "###" in cash_register_stats.pl
    8)Used Text::CSV::Encoded to generate the CSV file (used guided_reports.pl as an example)
    9)I am not sure if using C4::Reports::Guided is the right choice here. I instead used the same column names as the one recieved by the query in cash_register_stats because this report uses columns from 5 different tables in addition of using both firstname and surname twice.

    For the ninth point, I would like to know more about C4::Reports::Guided if you still think using it would be a better solution. Thank you!

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 7b10c7ccb613ec969782b801d946b049756e992d
Author: genevieve <genevieve at inlibro.com>
Date:   Fri Nov 13 11:50:01 2015 -0500

    Bug 6934: New features, note added to transaction information, total caculated for negative types of transaction

    To be more specific, the column note from accountlines is now displayed in the table of the transactions.
    The grand total is now calculated for neagtive types like Credit or Payment and isn't counted for Write off types.
    Credit (return item) 'CR' has been added to drop down of transaction type

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Works as advertised

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 0c1413d0ff4b26aeddbcdd760ac5ed941af1b72c
Author: genevieve <genevieve.plantin at inlibro.com>
Date:   Tue Sep 15 11:18:49 2015 -0400

    Bug 6934: Fix code in CashRegisterStats (dataTables pagination, more accurate descriptions, add a delimiter pull down, change C4::Dates to Koha::DateUtils)

    I cleaned up the code according to comment #23. I got rid of DHTMLcalendar_dateformat,
    beacause it wasn't use in cash_register_stats.tt. C4::Dates is deprecated,
    Koha::DateUtils is now used.
    Some column names are changed and the pagination for the dataTables is fixed.

    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit caf0a0200566091d4294eb552efcbe3c1a59775e
Author: simith <simith at inlibro.com>
Date:   Wed Aug 27 14:36:13 2014 -0400

    Bug 6934: New report Cash Register Statistics

    This patch creates a new report that outputs cash register stats for a specific period.

    Changes:

    koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc               - Added cash register report link
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash-register_stats.tt  - new file
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt         - Added cash register report link
    reports/cash-register_stats.pl                                          - new file

    Testing:

    I Apply the patch

    0) Go to reports home page (Home › Reports);
    1) Validate link << Cash Register >> under Statistics wizards;
    2) Click link;
    3) Validate page with three fieldsets;
    4) Chose a date interval, a transaction type, a library and an output;
    5) Validade the result.

    Signed-off-by: Nicole <nicole at bywatersolutions.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 .../csv_headers/reports/cash_register_stats.tt     |    1 +
 .../prog/en/includes/reports-menu.inc              |    1 +
 .../prog/en/modules/reports/cash_register_stats.tt |  303 ++++++++++++++++++++
 .../en/modules/reports/csv/cash_register_stats.tt  |   14 +
 .../prog/en/modules/reports/reports-home.tt        |    9 +-
 reports/cash_register_stats.pl                     |  188 ++++++++++++
 6 files changed, 512 insertions(+), 4 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/cash_register_stats.tt
 create mode 100755 reports/cash_register_stats.pl

hooks/post-receive
-- 
main Koha release repository