[interchange-cvs] interchange - heins modified lib/Vend/Interpolate.pm

[interchange-core@icdevgroup.org]

User:      heins
Date:      2002-07-28 05:44:24 GMT
Modified:  lib/Vend Interpolate.pm
Log:
* Fix to pick up state field for taxes no matter the mode.

Revision  Changes    Path
2.93      +4 -3      interchange/lib/Vend/Interpolate.pm


rev 2.93, prev_rev 2.92
Index: Interpolate.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -r2.92 -r2.93
--- Interpolate.pm	28 Jul 2002 05:28:12 -0000	2.92
+++ Interpolate.pm	28 Jul 2002 05:44:24 -0000	2.93
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 #=20
-# $Id: Interpolate.pm,v 2.92 2002/07/28 05:28:12 mheins Exp $
+# $Id: Interpolate.pm,v 2.93 2002/07/28 05:44:24 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA =3D qw(Exporter);
=20
-$VERSION =3D substr(q$Revision: 2.92 $, 10);
+$VERSION =3D substr(q$Revision: 2.93 $, 10);
=20
 @EXPORT =3D qw (
=20
@@ -6720,6 +6720,7 @@
 		if($type eq 'salestax') {
 			my $save;
 			$sort =3D $l->{sort} || '010';
+			my $lab_field =3D $l->{label_value} || $Vend::Cfg->{SalesTax};
 			if($l->{tax_fields}) {
 				$save =3D $Vend::Cfg->{SalesTax};
 				$Vend::Cfg->{SalesTax} =3D $l->{tax_fields};
@@ -6731,7 +6732,7 @@
 			$cost =3D salestax(undef, { tax_type =3D> $l->{tax_type} } );
 			$desc =3D errmsg(
 						$l->{description} || 'Sales Tax',
-						$::Values->{$Vend::Cfg->{SalesTax}},
+						$::Values->{$lab_field},
 					);
 			$Vend::Cfg->{SalesTax} =3D $save if defined $save;
 		}