gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here. 

The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working
This commit is contained in:
tipaul 2005-06-07 12:56:36 +00:00
parent 55d7478d19
commit 2a822b1208
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Acquisition.pm
View File

@ -104,7 +104,7 @@ number of elements in C<@orders>.
sub getbasketcontent {
my ($basketno,$supplier,$orderby)=@_;
my $dbh = C4::Context->dbh;
my $query="Select *,biblio.title from aqorders,biblio,biblioitems
my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
where basketno='$basketno'
and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber

11
acqui/basket.pl
View File

@ -72,6 +72,8 @@ my $sub_total_est; # total of line totals
my $gist_est; # GST
my $grand_total_est; # $subttotal + $gist
my $qty_total;
my @books_loop;
for (my $i=0;$i<$count;$i++){
my $rrp=$results[$i]->{'listprice'};
@ -80,18 +82,15 @@ for (my $i=0;$i<$count;$i++){
$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
$sub_total+=$line_total;
$qty_total += $results[$i]->{'quantity'};
my %line;
if ($i % 2){
$line{highlight}=1;
} else {
$line{highlight}=0;
}
$line{ordernumber} = $results[$i]->{'ordernumber'};
$line{publishercode} = $results[$i]->{'publishercode'};
$line{isbn} = $results[$i]->{'isbn'};
$line{booksellerid} = $results[$i]->{'booksellerid'};
$line{basketno}=$basketno;
$line{title} = $results[$i]->{'title'};
$line{notes} = $results[$i]->{'notes'};
$line{author} = $results[$i]->{'author'};
$line{i} = $i;
$line{rrp} = $results[$i]->{'rrp'};
@ -101,6 +100,7 @@ for (my $i=0;$i<$count;$i++){
$line{line_total} = $line_total;
$line{biblionumber} = $results[$i]->{'biblionumber'};
$line{bookfundid} = $results[$i]->{'bookfundid'};
$line{odd} = $i %2;
push @books_loop, \%line;
}
my $prefgist =C4::Context->preference("gist");
@ -130,5 +130,6 @@ $template->param(basketno => $basketno,
gist_est => $gist_est,
grand_total_est =>$grand_total_est,
currency => $booksellers[0]->{'listprice'},
qty_total => $qty_total,
);
output_html_with_http_headers $query, $cookie, $template->output;

20
koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
View File

@ -44,7 +44,11 @@
<!-- /TMPL_IF -->
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
<!-- TMPL_IF name="odd" -->
<tr class="hilighted">
<!-- TMPL_ELSE -->
<tr>
<!-- /TMPL_IF -->
<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
<td><!-- TMPL_VAR NAME="publishercode" --></td>
<!-- TMPL_IF name="closedate" -->
@ -52,7 +56,7 @@
<b><!-- TMPL_VAR NAME="title" --></b><br/>
<!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
</p>
</td>
<!-- TMPL_ELSE -->
@ -61,14 +65,14 @@
<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
<!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
</p>
</td>
<!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="rrp" --></td>
<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td><!-- TMPL_VAR NAME="line_total" --></td>
<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
@ -103,7 +107,7 @@
<p><!-- TMPL_VAR NAME="grand_total" --></p>
</td>
<td class="acquisition">
<p>&nbsp;</p>
<p><!-- TMPL_VAR name="qty_total" --></p>
<p>&nbsp;</p>
<p>&nbsp;</p>
</td>