[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha circ/branchtransfers.pl circ/returns.pl ko... [rel_3_0]
From: |
Antoine Farnault |
Subject: |
[Koha-cvs] koha circ/branchtransfers.pl circ/returns.pl ko... [rel_3_0] |
Date: |
Tue, 17 Oct 2006 09:53:19 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/10/17 09:53:19
Modified files:
circ : branchtransfers.pl returns.pl
koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl
koha-tmpl/intranet-tmpl/prog/en/circ: branchtransfers.tmpl
returns.tmpl
Log message:
ccode integration.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.24.2.1&r2=1.24.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.1&r2=1.43.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.4.2.1&r2=1.4.2.2
Patches:
Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -b -r1.24.2.1 -r1.24.2.2
--- circ/branchtransfers.pl 30 Aug 2006 16:38:51 -0000 1.24.2.1
+++ circ/branchtransfers.pl 17 Oct 2006 09:53:19 -0000 1.24.2.2
@@ -137,6 +137,7 @@
$item{'title'}=$iteminformation->{'title'};
$item{'author'}=$iteminformation->{'author'};
$item{'itemtype'}=$iteminformation->{'itemtype'};
+ $item{'ccode'}=$iteminformation->{'ccode'};
$item{'frbrname'}=$branches->{$frbranchcd}->{'branchname'};
$item{'tobrname'}=$branches->{$tobranchcd}->{'branchname'};
}
@@ -173,6 +174,7 @@
$item{'title'}=$iteminformation->{'title'};
$item{'author'}=$iteminformation->{'author'};
$item{'itemtype'}=$iteminformation->{'itemtype'};
+ $item{'ccode'}=$iteminformation->{'ccode'};
$item{'frbrname'}=$branches->{$frbcd}->{'branchname'};
$item{'tobrname'}=$branches->{$tobcd}->{'branchname'};
##########
Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -b -r1.43.2.1 -r1.43.2.2
--- circ/returns.pl 30 Aug 2006 16:38:51 -0000 1.43.2.1
+++ circ/returns.pl 17 Oct 2006 09:53:19 -0000 1.43.2.2
@@ -26,7 +26,7 @@
use strict;
use CGI;
use C4::Circulation::Circ2;
-use C4::Date;
+#use C4::Date;
use C4::Search;
use C4::Output;
use C4::Print;
@@ -274,6 +274,7 @@
itemauthor => $iteminfo->{'author'},
itembarcode => $iteminfo->{'barcode'},
itemtype => $iteminfo->{'itemtype'},
+ ccode => $iteminfo->{'ccode'},
itembiblionumber => $iteminfo->{'biblionumber'}
);
@@ -303,6 +304,7 @@
itemauthor => $iteminfo->{'author'},
itembarcode => $iteminfo->{'barcode'},
itemtype => $iteminfo->{'itemtype'},
+ ccode => $iteminfo->{'ccode'},
itembiblionumber => $iteminfo->{'biblionumber'},
borsurname => $borr->{'surname'},
bortitle => $borr->{'title'},
@@ -493,6 +495,7 @@
$ri{itemtitle} = $iteminformation->{'title'};
$ri{itemauthor} = $iteminformation->{'author'};
$ri{itemtype} = $iteminformation->{'itemtype'};
+ $ri{ccode} = $iteminformation->{'ccode'};
$ri{barcode} = $barcode;
}
else {
Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl 9 Oct 2006
16:22:01 -0000 1.1.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl 17 Oct 2006
09:53:19 -0000 1.1.2.2
@@ -129,7 +129,7 @@
<!-- TMPL_IF NAME="itemtypeloop" -->
<fieldset><legend>Collection Code Limits: </legend>
<p><select name="limit">
- <option value="">All Collection Codes</option>
+ <option value="">All Item Types</option>
<!-- TMPL_LOOP NAME="itemtypeloop" -->
<option value="collection-code:<!-- TMPL_VAR
NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
<!-- /TMPL_LOOP -->
@@ -137,7 +137,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="itypeloop" -->
<select name="limit">
- <option value="">All Item Types</option>
+ <option value="">All Collection Codes</option>
<!-- TMPL_LOOP NAME="itypeloop" -->
<option value="collection-code:<!-- TMPL_VAR
NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
<!-- /TMPL_LOOP -->
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 19 Sep 2006
22:30:37 -0000 1.4.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl 17 Oct 2006
09:53:19 -0000 1.4.2.2
@@ -125,7 +125,7 @@
<a href="/cgi-bin/koha/catalogue/detail.pl?bib=<!--
TMPL_VAR Name="biblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode"
--></a></td>
<td><!-- TMPL_VAR Name="title" --></td>
<td><!-- TMPL_VAR Name="author" --></td>
- <td><!-- TMPL_VAR Name="itemtype" --></td>
+ <td><!-- TMPL_VAR Name="ccode" --></td>
<td><!-- TMPL_VAR Name="frbrname" --></td>
<td><!-- TMPL_VAR Name="tobrname" --></td>
</tr>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl 19 Sep 2006 22:30:37
-0000 1.4.2.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl 17 Oct 2006 09:53:19
-0000 1.4.2.2
@@ -151,7 +151,7 @@
<a href="/cgi-bin/koha/catalogue/detail.pl?bib=<!--
TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode"
--></a></td>
<td><!-- TMPL_VAR Name="itemtitle" --></td>
<td><!-- TMPL_VAR Name="itemauthor" --></td>
- <td><!-- TMPL_VAR Name="itemtype" --></td>
+ <td><!-- TMPL_VAR Name="ccode" --></td>
<td>
<!-- TMPL_IF Name="duedate" -->Yes, duedate
<a
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum"
-->">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha circ/branchtransfers.pl circ/returns.pl ko... [rel_3_0],
Antoine Farnault <=