[Koha-cvs] CVS: koha/acqui addorder.pl,1.16,1.17 basket.pl,1.16,1.17 newbiblio.pl,1.15,1.16 order.pl,1.9,1.10

[Paul POULAIN]

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui

Modified Files:
        addorder.pl basket.pl newbiblio.pl order.pl 
Log Message:
synch'ing 2.0.0 branch and head

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** addorder.pl 4 Sep 2003 17:29:50 -0000       1.16
--- addorder.pl 11 Feb 2004 08:40:11 -0000      1.17
***************
*** 49,53 ****
  my $title=$input->param('title');
  my $author=$input->param('author');
! my $copyright=$input->param('copyright');
  my $isbn=$input->param('ISBN');
  my $itemtype=$input->param('format');
--- 49,53 ----
  my $title=$input->param('title');
  my $author=$input->param('author');
! my $copyrightdate=$input->param('copyrightdate');
  my $isbn=$input->param('ISBN');
  my $itemtype=$input->param('format');
***************
*** 72,78 ****
  my $budget=$input->param('budget');
  my $cost=$input->param('cost');
! my$sub=$input->param('sub');
  my $invoice=$input->param('invoice');
! 
  if ($quantity ne '0'){
        #check to see if biblio exists
--- 72,78 ----
  my $budget=$input->param('budget');
  my $cost=$input->param('cost');
! my $sub=$input->param('sub');
  my $invoice=$input->param('invoice');
! my $publishercode = $input->param('publishercode');
  if ($quantity ne '0'){
        #check to see if biblio exists
***************
*** 81,90 ****
                $bibnum = &newbiblio({ title     => $title?$title:"",
                                                author    => $author?$author:"",
!                                               copyright => 
$copyright?$copyright:"",
                                                series => $series?$series:"",
                                                        });
                $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
                                                                itemtype     => 
$itemtype?$itemtype:"",
!                                                               isbn        => 
$isbn?$isbn:""
                                                                });
                        if ($title) {
--- 81,91 ----
                $bibnum = &newbiblio({ title     => $title?$title:"",
                                                author    => $author?$author:"",
!                                               copyrightdate => 
$copyrightdate?$copyrightdate:"",
                                                series => $series?$series:"",
                                                        });
                $bibitemnum = &newbiblioitem({ biblionumber => $bibnum,
                                                                itemtype     => 
$itemtype?$itemtype:"",
!                                                               isbn        => 
$isbn?$isbn:"",
!                                                               publishercode 
=> $publishercode?$publishercode:"",
                                                                });
                        if ($title) {
***************
*** 98,102 ****
                        $bibitemnum= &newbiblioitem({ biblionumber => $bibnum,
                                                                        
itemtype => $itemtype?$itemtype:"",
!                                                                       isbn => 
$isbn?$isbn:"" });
                }
                &modbiblio({
--- 99,110 ----
                        $bibitemnum= &newbiblioitem({ biblionumber => $bibnum,
                                                                        
itemtype => $itemtype?$itemtype:"",
!                                                                       isbn => 
$isbn?$isbn:"" ,
!                                                                       
publishercode => $publishercode?$publishercode:"",
!                                                                       });
!               } else {
!                       &modbibitem({biblioitemnumber => $bibitemnum,
!                                                       isbn            => 
$isbn,
!                                                       publishercode   => 
$publishercode,
!                       });
                }
                &modbiblio({
***************
*** 104,109 ****
                        title         => $title?$title:"",
                        author        => $author?$author:"",
!                       copyrightdate => $copyright?$copyright:"",
!                       series        => $series?$series:"" });
        }
        if ($orderexists ne '') {
--- 112,118 ----
                        title         => $title?$title:"",
                        author        => $author?$author:"",
!                       copyrightdate => $copyrightdate?$copyrightdate:"",
!                       series        => $series?$series:"" },
!                       );
        }
        if ($orderexists ne '') {

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** basket.pl   17 Sep 2003 13:33:37 -0000      1.16
--- basket.pl   11 Feb 2004 08:40:11 -0000      1.17
***************
*** 78,81 ****
--- 78,82 ----
        }
        $line{ordernumber} = $results[$i]->{'ordernumber'};
+       $line{publishercode} = $results[$i]->{'publishercode'};
        $line{isbn} = $results[$i]->{'isbn'};
        $line{booksellerid} = $results[$i]->{'booksellerid'};

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** newbiblio.pl        22 Dec 2003 19:16:59 -0000      1.15
--- newbiblio.pl        11 Feb 2004 08:40:11 -0000      1.16
***************
*** 170,174 ****
                                                ecost => $data->{'ecost'},
                                                notes => $data->{'notes'},
!                                               barcode => $data->{'barcode'},);
  
  output_html_with_http_headers $input, $cookie, $template->output;
--- 170,175 ----
                                                ecost => $data->{'ecost'},
                                                notes => $data->{'notes'},
!                                               barcode => $data->{'barcode'},
!                                               publishercode => 
$data->{'publishercode'});
  
  output_html_with_http_headers $input, $cookie, $template->output;

Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** order.pl    8 Jul 2003 16:20:15 -0000       1.9
--- order.pl    11 Feb 2004 08:40:11 -0000      1.10
***************
*** 64,67 ****
--- 64,68 ----
        $line{id} =$suppliers[$i]->{'id'};
        $line{name} = $suppliers[$i]->{'name'};
+       $line{active} = $suppliers[$i]->{'active'};
        $line{total} = $orders->[0]->{'count(*)'};
        $line{authorisedby} = $orders->[0]->{'authorisedby'};