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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2006-02-16 16:25:18 GMT
Modified:  lib/Vend Interpolate.pm
Log:
* Incompatible change, but unavoidable. Change variable setting determining
  country for tax basis.

  Problem was that MV_COUNTRY_FIELD was determining the country for
  the multistate order check. Since some installations were changing that
  to "tax_country" and manipulating that variable for taxing purposes,
  there was interactin.

  Change MV_COUNTRY_FIELD in Interpolate.pm to MV_COUNTRY_TAX_VAR.

* TODO: make change in UPGRADE.

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


rev 2.267, prev_rev 2.266
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.266
retrieving revision 2.267
diff -u -r2.266 -r2.267
--- Interpolate.pm	1 Feb 2006 15:37:47 -0000	2.266
+++ Interpolate.pm	16 Feb 2006 16:25:18 -0000	2.267
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.266 2006/02/01 15:37:47 jon Exp $
+# $Id: Interpolate.pm,v 2.267 2006/02/16 16:25:18 mheins Exp $
 #
 # Copyright (C) 2002-2006 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.266 $, 10);
+$VERSION = substr(q$Revision: 2.267 $, 10);
 
 @EXPORT = qw (
 
@@ -5380,7 +5380,7 @@
 sub tax_vat {
 	my($type, $opt) = @_;
 #::logDebug("entering VAT, opts=" . uneval($opt));
-	my $cfield = $::Variable->{MV_COUNTRY_FIELD} || 'country';
+	my $cfield = $::Variable->{MV_COUNTRY_TAX_VAR} || 'country';
 	my $country = $opt->{country} || $::Values->{$cfield};
 
 	return 0 if ! $country;