[interchange-cvs] interchange - kwalsh modified lib/Vend/Util.pm

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2006-11-15 15:49:17 GMT
Modified:  lib/Vend Util.pm
Log:
    * Allow "convert=0" to be passed to the [currency] tag to override the
      the "locale" parameter's automatic conversion.

Revision  Changes    Path
2.100     +3 -3      interchange/lib/Vend/Util.pm


rev 2.100, prev_rev 2.99
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.99
retrieving revision 2.100
diff -u -r2.99 -r2.100
--- Util.pm	15 Nov 2006 15:39:41 -0000	2.99
+++ Util.pm	15 Nov 2006 15:49:17 -0000	2.100
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.99 2006/11/15 15:39:41 kwalsh Exp $
+# $Id: Util.pm,v 2.100 2006/11/15 15:49:17 kwalsh Exp $
 # 
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -88,7 +88,7 @@
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.99 $, 10);
+$VERSION = substr(q$Revision: 2.100 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -467,7 +467,7 @@
 
 	my $pd = $Vend::Cfg->{PriceDivide};
 	if($opt->{locale}) {
-		$convert = 1;
+		$convert = 1 unless length($convert);
 		$pd = $Vend::Cfg->{Locale_repository}{$opt->{locale}}{PriceDivide};
 	}