[Koha-cvs] koha C4/Acquisition.pm koha-tmpl/intranet-tmpl/... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   06/09/22 15:50:01

Modified files:
        C4             : Acquisition.pm 
        koha-tmpl/intranet-tmpl/default/en/acqui: basket.tmpl 

Log message:
        show library address in basket. Usefull when printing the order list

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.21&r2=1.9.2.22
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.14&r2=1.15.2.15

Patches:
Index: C4/Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.21
retrieving revision 1.9.2.22
diff -u -b -r1.9.2.21 -r1.9.2.22
--- C4/Acquisition.pm   3 Aug 2006 13:11:37 -0000       1.9.2.21
+++ C4/Acquisition.pm   22 Sep 2006 15:50:01 -0000      1.9.2.22
@@ -796,8 +796,8 @@
                $query .= " and biblio.title like ".$dbh->quote("%".$title."%") 
if $title;
                $query .= " and biblio.author like 
".$dbh->quote("%".$author."%") if $author;
                $query .= " and name like ".$dbh->quote("%".$name."%") if $name;
-               $query .= " and creationdate >" .$dbh->quote($from_placed_on) 
if $from_placed_on;
-               $query .= " and creationdate<".$dbh->quote($to_placed_on) if 
$to_placed_on;
+               $query .= " and creationdate >=" .$dbh->quote($from_placed_on) 
if $from_placed_on;
+               $query .= " and creationdate=<".$dbh->quote($to_placed_on) if 
$to_placed_on;
                if (C4::Context->preference("IndependantBranches")) {
                        my $userenv = C4::Context->userenv;
                        if (($userenv) &&($userenv->{flags} != 1)){

Index: koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.14
retrieving revision 1.15.2.15
diff -u -b -r1.15.2.14 -r1.15.2.15
--- koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl        13 Sep 2006 
19:28:23 -0000      1.15.2.14
+++ koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl        22 Sep 2006 
15:50:01 -0000      1.15.2.15
@@ -24,6 +24,12 @@
                <p><!-- TMPL_VAR name="address3" --></p>
                <p><!-- TMPL_VAR name="address4" --></p>
        </div>
+       <div id="bloc25" style="float:right">
+          <p><!-- TMPL_VAR name="branchname" --></p>
+          <p><!-- TMPL_VAR name="branchaddress1" --></p>
+          <p><!-- TMPL_VAR name="branchaddress2" --></p>
+          <p><!-- TMPL_VAR name="branchaddress3" --></p>
+    </div>
        <div id="bloc100">
        <h2 class="acquisition">Order</h2>
        <!-- TMPL_IF name="books_loop" -->
@@ -38,8 +44,10 @@
                                <th class="acquisition">Total</th>
                                <th class="acquisition doNotPrint">Fund <a 
href="basket.pl?basket=<!-- TMPL_VAR name="basketno" 
-->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
                                <!-- TMPL_IF name="active" -->
+                             <!-- TMPL_UNLESS name="closedate" -->
                                <th class="acquisition doNotPrint">Remove</th>
                                <th class="acquisition doNotPrint">Edit</th>
+                    <!-- /TMPL_UNLESS -->
                                <!-- /TMPL_IF -->
                        </tr>
                        <!-- TMPL_LOOP NAME="books_loop" -->
@@ -71,6 +79,7 @@
                                        <td class="number"><p><!-- TMPL_VAR 
NAME="line_total" --></p></td>
                                        <td class="doNotPrint"><p><!-- TMPL_VAR 
NAME="bookfundid" --></p></td>
                                        <!-- TMPL_IF name="active" -->
+                             <!-- TMPL_UNLESS name="closedate" -->
                                                <td class="doNotPrint">
                                                        <a 
href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- 
TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR 
NAME="biblionumber" -->">
                                                                <img 
src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" 
title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
@@ -81,6 +90,7 @@
                                                                <img 
src="/intranet-tmpl/default/images/fileopen.png" alt="Edit" title="Remove from 
basket" width="32" hspace="0" vspace="0" border="0">
                                                        </a>
                                                </td>
+                        <!-- /TMPL_UNLESS -->
                                        <!-- /TMPL_IF -->
                                </tr>
                        <!-- /TMPL_LOOP -->