From kyle.m.hall at gmail.com  Fri Feb  1 17:56:04 2008
From: kyle.m.hall at gmail.com (Kyle Hall)
Date: Fri, 01 Feb 2008 16:56:04 +0000
Subject: [Koha-cvs] koha/circ circulation.pl [dev_week]
Message-ID: <E1JKzBM-0007FK-Qz@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	08/02/01 16:56:04

Modified files:
	circ           : circulation.pl 

Log message:
	Issueing rules were not working on a per branch basis, all rules were being pulled from the first branch, alphabetically.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.81.2.14.2.24&r2=1.81.2.14.2.25

Patches:
Index: circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.14.2.24
retrieving revision 1.81.2.14.2.25
diff -u -b -r1.81.2.14.2.24 -r1.81.2.14.2.25
--- circulation.pl	1 Nov 2007 13:43:26 -0000	1.81.2.14.2.24
+++ circulation.pl	1 Feb 2008 16:56:04 -0000	1.81.2.14.2.25
@@ -332,10 +332,10 @@
 my $issueqty_sth = $dbh->prepare("
 SELECT itemtypes.description AS description,issuingrules.itemtype,maxissueqty                                                           FROM issuingrules
   LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype)
-  WHERE categorycode=?
+  WHERE categorycode=? AND branchcode=?
 ");
 my @issued_itemtypes_count;
-$issueqty_sth->execute("*");
+$issueqty_sth->execute("*", $branch);
 while (my $data = $issueqty_sth->fetchrow_hashref()) {
     # subtract how many of each this borrower has
 	$data->{'count'} = $issued_itemtypes_count->{$data->{'description'}};




From szrj1m at yahoo.com  Mon Feb  4 01:51:01 2008
From: szrj1m at yahoo.com (Mason James)
Date: Mon, 04 Feb 2008 00:51:01 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/includes la...
	[dev_week]
Message-ID: <E1JLpY5-0002Go-92@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	08/02/04 00:51:01

Added files:
	koha-tmpl/intranet-tmpl/npl/en/includes: 
	                                         label-active-templates.inc 

Log message:
	missed add

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/label-active-templates.inc?cvsroot=koha&only_with_tag=dev_week&rev=1.1.4.2

Patches:
Index: label-active-templates.inc
===================================================================
RCS file: label-active-templates.inc
diff -N label-active-templates.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ label-active-templates.inc	4 Feb 2008 00:51:00 -0000	1.1.4.2
@@ -0,0 +1,8 @@
+
+<div class="details">
+<table>
+<tr><th>Layout:</th><td><!-- TMPL_VAR NAME="active_layout_name" --> </td></tr>
+<tr><th>template: </th><td><!-- TMPL_VAR NAME="active_template_name" --> </td></tr>
+<tr><th>Batch: </th><td><!-- TMPL_VAR NAME="batch_id" --> </td></tr>
+</table>
+</div>




From szrj1m at yahoo.com  Mon Feb  4 02:06:29 2008
From: szrj1m at yahoo.com (Mason James)
Date: Mon, 04 Feb 2008 01:06:29 +0000
Subject: [Koha-cvs] koha/C4/Circulation Circ2.pm [dev_week]
Message-ID: <E1JLpn3-00039M-Sg@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	08/02/04 01:06:29

Modified files:
	C4/Circulation : Circ2.pm 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.87.2.14.2.35&r2=1.87.2.14.2.36

Patches:
Index: Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Attic/Circ2.pm,v
retrieving revision 1.87.2.14.2.35
retrieving revision 1.87.2.14.2.36
diff -u -b -r1.87.2.14.2.35 -r1.87.2.14.2.36
--- Circ2.pm	19 Nov 2007 14:46:24 -0000	1.87.2.14.2.35
+++ Circ2.pm	4 Feb 2008 01:06:29 -0000	1.87.2.14.2.36
@@ -3,7 +3,7 @@
 
 package C4::Circulation::Circ2;
 
-# $Id: Circ2.pm,v 1.87.2.14.2.35 2007/11/19 14:46:24 kylemhall Exp $
+# $Id: Circ2.pm,v 1.87.2.14.2.36 2008/02/04 01:06:29 sushi Exp $
 
 #package to deal with Returns
 #written 3/11/99 by olwen at katipo.co.nz
@@ -75,7 +75,7 @@
 @EXPORT = qw(&getpatroninformation
 	&currentissues &getissues &getiteminformation &renewstatus &renewbook
 	&canbookbeissued &issuebook &returnbook &find_reserves &transferbook &decode
-	&calc_charges &listitemsforinventory &itemseen &fixdate, &getIssuingRule);
+	&calc_charges &listitemsforinventory &itemseen &fixdate  &getIssuingRule);
 
 # &getbranches &getprinters &getbranch &getprinter => moved to C4::Koha.pm
 
@@ -2089,6 +2089,7 @@
         return $result;
     }
     return;
+}
 
 1;
 __END__




From szrj1m at yahoo.com  Mon Feb  4 02:07:08 2008
From: szrj1m at yahoo.com (Mason James)
Date: Mon, 04 Feb 2008 01:07:08 +0000
Subject: [Koha-cvs] koha/C4 Biblio.pm [dev_week]
Message-ID: <E1JLpng-0003Cp-Jl@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	08/02/04 01:07:08

Modified files:
	C4             : Biblio.pm 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.115.2.51.2.47&r2=1.115.2.51.2.48

Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.51.2.47
retrieving revision 1.115.2.51.2.48
diff -u -b -r1.115.2.51.2.47 -r1.115.2.51.2.48
--- Biblio.pm	21 Nov 2007 15:56:48 -0000	1.115.2.51.2.47
+++ Biblio.pm	4 Feb 2008 01:07:07 -0000	1.115.2.51.2.48
@@ -2084,6 +2084,11 @@
 
 sub _koha_modify_item {
     my ( $dbh, $item, $op ) = @_;
+
+
+### $item
+
+
     $item->{'itemnum'} = $item->{'itemnumber'} unless $item->{'itemnum'};
 
 	# if all we're doing is setting statuses, just update those and get out
@@ -2103,12 +2108,14 @@
     my $query = "UPDATE items SET
 barcode=?,itemnotes=?,itemcallnumber=?,notforloan=?,location=?,multivolumepart=?,multivolume=?,stack=?,wthdrawn=?,holdingbranch=?,homebranch=?,cutterextra=?, onloan=?, binding=?,price=?,replacementprice=?";
 
+### $item
+
     my @bind = (
         $item->{'barcode'},			$item->{'itemnotes'},
         $item->{'itemcallnumber'},	$item->{'notforloan'},
         $item->{'location'},		$item->{'multivolumepart'},
 		$item->{'multivolume'},		$item->{'stack'},
-		$item->{'wthdrawn'},$item->{'holdingbranch'},$item->{'homebranch'},$cutterextra,$item->{'onloan'},$item->{'binding'},$item->{'price'},$item{'replacementprice'}
+		$item->{'wthdrawn'},$item->{'holdingbranch'},$item->{'homebranch'},$cutterextra,$item->{'onloan'},$item->{'binding'},$item->{'price'},$item->{'replacementprice'}
     );
     if ( $item->{'itemlost'} ne '' | '0' ) {
         $query = "update items set barcode=?,itemnotes=?,homebranch=?,
@@ -2132,6 +2139,9 @@
 			push @bind, $item->{holdingbranch};
 		}
     }
+
+### $item
+
 	$query.=" where itemnumber=?";
 	push @bind,$item->{'itemnum'};
 	if ( $item->{'replacement'} ne '' ) {
@@ -3158,8 +3168,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.115.2.51.2.47 2007/11/21 15:56:48 clm Exp $
+# $Id: Biblio.pm,v 1.115.2.51.2.48 2008/02/04 01:07:07 sushi Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.115.2.51.2.48  2008/02/04 01:07:07  sushi
+# typo
+#
 # Revision 1.115.2.51.2.47  2007/11/21 15:56:48  clm
 # One further tweak of yesterday's fix.
 #




From szrj1m at yahoo.com  Mon Feb  4 02:28:18 2008
From: szrj1m at yahoo.com (Mason James)
Date: Mon, 04 Feb 2008 01:28:18 +0000
Subject: [Koha-cvs] koha/C4 Labels.pm [dev_week]
Message-ID: <E1JLq8A-0005Wh-8x@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	08/02/04 01:28:18

Modified files:
	C4             : Labels.pm 

Log message:
	$justify changed to $text_justify

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Labels.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.3.4.59&r2=1.3.4.60

Patches:
Index: Labels.pm
===================================================================
RCS file: /sources/koha/koha/C4/Labels.pm,v
retrieving revision 1.3.4.59
retrieving revision 1.3.4.60
diff -u -b -r1.3.4.59 -r1.3.4.60
--- Labels.pm	30 Jan 2008 23:37:33 -0000	1.3.4.59
+++ Labels.pm	4 Feb 2008 01:28:17 -0000	1.3.4.60
@@ -665,7 +665,7 @@
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author, 
         $ccode,       $tmpl_id,     $printingtype, $guidebox,  
-        $startlabel,  $callnum_split, $justify,   $layoutname
+        $startlabel,  $callnum_split, $text_justify,   $layoutname
     ) = @_;
 
 ### @_ 
@@ -681,7 +681,7 @@
                 issn, itemtype, barcode,   dewey, 
                 class, subclass, itemcallnumber, author, ccode,
                 printingtype,    guidebox, startlabel, 
-                callnum_split, justify,  layoutname, active )
+                callnum_split, text_justify,  layoutname, active )
                values ( ?, ?, ?, ?, ?, ?, ?, ?,  ?, ? ,?, ?,
                         ?, ?,?,?,?,?, ?, 1 )";
     my $sth2 = $dbh->prepare($query2);
@@ -689,7 +689,7 @@
             $barcodetype, $title, $subtitle, $isbn,
             $issn,        $itemtype, $bcn,   $dcn, 
             $classif,     $subclass, $itemcallnumber, $author, $ccode,
-            $printingtype,  $guidebox, $startlabel,    $callnum_split,               $justify, $layoutname
+            $printingtype,  $guidebox, $startlabel,    $callnum_split,               $text_justify, $layoutname
             );
     $sth2->finish;
 
@@ -703,7 +703,7 @@
         $issn,        $itemtype,   $bcn,            $dcn,
         $classif,     $subclass,   $itemcallnumber, $author,
         $ccode,       $tmpl_id,    $printingtype,   $guidebox,
-        $startlabel,  $callnum_split, $justify , $layoutname, $layout_id
+        $startlabel,  $callnum_split, $text_justify , $layoutname, $layout_id
     ) = @_;
 
 ### @_;
@@ -724,7 +724,7 @@
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author,
         $ccode,       $printingtype, $guidebox,       $startlabel,
-$callnum_split,  $justify,   $layoutname,  $layout_id
+$callnum_split,  $text_justify,   $layoutname,  $layout_id
     );
     $sth2->finish;
 
@@ -817,7 +817,7 @@
     my (
         $x_pos,        $y_pos,    $label_width,
         $label_height, $fontsize, $startrow,
-        $gutter,       $justify,  @fields,
+        $gutter,       $text_justify,  @fields,
     ) = @_;
 ### @_
 
@@ -866,7 +866,7 @@
         # then loop for each string line
         foreach my $str (@strings) {
 
-            if ( $justify eq 'R' ) {
+            if ( $text_justify eq 'R' ) {
                 my $strwidth = prStrWidth( $str, 'C', $fontsize );
 #### $strwidth
                 $hPos = $x_pos + $label_width - ( $gutter + $strwidth );




From szrj1m at yahoo.com  Mon Feb  4 02:28:32 2008
From: szrj1m at yahoo.com (Mason James)
Date: Mon, 04 Feb 2008 01:28:32 +0000
Subject: [Koha-cvs] koha/barcodes label-manager.pl [dev_week]
Message-ID: <E1JLq8O-0005XQ-K1@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	08/02/04 01:28:32

Modified files:
	barcodes       : label-manager.pl 

Log message:
	 $justify changed to $text_justify

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-manager.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.14&r2=1.1.2.1.2.15

Patches:
Index: label-manager.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-manager.pl,v
retrieving revision 1.1.2.1.2.14
retrieving revision 1.1.2.1.2.15
diff -u -b -r1.1.2.1.2.14 -r1.1.2.1.2.15
--- label-manager.pl	22 Oct 2007 04:35:18 -0000	1.1.2.1.2.14
+++ label-manager.pl	4 Feb 2008 01:28:32 -0000	1.1.2.1.2.15
@@ -43,7 +43,7 @@
 my $guidebox       = $query->param('guidebox');
 my $fontsize       = $query->param('fontsize');
 my $callnum_split  = $query->param('callnum_split');
-my $justify  = $query->param('text_justify');
+my $text_justify  = $query->param('text_justify');
 
 my @itemnumber     = $query->param('itemnumber');
 
@@ -83,18 +83,17 @@
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author, 
         $ccode,       $tmpl_id,     $printingtype, $guidebox,  
-        $startlabel,  $callnum_split,  $justify,  $layoutname
+        $startlabel,  $callnum_split,  $text_justify,  $layoutname
     ) = @_;
 =cut
 
 
-### $justify
     add_layout(
         $barcodetype, $title,        $subtitle,       $isbn,
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author, 
         $ccode,       $tmpl_id,     $printingtype,    $guidebox, 
-        $startlabel,  $callnum_split, $justify,  $layoutname
+        $startlabel,  $callnum_split, $text_justify,  $layoutname
     );
     print $query->redirect("../label-home.pl");
     exit;
@@ -108,7 +107,7 @@
         $issn,        $itemtype,     $bcn,            $dcn,
         $classif,     $subclass,     $itemcallnumber, $author, $ccode,
         $tmpl_id,     $printingtype, $guidebox,       $startlabel,
-        $callnum_split, $justify ,    $layoutname,  $layout_id
+        $callnum_split, $text_justify ,    $layoutname,  $layout_id
     );
 
 ### $layoutname




From szrj1m at yahoo.com  Mon Feb  4 02:48:35 2008
From: szrj1m at yahoo.com (Mason James)
Date: Mon, 04 Feb 2008 01:48:35 +0000
Subject: [Koha-cvs] koha/installer kohastructure.sql
Message-ID: <E1JLqRn-0007aU-NH@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Mason James <sushi>	08/02/04 01:48:35

Modified files:
	installer      : kohastructure.sql 

Log message:
	updating labels tables

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/installer/kohastructure.sql?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: kohastructure.sql
===================================================================
RCS file: /sources/koha/koha/installer/kohastructure.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- kohastructure.sql	18 Jul 2007 20:15:26 -0000	1.9
+++ kohastructure.sql	4 Feb 2008 01:48:35 -0000	1.10
@@ -1009,6 +1009,7 @@
 DROP TABLE IF EXISTS `labels`;
 CREATE TABLE `labels` (
   `labelid` int(11) NOT NULL auto_increment,
+  `batch_id` varchar(10) NOT NULL default '1',
   `itemnumber` varchar(100) NOT NULL default '',
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`labelid`)
@@ -1017,24 +1018,59 @@
 --
 -- Table structure for table `labels_conf`
 --
-
 DROP TABLE IF EXISTS `labels_conf`;
 CREATE TABLE `labels_conf` (
   `id` int(4) NOT NULL auto_increment,
   `barcodetype` char(100) default '',
-  `title` tinyint(1) default '0',
-  `isbn` tinyint(1) default '0',
-  `itemtype` tinyint(1) default '0',
-  `barcode` tinyint(1) default '0',
-  `dewey` tinyint(1) default '0',
-  `class` tinyint(1) default '0',
-  `author` tinyint(1) default '0',
-  `papertype` char(100) default '',
-  `startrow` int(2) default NULL,
+  `title` int(1) default '0',
+  `itemtype` int(1) default '0',
+  `barcode` int(1) default '0',
+  `dewey` int(1) default '0',
+  `class` int(1) default '0',
+  `subclass` int(1) default '0',
+  `itemcallnumber` int(1) default '0',
+  `author` int(1) default '0',
+  `issn` int(1) default '0',
+  `isbn` int(1) default '0',
+  `startlabel` int(2) NOT NULL default '1',
+  `printingtype` char(32) default 'BAR',
+  `layoutname` char(20) NOT NULL default 'TEST',
+  `guidebox` int(1) default '0',
+  `active` tinyint(1) default '1',
+  `fonttype` char(10) default NULL,
+  `subtitle` int(1) default NULL,
+  `callnum_split` int(1) default NULL,
+  `text_justify` char(1) default NULL,
+  `ccode` int(1) default NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
+-- Table structure for table `labels_templates`
+--
+
+DROP TABLE IF EXISTS `labels_templates`;
+CREATE TABLE `labels_templates` (
+  `tmpl_id` int(4) NOT NULL auto_increment,
+  `tmpl_code` char(100) character set utf8 collate utf8_unicode_ci default '',
+  `tmpl_desc` char(100) character set utf8 collate utf8_unicode_ci default '',
+  `page_width` float default '0',
+  `page_height` float default '0',
+  `label_width` float default '0',
+  `label_height` float default '0',
+  `topmargin` float default '0',
+  `leftmargin` float default '0',
+  `cols` int(2) default '0',
+  `rows` int(2) default '0',
+  `colgap` float default '0',
+  `rowgap` float default '0',
+  `active` int(1) default NULL,
+  `units` char(20) character set utf8 collate utf8_unicode_ci default 'PX',
+  `fontsize` int(4) NOT NULL default '3',
+  PRIMARY KEY  (`tmpl_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+--
 -- Table structure for table `letter`
 --
 




From kyle.m.hall at gmail.com  Mon Feb  4 18:58:49 2008
From: kyle.m.hall at gmail.com (Kyle Hall)
Date: Mon, 04 Feb 2008 17:58:49 +0000
Subject: [Koha-cvs] koha/members memberentry.pl [dev_week]
Message-ID: <E1JM5aj-0007Ad-K2@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	08/02/04 17:58:49

Modified files:
	members        : memberentry.pl 

Log message:
	Bug fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.13.2.5&r2=1.5.2.13.2.6

Patches:
Index: memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.5.2.13.2.5
retrieving revision 1.5.2.13.2.6
diff -u -b -r1.5.2.13.2.5 -r1.5.2.13.2.6
--- memberentry.pl	21 Sep 2007 14:52:01 -0000	1.5.2.13.2.5
+++ memberentry.pl	4 Feb 2008 17:58:49 -0000	1.5.2.13.2.6
@@ -2,7 +2,7 @@
 # NOTE: This file uses standard 8-space tabs
 #       DO NOT SET TAB SIZE TO 4
 
-# $Id: memberentry.pl,v 1.5.2.13.2.5 2007/09/21 14:52:01 kylemhall Exp $
+# $Id: memberentry.pl,v 1.5.2.13.2.6 2008/02/04 17:58:49 kylemhall Exp $
 
 #script to set up screen for modification of borrower details
 #written 20/12/99 by chris at katipo.co.nz
@@ -289,7 +289,7 @@
 	}
 
         my $CGIbranch;
-	if ( $modify eq 'Edit' ) {
+        if ( lc( $modify ) eq 'edit' ) { ## Convert $modify to all lower case before comparison
 	  $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
 					-id => 'branchcode',
 					-class => 'focus',




From kyle.m.hall at gmail.com  Tue Feb  5 14:40:45 2008
From: kyle.m.hall at gmail.com (Kyle Hall)
Date: Tue, 05 Feb 2008 13:40:45 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en/members p...
	[dev_week]
Message-ID: <E1JMO2X-0007zm-JP@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	08/02/05 13:40:45

Modified files:
	koha-tmpl/intranet-tmpl/ccfls/en/members: pay.tmpl 

Log message:
	Added regex check to pay by amount

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/pay.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.11&r2=1.1.2.1.2.12

Patches:
Index: pay.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/pay.tmpl,v
retrieving revision 1.1.2.1.2.11
retrieving revision 1.1.2.1.2.12
diff -u -b -r1.1.2.1.2.11 -r1.1.2.1.2.12
--- pay.tmpl	2 Nov 2007 13:13:17 -0000	1.1.2.1.2.11
+++ pay.tmpl	5 Feb 2008 13:40:45 -0000	1.1.2.1.2.12
@@ -85,7 +85,7 @@
         <tr>
       </table>
     </div>
-    <input type="submit" name="submit"  value="Make Partial Payment" class="submit" />
+    <input type="submit" name="submit"  value="Make Partial Payment" class="submit"/>
   </form>
 </div>
 
@@ -94,6 +94,13 @@
 function checkField(){
 
         var payByAmountTotal = document.getElementById("payByAmountTotal");
+	
+	var regExp = /^\d+(\.\d{2})?$/;
+	if ( ! regExp.test( payByAmountTotal.value ) ) {
+		alert("Invalid Amount: " + payByAmountTotal.value );
+		return false;
+	}
+
         if ( payByAmountTotal.value > <!-- TMPL_VAR name="total" --> ) {
                 if ( confirm("You are trying to make a payment larger then the total amount due. Are you sure you want to do this?") ) {
                         return true;