[Koha-cvs] koha acqui/receive.pl C4/Acquisition.pm koha-tm... [rel_2_2]
paul poulain
paul at koha-fr.org
Wed Aug 2 12:16:41 CEST 2006
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_2_2
Changes by: paul poulain <tipaul> 06/08/02 10:16:41
Modified files:
acqui : receive.pl
C4 : Acquisition.pm
koha-tmpl/intranet-tmpl/default/en/acqui: recieve.tmpl
Log message:
(kados should be insterested by this commit)
BUGFIX in receive : all pending orders where grouped in getallorders, only 1 line was shown in pending orders for each basket, instead of X
+ some minor changes in receive :
- adding the date to the template
- better counting & showing of pending orders
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/receive.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.6&r2=1.13.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.19&r2=1.9.2.20
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.12.2.4&r2=1.12.2.5
Patches:
Index: acqui/receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/Attic/receive.pl,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -u -b -r1.13.2.6 -r1.13.2.7
--- acqui/receive.pl 25 Jul 2006 12:27:55 -0000 1.13.2.6
+++ acqui/receive.pl 2 Aug 2006 10:16:40 -0000 1.13.2.7
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: receive.pl,v 1.13.2.6 2006/07/25 12:27:55 tipaul Exp $
+# $Id: receive.pl,v 1.13.2.7 2006/08/02 10:16:40 tipaul Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -31,6 +31,7 @@
use C4::Interface::CGI::Output;
use C4::Database;
use HTML::Template;
+use C4::Date;
use strict;
my $input=new CGI;
@@ -123,6 +124,7 @@
$template->param(invoice => $invoice,
datereceived => $date,
+ formatteddatereceived => format_date($date),
name => $booksellers[0]->{'name'},
supplierid => $supplierid,
gst => $gst,
Index: C4/Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.19
retrieving revision 1.9.2.20
diff -u -b -r1.9.2.19 -r1.9.2.20
--- C4/Acquisition.pm 31 Jul 2006 13:55:32 -0000 1.9.2.19
+++ C4/Acquisition.pm 2 Aug 2006 10:16:41 -0000 1.9.2.20
@@ -503,8 +503,8 @@
my ($supplierid)=@_;
my $dbh = C4::Context->dbh;
my @results = ();
- my $strsth ="Select count(*),authorisedby,creationdate,aqbasket.basketno,
-closedate,surname,firstname,aqorders.biblionumber,aqorders.title, aqorders.ordernumber
+ my $strsth ="Select authorisedby,creationdate,aqbasket.basketno,
+closedate,surname,firstname,aqorders.biblionumber,aqorders.title,aqorders.author,aqorders.isbn, aqorders.ordernumber, quantity, quantityreceived
from aqorders
left join aqbasket on aqbasket.basketno=aqorders.basketno
left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber
@@ -517,7 +517,7 @@
$strsth .= " and (borrowers.branchcode = '".$userenv->{branch}."' or borrowers.branchcode ='')";
}
}
- $strsth.=" group by basketno order by aqbasket.basketno";
+ $strsth.=" order by aqbasket.basketno";
my $sth=$dbh->prepare($strsth);
$sth->execute($supplierid);
while (my $data=$sth->fetchrow_hashref){
Index: koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -b -r1.12.2.4 -r1.12.2.5
--- koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl 25 Jul 2006 12:27:55 -0000 1.12.2.4
+++ koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl 2 Aug 2006 10:16:41 -0000 1.12.2.5
@@ -2,12 +2,12 @@
<div id="mainbloc">
<h1 class="acquisition">
- Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
+ Receipt parcel for <i><!-- TMPL_VAR NAME="name" --></i>
</h1>
<div id="bloc25">
- Invoice: <!-- TMPL_VAR NAME="invoice" --><br>
- <!-- TMPL_VAR name="datereceived"-->
+ <p><label>Invoice</label><!-- TMPL_VAR NAME="invoice" --></p>
+ <p><label>Date</label> <!-- TMPL_VAR name="formatteddatereceived"--></p>
</div>
<div id="bloc25">
@@ -30,35 +30,29 @@
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->&catview=yes&datereceived=<!-- TMPL_VAR name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
- <td><!-- TMPL_VAR NAME="ecost" --></td>
- <td><!-- TMPL_VAR NAME="quantity" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
<td></td>
- <td><!-- TMPL_VAR NAME="unitprice" --></td>
- <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
- <td><!-- TMPL_VAR NAME="total" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="unitprice" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="total" --></td>
</tr>
<!-- /TMPL_LOOP -->
- <tr bgcolor="white">
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
- </tr>
<tr>
- <td colspan="5" rowspan=2 bgcolor="#ffdf61">
+ <td colspan="5" rowspan=3 bgcolor="#ffdf61">
<b>HELP</b>
<p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
</td>
- <td colspan="2" align="right"><b>GST</b></td>
- <td><!-- TMPL_VAR NAME="gst" --></td>
+ <td colspan="2" class="acquisition number"><b>GST</b></td>
+ <td class="acquisition number"><!-- TMPL_VAR NAME="gst" --></td>
</tr>
- <tr bgcolor="white">
- <td colspan="2" align="right" ><b>TOTAL</b></td>
- <td><!-- TMPL_VAR NAME="grandtot" --></td>
+ <tr>
+ <td colspan="2" class="acquisition number"><b>FREIGHT</b></td>
+ <td class="acquisition number"><!-- TMPL_VAR NAME="freight" --></td>
+ </tr>
+ <tr>
+ <td colspan="2" class="acquisition number"><b>TOTAL</b></td>
+ <td class="acquisition number"><!-- TMPL_VAR NAME="grandtot" --></td>
</tr>
</table>
</div>
@@ -80,13 +74,17 @@
<tr>
<th class="acquisition">Basket</th>
<th class="acquisition">Title</th>
+ <th class="acquisition">Ordered</th>
+ <th class="acquisition">Received</th>
<th class="acquisition"></th>
</tr>
- <!-- TMPL_VAR NAME="countpending" -->
+ <!-- TMPL_VAR NAME="countpending" --> lines
<!-- TMPL_LOOP NAME="loop_orders" -->
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="title" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->&datereceived=<!-- TMPL_VAR name="datereceived"-->&catview=yes" class="button acquisition">Recieve</td>
</tr>
<!-- /TMPL_LOOP -->
More information about the Koha-cvs
mailing list