Bugzilla – Attachment 45245 Details for
Bug 11371
Add a new report : Orders by budget
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11371 - fix problem with right data in each column in csv file
-Bug-11371---fix-problem-with-right-data-in-each-c.patch (text/plain), 10.75 KB, created by
Bouzid Fergani
on 2015-11-30 22:12:32 UTC
(
hide
)
Description:
Bug 11371 - fix problem with right data in each column in csv file
Filename:
MIME Type:
Creator:
Bouzid Fergani
Created:
2015-11-30 22:12:32 UTC
Size:
10.75 KB
patch
obsolete
>From a72a4499379602da1cce8ad1deb093bc92f44b6a Mon Sep 17 00:00:00 2001 >From: Bouzid Fergani <bouzid.fergani@inlibro.com> >Date: Mon, 30 Nov 2015 16:40:55 -0500 >Subject: [PATCH] Bug 11371 - fix problem with right data in each column in > csv file > > fix problem with right data in each column > correct format date > tidying up in template file >--- > .../csv_headers/reports/orders_by_budget.tt | 2 +- > .../prog/en/modules/reports/orders_by_budget.tt | 158 ++++++++++---------- > reports/orders_by_fund.pl | 5 +- > 3 files changed, 80 insertions(+), 85 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt >index c80440f..49dfc9d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt >@@ -1 +1 @@ >-Fund[% sep %]Basket[% sep %]Basket by[% sep %]biblionumber[% sep %]Title[% sep %]Currency[% sep %]Vendor Price[% sep %]RRP[% sep %]Budgeted Cost[% sep %]Quantity[% sep %]Total RRP[% sep %]Total Cost[% sep %]Entry Date[% sep %]Date Received[% sep %]Notes >+Fund[% sep %]"Basket Num"[% sep %]"Basket Name"[% sep %]"authorised By"[% sep %]"Biblio Number"[% sep %]Title[% sep %]Currency[% sep %]"Vendor Price"[% sep %]RRP[% sep %]"Budgeted Cost"[% sep %]Quantity[% sep %]"Total RRP"[% sep %]"Total Cost"[% sep %]"Entry Date"[% sep %]"Date Received"[% sep %]Notes >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 88371b9..bc973ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -17,28 +17,26 @@ > > <div id="doc3" class="yui-t2"> > >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >-[% IF ( current_budget_name ) %] >-<h1>Orders for fund '[% current_budget_name %]'</h1> >-[% ELSE %] >-<h1>Orders by fund</h1> >+<div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> >+ >+[% IF ( current_budget_name ) %]<h1>Orders for fund '[% current_budget_name %]'</h1> >+[% ELSE %]<h1>Orders by fund</h1> > [% END %] > > [% IF ( get_orders ) %] >- >-<div class="results"> >- [% IF ( total ) %] >- Orders found: [% total %] >- [% ELSE %] >- No order found >- [% END %] >-</div> >+ <div class="results"> >+ [% IF ( total ) %] >+ Orders found: [% total %] >+ [% ELSE %] >+ No order found >+ [% END %] >+ </div> > > [% IF ( ordersloop ) %]<table id="funds"> >- <thead> >- <tr> >+ <thead> >+ <tr> > <th>Fund</th> > <th>Basket</th> > <th>Basket Name</th> >@@ -54,24 +52,18 @@ > <th>Entry Date</th> > <th>Date Received</th> > <th>Notes</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH ordersloo IN ordersloop %] >- [% UNLESS ( loop.odd ) %] >- <tr class="highlight"> >- [% ELSE %] >- <tr> >- [% END %] >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH ordersloo IN ordersloop %] >+ [% UNLESS ( loop.odd ) %]<tr class="highlight"> >+ [% ELSE %] <tr> >+ [% END %] > <td>[% ordersloo.budget_name |html %]</td> >- <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno %]"> >- [% ordersloo.basketno |html %] >- </a></td> >+ <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno %]"> [% ordersloo.basketno |html %]</a></td> > <td>[% ordersloo.basketname |html %]</td> >- <td>[% ordersloo.authorisedbyname %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]"> >- [% ordersloo.title |html %] >- </a></td> >+ <td>[% ordersloo.authorisedbyname %]</td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber %]"> [% ordersloo.title |html %]</a></td> > <td>[% ordersloo.currency %]</td> > <td>[% ordersloo.listprice %]</td> > <td>[% ordersloo.rrp %]</td> >@@ -82,59 +74,63 @@ > <td>[% ordersloo.entrydate %]</td> > <td>[% ordersloo.datereceived %]</td> > <td>[% ordersloo.notes |html %]</td> >- </tr> >- [% END %] >- </tbody> >- <tfoot> >- <tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity %]</th><th>[% total_rrp %]</th><th>[% total_ecost %]</th><th></th><th></th><th></th></tr> >- </tfoot> >- </table> >+ </tr> >+ [% END %] >+ </tbody> >+ <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity %]</th><th>[% total_rrp %]</th><th>[% total_ecost %]</th><th></th><th></th><th></th></tr></tfoot> >+ </table> > [% END %] > [% ELSE %] >- >- <form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post"> >-<fieldset class="rows"> >- <legend>Filters</legend> >- <ol><li><label for="budgetfilter">Fund (Budget): </label><select name="budgetfilter" id="budgetfilter"> >- <option value="">All funds</option> >- <option value="activebudgets">All active funds</option> >- [% FOREACH budgetsloo IN budgetsloop %] >- [% IF ( budgetsloo.selected ) %]<option value="[% budgetsloo.value %]" selected="selected">[% budgetsloo.description %] [% budgetsloo.period %]</option> >- [% ELSE %] >- <option value="[% budgetsloo.value %]">[% budgetsloo.description %] [% budgetsloo.period %]</option> >- [% END %] >+ <form name="f" action="/cgi-bin/koha/reports/orders_by_fund.pl" method="post"> >+ <fieldset class="rows"> >+ <legend>Filters</legend> >+ <ol><li><label for="budgetfilter">Fund (Budget): </label> >+ <select name="budgetfilter" id="budgetfilter"> >+ <option value="">All funds</option> >+ <option value="activebudgets">All active funds</option> >+ [% FOREACH budgetsloo IN budgetsloop %] >+ [% IF ( budgetsloo.selected ) %] >+ <option value="[% budgetsloo.value %]" selected="selected">[% budgetsloo.description %] [% budgetsloo.period %]</option> >+ [% ELSE %] >+ <option value="[% budgetsloo.value %]">[% budgetsloo.description %] [% budgetsloo.period %]</option> > [% END %] >- </select></li> >-</ol></fieldset> >- >- <fieldset class="rows"> >- <legend>Output</legend> >-<ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li> >-<li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application >- </label> >- <select id='MIME' name='MIME' size='1'> >- [% FOREACH outputFormatloo IN outputFormatloop %] >- <option value="[% outputFormatloo %]">[% outputFormatloo %]</option> >- [% END %] >- </select> >- <select id='sep' name='sep' size='1'> >- [% FOREACH delimiterloo IN delimiterloop %] >- [% IF delimiterloo == delimiterPreference %] >- <option value="[% delimiterloo %]">[% delimiterloo %]</option> > [% END %] >- [% END %] >- [% FOREACH delimiterloo IN delimiterloop %] >- [% IF delimiterloo != delimiterPreference %] >- <option value="[% delimiterloo %]">[% delimiterloo %]</option> >- [% END %] >- [% END %] >- </select> >- </li></ol> >- </fieldset> >+ </select> >+ </li></ol> >+ </fieldset> >+ >+ <fieldset class="rows"> >+ <legend>Output</legend> >+ <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li> >+ <li><label for="outputfile">To a file:</label> >+ <input type="radio" name="output" value="file" id="outputfile" /> >+ <label class="inline" for="basename">Named: </label> >+ <input type="text" name="basename" id="basename" value="Export" /> >+ <label class="inline" for="MIME">Into an application </label> >+ <select id='MIME' name='MIME' size='1'> >+ [% FOREACH outputFormatloo IN outputFormatloop %] >+ <option value="[% outputFormatloo %]">[% outputFormatloo %]</option> >+ [% END %] >+ </select> >+ <select id='sep' name='sep' size='1'> >+ [% FOREACH delimiterloo IN delimiterloop %] >+ [% IF delimiterloo == delimiterPreference %] >+ <option value="[% delimiterloo %]">[% delimiterloo %]</option> >+ [% END %] >+ [% END %] >+ [% FOREACH delimiterloo IN delimiterloop %] >+ [% IF delimiterloo != delimiterPreference %] >+ <option value="[% delimiterloo %]">[% delimiterloo %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li></ol> >+ </fieldset> > >-<fieldset class="action"> <input type="submit" value="Submit" /> >- <input type="hidden" name="get_orders" value="1" /></fieldset> >-</form> >+ <fieldset class="action"> >+ <input type="submit" value="Submit" /> >+ <input type="hidden" name="get_orders" value="1" /></fieldset> >+ </form> > > [% END %] > >diff --git a/reports/orders_by_fund.pl b/reports/orders_by_fund.pl >index a8fc2a7..05c42ff 100755 >--- a/reports/orders_by_fund.pl >+++ b/reports/orders_by_fund.pl >@@ -34,7 +34,6 @@ use C4::Output; > use C4::Budgets; > use C4::Biblio; > use C4::Reports; >-use C4::Dates qw/format_date/; > use C4::Acquisition; #GetBasket() > > >@@ -111,8 +110,8 @@ if ( $get_orders ) { > $order->{'total_ecost'} = $order->{'quantity'} * $order->{'ecost'}; > > # Format the dates and currencies correctly >- $order->{'datereceived'} = format_date($order->{'datereceived'}); >- $order->{'entrydate'} = format_date($order->{'entrydate'}); >+ $order->{'datereceived'} = Koha::DateUtils::output_pref(Koha::DateUtils::dt_from_string($order->{'datereceived'})); >+ $order->{'entrydate'} = Koha::DateUtils::output_pref(Koha::DateUtils::dt_from_string($order->{'entrydate'})); > $order->{'listprice'} = sprintf( "%.2f", $order->{'listprice'} ); > $order->{'rrp'} = sprintf( "%.2f", $order->{'rrp'} ); > $order->{'ecost'} = sprintf( "%.2f", $order->{'ecost'}); >-- >1.7.9.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 11371
:
23381
|
25397
|
25913
|
25915
|
30545
|
30546
|
35385
|
36620
|
36707
|
37010
|
37011
|
41463
|
41464
|
45243
|
45244
|
45245
|
45288
|
45338
|
45887
|
45890
|
45981
|
45982
|
50230
|
50231
|
50233
|
50466
|
50468
|
50769