SF.net SVN: ledger-smb:[2556] trunk

[..hidden..]

Revision: 2556
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2556&view=rev
Author:   einhverfr
Date:     2009-04-13 16:15:46 +0000 (Mon, 13 Apr 2009)

Log Message:
-----------
Update to contact screen to correct country handling

Modified Paths:
--------------
    trunk/LedgerSMB/DBObject/Company.pm
    trunk/UI/Contact/contact.html

Modified: trunk/LedgerSMB/DBObject/Company.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Company.pm	2009-04-13 16:13:32 UTC (rev 2555)
+++ trunk/LedgerSMB/DBObject/Company.pm	2009-04-13 16:15:46 UTC (rev 2556)
@@ -261,6 +261,11 @@
             if ($_->{id} = $self->{location_id}){
                 my $old_id = $self->{id};
                 $self->merge($_);
+                for my $c (@{$self->{country_list}}){
+                     if ($c->{name} eq $self->{country}){
+                         $self->{country_code} = $c->{id};
+                     }
+                }
                 $self->{id} = $old_id;
                 last;
             }

Modified: trunk/UI/Contact/contact.html
===================================================================
--- trunk/UI/Contact/contact.html	2009-04-13 16:13:32 UTC (rev 2555)
+++ trunk/UI/Contact/contact.html	2009-04-13 16:15:46 UTC (rev 2556)
@@ -629,11 +629,11 @@
 		} #' ?>
 	</div>
 	<div> <!-- TODO:  Move to elements.html -CT -->
-		<?lsmb IF !country; country = default_country; END -?>
+		<?lsmb IF !country_code; country_code = default_country; END -?>
 		<?lsmb INCLUDE select element_data = {
 			text_attr = "name"
 			value_attr = "id"
-			default_values = [country]
+			default_values = [country_code]
 			options = country_list
 			name = "country_code"
 			label = text('Country:') 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.