[Koha-cvs] CVS: koha/acqui addorder.pl,1.17,1.18 newbiblio.pl,1.16,1.17

[Paul POULAIN]

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

Modified Files:
	addorder.pl newbiblio.pl 
Log Message:
Adding 2 new fields, called "sort1" and "sort2"
They can be used for sorting & statistics reasons by the library.

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** addorder.pl	11 Feb 2004 08:40:11 -0000	1.17
--- addorder.pl	2 Jul 2004 15:55:06 -0000	1.18
***************
*** 63,66 ****
--- 63,68 ----
  my $notes=$input->param('notes');
  my $bookfund=$input->param('bookfund');
+ my $sort1=$input->param('sort1');
+ my $sort2=$input->param('sort2');
  my $who=$loggedinuser;
  my $bibnum;
***************
*** 117,123 ****
  	}
  	if ($orderexists ne '') {
! 		modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice);
  	}else {
! 		neworder($bibnum,$title,$ordnum,$basketno,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice);
  	}
  } else {
--- 119,125 ----
  	}
  	if ($orderexists ne '') {
! 		modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2);
  	}else {
! 		neworder($bibnum,$title,$ordnum,$basketno,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2);
  	}
  } else {

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** newbiblio.pl	11 Feb 2004 08:40:11 -0000	1.16
--- newbiblio.pl	2 Jul 2004 15:55:06 -0000	1.17
***************
*** 149,153 ****
  						itemtype => $data->{'itemtype'},
  						discount => $booksellers[0]->{'discount'},
!       						listincgst => $booksellers[0]->{'listincgst'},
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
--- 149,153 ----
  						itemtype => $data->{'itemtype'},
  						discount => $booksellers[0]->{'discount'},
! 						listincgst => $booksellers[0]->{'listincgst'},
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
***************
*** 170,176 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
  						barcode => $data->{'barcode'},
  						publishercode => $data->{'publishercode'});
  
  output_html_with_http_headers $input, $cookie, $template->output;
- 
--- 170,177 ----
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
+ 						sort1 => $data->{'sort1'},
+ 						sort2 => $data->{'sort2'},
  						barcode => $data->{'barcode'},
  						publishercode => $data->{'publishercode'});
  
  output_html_with_http_headers $input, $cookie, $template->output;