Bugzilla – Attachment 15027 Details for
Bug 7298
export late orders, with # of claims and claim dates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7298 fixing 3 QA errors
Bug-7298-fixing-3-QA-errors.patch (text/plain), 3.60 KB, created by
Jonathan Druart
on 2013-02-04 09:10:12 UTC
(
hide
)
Description:
Bug 7298 fixing 3 QA errors
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-02-04 09:10:12 UTC
Size:
3.60 KB
patch
obsolete
>From b41c79171e91eb297096e32d1cb38a11a824fe07 Mon Sep 17 00:00:00 2001 >From: Paul Poulain <paul.poulain@biblibre.com> >Date: Mon, 1 Oct 2012 19:31:34 +0200 >Subject: [PATCH] Bug 7298 fixing 3 QA errors > >* replace IFNULL by COALESCE >* replace 4 tabs by 4 "4 spaces" >* replace a simple quote string >--- > C4/Acquisition.pm | 4 ++-- > .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 2 +- > serials/lateissues-export.pl | 14 +++++++------- > 3 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index 3350e2f..56cc17d 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -1005,8 +1005,8 @@ sub GetOrder { > biblioitems.publishercode AS publisher, > ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate, > DATE(aqbasket.closedate) AS orderdate, >- aqorders.quantity - IFNULL(aqorders.quantityreceived,0) AS quantity, >- (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal, >+ aqorders.quantity - COALESCE(aqorders.quantityreceived,0) AS quantity, >+ (aqorders.quantity - COALESCE(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal, > DATEDIFF(CURDATE( ),closedate) AS latesince > FROM aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber > LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index ad36ac8..90e2796 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -40,7 +40,7 @@ $(document).ready(function() { > var selected = $("input[name='ordernumber']:checked"); > > if (selected.length == 0) { >- alert(_('Please select at least one item to export.')); >+ alert(_("Please select at least one item to export.")); > return false; > } > >diff --git a/serials/lateissues-export.pl b/serials/lateissues-export.pl >index e5cc849..57b9ffa 100755 >--- a/serials/lateissues-export.pl >+++ b/serials/lateissues-export.pl >@@ -63,11 +63,11 @@ for (my $k=0;$k<@serialid;$k++){ > @missingissues = GetLateOrMissingIssues($supplierid, $serialid[$k]); > > for (my $j=0;$j<@missingissues;$j++){ >- my @rows2 = ($missingissues[$j]->{'name'}, # lets build up a row >- $missingissues[$j]->{'title'}, >- $missingissues[$j]->{'serialseq'}, >- $missingissues[$j]->{'planneddate'}, >- ); >+ my @rows2 = ($missingissues[$j]->{'name'}, # lets build up a row >+ $missingissues[$j]->{'title'}, >+ $missingissues[$j]->{'serialseq'}, >+ $missingissues[$j]->{'planneddate'}, >+ ); > push (@loop2, \@rows2); > } > $totalcount2 += scalar @missingissues; >@@ -79,9 +79,9 @@ my $heading =''; > my $filename =''; > if($supplierid){ > if($missingissues[0]->{'name'}){ # if exists display supplier name in heading for neatness >- # not necessarily needed as the name will appear in supplier column also >+ # not necessarily needed as the name will appear in supplier column also > $heading = "FOR $missingissues[0]->{'name'}"; >- $filename = "_$missingissues[0]->{'name'}"; >+ $filename = "_$missingissues[0]->{'name'}"; > } > } > >-- >1.7.10.4
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 7298
:
7809
|
7891
|
7946
|
8333
|
10426
|
11713
|
11717
|
11721
|
11722
|
12624
|
12817
|
12818
|
15027
|
15028
|
15037
|
15038
|
15039
|
15040
|
16688
|
16689
|
16690
|
16691
|
16692
|
16956
|
19819
|
20313
|
20314
|
20315
|
20471
|
20472
|
20473
|
20474
|
21339
|
21383
|
21384
|
21385
|
21386
|
21387
|
21398
|
21523
|
22617
|
22618
|
22619
|
22620
|
22621
|
22622