[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/acqui acquire.pl,1.3,1.4 addorder.pl,1.8,1.9 basket
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/acqui acquire.pl,1.3,1.4 addorder.pl,1.8,1.9 basket.pl,1.3,1.4 finishreceive.pl,1.5,1.6 modorders.pl,1.2,1.3 newbasket.pl,1.3,1.4 newbasket2.pl,1.3,1.4 newbiblio.pl,1.5,1.6 order.pl,1.2,1.3 recieveorder.pl,1.2,1.3 receive.pl,1.3,1.4 supplier.pl,1.2,1.3 updatesupplier.pl,1.2,1.3 |
|
Date: |
Thu, 04 Jul 2002 08:53:04 -0700 |
Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv19188/acqui
Modified Files:
acquire.pl addorder.pl basket.pl finishreceive.pl modorders.pl
newbasket.pl newbasket2.pl newbiblio.pl order.pl
recieveorder.pl receive.pl supplier.pl updatesupplier.pl
Log Message:
Long is the road to MARC..
Not related to MARC :
* removed HLT- empty link when no basket for a supplier (should be useful to
copy this into rel-1-2 i think)
* fixed some "use of uninitialized value"
related to MARC
* changed use Acquisition to use Catalogue, new package for MARC management
For instance, nothing is done to MARC DB, but structure is modified (see
Biblio.pm for details), and everything seems to work : it's still possible to
use acqui, and it fills old-DB pretty good.
WARNING : if you work on main trunk, please note Acquisition.pm is NO MORE USED
in /acqui/ system. Every sub in Acquisition.pm has been moved to Biblio.pm or
Catalogue.pm.
Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acquire.pl 20 Jun 2002 17:45:26 -0000 1.3
--- acquire.pl 4 Jul 2002 15:53:02 -0000 1.4
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** addorder.pl 24 Jun 2002 14:16:36 -0000 1.8
--- addorder.pl 4 Jul 2002 15:53:02 -0000 1.9
***************
*** 7,11 ****
use CGI;
use C4::Output;
! use C4::Acquisitions;
#use Date::Manip;
--- 7,12 ----
use CGI;
use C4::Output;
! use C4::Catalogue;
! use C4::Biblio;
#use Date::Manip;
Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.pl 20 Jun 2002 17:33:11 -0000 1.3
--- basket.pl 4 Jul 2002 15:53:02 -0000 1.4
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** finishreceive.pl 15 May 2002 02:22:24 -0000 1.5
--- finishreceive.pl 4 Jul 2002 15:53:02 -0000 1.6
***************
*** 5,9 ****
use C4::Output;
! use C4::Acquisitions;
use CGI;
use C4::Search;
--- 5,10 ----
use C4::Output;
! use C4::Catalogue;
! use C4::Biblio;
use CGI;
use C4::Search;
Index: modorders.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/modorders.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** modorders.pl 20 Jun 2002 17:33:12 -0000 1.2
--- modorders.pl 4 Jul 2002 15:53:02 -0000 1.3
***************
*** 7,11 ****
use CGI;
use C4::Output;
! use C4::Acquisitions;
use C4::Biblio;
#use Date::Manip;
--- 7,11 ----
use CGI;
use C4::Output;
! use C4::Catalogue;
use C4::Biblio;
#use Date::Manip;
Index: newbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** newbasket.pl 20 Jun 2002 17:33:12 -0000 1.3
--- newbasket.pl 4 Jul 2002 15:53:02 -0000 1.4
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** newbasket2.pl 4 Jul 2002 10:42:31 -0000 1.3
--- newbasket2.pl 4 Jul 2002 15:53:02 -0000 1.4
***************
*** 7,11 ****
use CGI;
use C4::Output;
! use C4::Acquisitions;
my $env;
--- 7,12 ----
use CGI;
use C4::Output;
! use C4::Catalogue;
! use C4::Biblio;
my $env;
***************
*** 143,147 ****
my $url="/cgi-bin/koha/search.pl?author=$word&type=$type";
$result->{'author'}=mklink($url,$result->{'author'});
! my
($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit)=itemcount($env,$result->{'biblionumber'},$type);
$itemcount=$count;
if ($nacount > 0){
--- 144,148 ----
my $url="/cgi-bin/koha/search.pl?author=$word&type=$type";
$result->{'author'}=mklink($url,$result->{'author'});
! my
($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit)=C4::Search::itemcount($env,$result->{'biblionumber'},$type);
$itemcount=$count;
if ($nacount > 0){
Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** newbiblio.pl 21 Jun 2002 13:15:36 -0000 1.5
--- newbiblio.pl 4 Jul 2002 15:53:02 -0000 1.6
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** order.pl 20 Jun 2002 17:33:12 -0000 1.2
--- order.pl 4 Jul 2002 15:53:02 -0000 1.3
***************
*** 4,8 ****
#written by address@hidden 23/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 23/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
***************
*** 35,70 ****
my $toggle=0;
for (my $i=0; $i<$count; $i++) {
! if ($toggle==0){
! $colour='#ffffcc';
! $toggle=1;
! } else {
! $colour='white';
! $toggle=0;
! }
! my ($ordcount,$orders)=getorders($suppliers[$i]->{'id'});
# print $ordcount;
! print <<printend
! <tr valign=top bgcolor=$colour>
! <td><a href="newbasket.pl?id=$suppliers[$i]->{'id'}"><img
src="/images/new-basket-short.gif" alt="New Basket" width=77 height=32 border=0
></a>
! <a href="recieveorder.pl?id=$suppliers[$i]->{'id'}"><img
src="/images/receive-order-short.gif" alt="Receive Order" width=77 height=32
border=0 ></a></td>
! <td><a
href="supplier.pl?id=$suppliers[$i]->{'id'}">$suppliers[$i]->{'name'}</a></td>
! <td><a
href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[0]->{'basketno'}">HLT-$orders->[0]->{'basketno'}</a></td>
! <td>$orders->[0]->{'count(*)'}</td>
! <td>$orders->[0]->{'authorisedby'}</td>
! <td>$orders->[0]->{'entrydate'}</td></tr>
printend
;
! for (my $i2=1;$i2<$ordcount;$i2++){
! print <<printend
! <tr valign=top bgcolor=$colour>
! <td> </td>
! <td> </td>
! <td><a
href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[$i2]->{'basketno'}">HLT-$orders->[$i2]->{'basketno'}</a></td>
! <td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'}
</td>
! <td>$orders->[$i2]->{'entrydate'}</td></tr>
!
printend
;
! }
}
--- 35,97 ----
my $toggle=0;
for (my $i=0; $i<$count; $i++) {
! if ($toggle==0){
! $colour='#ffffcc';
! $toggle=1;
! } else {
! $colour='white';
! $toggle=0;
! }
! my ($ordcount,$orders)=getorders($suppliers[$i]->{'id'});
# print $ordcount;
! if ($orders->[0]->{'basketno'}>0) {
! print <<printend
! <tr valign=top bgcolor=$colour>
! <td><a href="newbasket.pl?id=$suppliers[$i]->{'id'}"><img
src="/images/new-basket-short.gif" alt="New Basket" width=77 height=32 border=0
></a>
! <a href="recieveorder.pl?id=$suppliers[$i]->{'id'}"><img
src="/images/receive-order-short.gif" alt="Receive Order" width=77 height=32
border=0 ></a></td>
! <td><a
href="supplier.pl?id=$suppliers[$i]->{'id'}">$suppliers[$i]->{'name'}</a></td>
! <td><a
href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[0]->{'basketno'}">HLT-$orders->[0]->{'basketno'}</a></td>
! <td>$orders->[0]->{'count(*)'}</td>
! <td>$orders->[0]->{'authorisedby'}</td>
! <td>$orders->[0]->{'entrydate'}</td></tr>
printend
;
! } else {
! print <<printend
! <tr valign=top bgcolor=$colour>
! <td><a href="newbasket.pl?id=$suppliers[$i]->{'id'}"><img
src="/images/new-basket-short.gif" alt="New Basket" width=77 height=32 border=0
></a>
! <a href="recieveorder.pl?id=$suppliers[$i]->{'id'}"><img
src="/images/receive-order-short.gif" alt="Receive Order" width=77 height=32
border=0 ></a></td>
! <td><a
href="supplier.pl?id=$suppliers[$i]->{'id'}">$suppliers[$i]->{'name'}</a></td>
! <td> </a></td>
! <td>$orders->[0]->{'count(*)'}</td>
! <td>$orders->[0]->{'authorisedby'}</td>
! <td>$orders->[0]->{'entrydate'}</td></tr>
printend
;
! }
! for (my $i2=1;$i2<$ordcount;$i2++){
! if ($orders->[$i2]->{'basketno'}>=1) {
! print <<printend
! <tr valign=top bgcolor=$colour>
! <td> </td>
! <td> </td>
! <td><a
href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[$i2]->{'basketno'}">HLT-$orders->[$i2]->{'basketno'}</a></td>
!
<td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'}
</td>
! <td>$orders->[$i2]->{'entrydate'}</td></tr>
!
! printend
! ;
! } else {
! print <<printend
! <tr valign=top bgcolor=$colour>
! <td> </td>
! <td> </td>
! <td> </td>
!
<td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'}
</td>
! <td>$orders->[$i2]->{'entrydate'}</td></tr>
!
! printend
! ;
! }
! }
}
Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** recieveorder.pl 20 Jun 2002 17:33:12 -0000 1.2
--- recieveorder.pl 4 Jul 2002 15:53:02 -0000 1.3
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** receive.pl 20 Jun 2002 17:45:27 -0000 1.3
--- receive.pl 4 Jul 2002 15:53:02 -0000 1.4
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** supplier.pl 20 Jun 2002 17:33:13 -0000 1.2
--- supplier.pl 4 Jul 2002 15:53:02 -0000 1.3
***************
*** 4,8 ****
#written by address@hidden 24/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 24/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** updatesupplier.pl 20 Jun 2002 17:33:13 -0000 1.2
--- updatesupplier.pl 4 Jul 2002 15:53:02 -0000 1.3
***************
*** 4,8 ****
#written by address@hidden 23/2/2000
! use C4::Acquisitions;
use C4::Biblio;
use C4::Output;
--- 4,8 ----
#written by address@hidden 23/2/2000
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/acqui acquire.pl,1.3,1.4 addorder.pl,1.8,1.9 basket.pl,1.3,1.4 finishreceive.pl,1.5,1.6 modorders.pl,1.2,1.3 newbasket.pl,1.3,1.4 newbasket2.pl,1.3,1.4 newbiblio.pl,1.5,1.6 order.pl,1.2,1.3 recieveorder.pl,1.2,1.3 receive.pl,1.3,1.4 supplier.pl,1.2,1.3 updatesupplier.pl,1.2,1.3,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/C4 Catalogue.pm,1.19,1.20 Biblio.pm,1.2,1.3
- Next by Date:
[Koha-cvs] CVS: koha/updater updatedatabase,1.4.2.14,1.4.2.15
- Previous by thread:
[Koha-cvs] CVS: koha/C4 Catalogue.pm,1.19,1.20 Biblio.pm,1.2,1.3
- Next by thread:
[Koha-cvs] CVS: koha/updater updatedatabase,1.4.2.14,1.4.2.15
- Index(es):