[Koha-cvs] CVS: koha/acqui acqui-home.pl,1.2,1.3 acquire.pl,1.15,1.16 addorder.pl,1.18,1.19 basket.pl,1.17,1.18 finishreceive.pl,1.14,1.15 newbasket2.pl,1.12,1.13 newbiblio.pl,1.17,1.18 order.pl,1.10,1.11 receive.pl,1.11,1.12 recieveorder.pl,1.7,1.8 supplier.pl,1.7,1.8 updatesupplier.pl,1.4,1.5
Paul POULAIN
tipaul at users.sourceforge.net
Tue Jul 13 14:53:03 CEST 2004
Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31124/acqui
Modified Files:
acqui-home.pl acquire.pl addorder.pl basket.pl
finishreceive.pl newbasket2.pl newbiblio.pl order.pl
receive.pl recieveorder.pl supplier.pl updatesupplier.pl
Log Message:
catalogue.pm deals only with acquisitions.
so, renaming it...
catalogue management is done in Biblio.pm package
Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acqui-home.pl 19 Mar 2003 21:02:24 -0000 1.2
--- acqui-home.pl 13 Jul 2004 12:53:00 -0000 1.3
***************
*** 7,12 ****
use C4::Interface::CGI::Output;
use C4::Database;
use HTML::Template;
! use C4::Catalogue;
my $query = new CGI;
--- 7,13 ----
use C4::Interface::CGI::Output;
use C4::Database;
+ use C4::Suggestions;
use HTML::Template;
! use C4::Acquisition;
my $query = new CGI;
***************
*** 52,55 ****
--- 53,59 ----
push @loop_currency, \%line;
}
+
+ # suggestions ?
+ my $suggestion = countsuggestion("ASKED");
$template->param(classlist => $classlist,
type => 'intranet',
***************
*** 57,60 ****
--- 61,65 ----
loop_currency => \@loop_currency,
total => sprintf("%.2f",$total),
+ suggestion => $suggestion,
totspent => sprintf("%.2f",$totspent),
totcomtd => sprintf("%.2f",$totcomtd),
Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** acquire.pl 22 Dec 2003 19:16:59 -0000 1.15
--- acquire.pl 13 Jul 2004 12:53:00 -0000 1.16
***************
*** 26,30 ****
use CGI;
use C4::Context;
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
--- 26,30 ----
use CGI;
use C4::Context;
! use C4::Acquisition;
use C4::Biblio;
use C4::Output;
Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** addorder.pl 2 Jul 2004 15:55:06 -0000 1.18
--- addorder.pl 13 Jul 2004 12:53:00 -0000 1.19
***************
*** 26,30 ****
use C4::Auth;
use C4::Output;
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
--- 26,30 ----
use C4::Auth;
use C4::Output;
! use C4::Acquisition;
use C4::Biblio;
use C4::Output;
Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** basket.pl 11 Feb 2004 08:40:11 -0000 1.17
--- basket.pl 13 Jul 2004 12:53:00 -0000 1.18
***************
*** 98,111 ****
$template->param(basket => $basket,
! authorisedby => $results[0]->{'authorisedby'},
! entrydate => format_date($results[0]->{'entrydate'}),
! id=> $results[0]->{'booksellerid'},
! name => $booksellers[0]->{'name'},
! books_loop => \@books_loop,
! count =>$count,
! sub_total => $sub_total,
! gist => $gist,
! grand_total =>$grand_total,
! currency => $booksellers[0]->{'listprice'},
! );
output_html_with_http_headers $query, $cookie, $template->output;
--- 98,111 ----
$template->param(basket => $basket,
! authorisedby => $results[0]->{'authorisedby'},
! entrydate => format_date($results[0]->{'entrydate'}),
! id=> $results[0]->{'booksellerid'},
! name => $booksellers[0]->{'name'},
! books_loop => \@books_loop,
! count =>$count,
! sub_total => $sub_total,
! gist => $gist,
! grand_total =>$grand_total,
! currency => $booksellers[0]->{'listprice'},
! );
output_html_with_http_headers $query, $cookie, $template->output;
Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** finishreceive.pl 18 Sep 2003 10:19:29 -0000 1.14
--- finishreceive.pl 13 Jul 2004 12:53:00 -0000 1.15
***************
*** 23,27 ****
use C4::Output;
! use C4::Catalogue;
use C4::Biblio;
use CGI;
--- 23,27 ----
use C4::Output;
! use C4::Acquisition;
use C4::Biblio;
use CGI;
Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** newbasket2.pl 16 Mar 2004 13:40:22 -0000 1.12
--- newbasket2.pl 13 Jul 2004 12:53:00 -0000 1.13
***************
*** 25,29 ****
use CGI;
use C4::Output;
! use C4::Catalogue;
use C4::Biblio;
use HTML::Template;
--- 25,29 ----
use CGI;
use C4::Output;
! use C4::Acquisition;
use C4::Biblio;
use HTML::Template;
Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** newbiblio.pl 2 Jul 2004 15:55:06 -0000 1.17
--- newbiblio.pl 13 Jul 2004 12:53:00 -0000 1.18
***************
*** 25,29 ****
use CGI;
use C4::Context;
! use C4::Catalogue;
use C4::Search;
use C4::Auth;
--- 25,29 ----
use CGI;
use C4::Context;
! use C4::Acquisition;
use C4::Search;
use C4::Auth;
Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** order.pl 11 Feb 2004 08:40:11 -0000 1.10
--- order.pl 13 Jul 2004 12:53:00 -0000 1.11
***************
*** 25,29 ****
use strict;
- use C4::Catalogue;
use C4::Auth;
use C4::Biblio;
--- 25,28 ----
***************
*** 33,37 ****
use C4::Database;
use HTML::Template;
! use C4::Catalogue;
use C4::Date;
--- 32,36 ----
use C4::Database;
use HTML::Template;
! use C4::Acquisition;
use C4::Date;
Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** receive.pl 8 Jul 2003 16:20:15 -0000 1.11
--- receive.pl 13 Jul 2004 12:53:00 -0000 1.12
***************
*** 25,29 ****
use C4::Auth;
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
--- 25,29 ----
use C4::Auth;
! use C4::Acquisition;
use C4::Biblio;
use C4::Output;
Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** recieveorder.pl 8 Jul 2003 16:20:15 -0000 1.7
--- recieveorder.pl 13 Jul 2004 12:53:00 -0000 1.8
***************
*** 30,34 ****
use C4::Database;
use HTML::Template;
! use C4::Catalogue;
my $input=new CGI;
--- 30,34 ----
use C4::Database;
use HTML::Template;
! use C4::Acquisition;
my $input=new CGI;
Index: supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** supplier.pl 30 May 2003 21:39:50 -0000 1.7
--- supplier.pl 13 Jul 2004 12:53:00 -0000 1.8
***************
*** 25,29 ****
use C4::Auth;
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
--- 25,29 ----
use C4::Auth;
! use C4::Acquisition;
use C4::Biblio;
use C4::Output;
***************
*** 32,36 ****
use C4::Database;
use HTML::Template;
- use C4::Catalogue;
use strict;
--- 32,35 ----
Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** updatesupplier.pl 14 Aug 2002 18:12:52 -0000 1.4
--- updatesupplier.pl 13 Jul 2004 12:53:00 -0000 1.5
***************
*** 22,26 ****
# Suite 330, Boston, MA 02111-1307 USA
! use C4::Catalogue;
use C4::Biblio;
use C4::Output;
--- 22,26 ----
# Suite 330, Boston, MA 02111-1307 USA
! use C4::Acquisition;
use C4::Biblio;
use C4::Output;
More information about the Koha-cvs
mailing list