? .svn
? LICENSE.txt
? ubercart_country_field.patch
? ca/.svn
? contrib/.svn
? contrib/uc_coupon
? contrib/uc_discount
? contrib/uc_discount-6.x-1.x-dev.tar.gz
? contrib/uc_discounts_alt-6.x-1.0-beta33.tar.gz
? contrib/uc_discounts_alt-6.x-1.0-beta33.tar.gz.1
? contrib/uc_signup/.svn
? contrib/uc_signup/views/.svn
? docs/.svn
? payment/.svn
? payment/uc_2checkout/.svn
? payment/uc_authorizenet/.svn
? payment/uc_credit/.svn
? payment/uc_credit/images/.svn
? payment/uc_cybersource/.svn
? payment/uc_google_checkout/.svn
? payment/uc_payment/.svn
? payment/uc_payment_pack/.svn
? payment/uc_paypal/.svn
? shipping/.svn
? shipping/uc_flatrate/.svn
? shipping/uc_quote/.svn
? shipping/uc_shipping/.svn
? shipping/uc_shipping/images/.svn
? shipping/uc_ups/.svn
? shipping/uc_usps/.svn
? shipping/uc_weightquote/.svn
? uc_attribute/.svn
? uc_cart/.svn
? uc_cart/images/.svn
? uc_cart_links/.svn
? uc_catalog/.svn
? uc_file/.svn
? uc_googleanalytics/.svn
? uc_order/.svn
? uc_order/images/.svn
? uc_order/templates/.svn
? uc_product/.svn
? uc_product/views/.svn
? uc_product_kit/.svn
? uc_reports/.svn
? uc_roles/.svn
? uc_stock/.svn
? uc_store/.svn
? uc_store/countries/.svn
? uc_store/images/.svn
? uc_store/includes/.svn
? uc_tax_report/.svn
? uc_taxes/.svn
Index: uc_cart/uc_cart_checkout_pane.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_cart/uc_cart_checkout_pane.inc,v
retrieving revision 1.5.2.6
diff -u -p -r1.5.2.6 uc_cart_checkout_pane.inc
--- uc_cart/uc_cart_checkout_pane.inc	6 May 2009 18:38:03 -0000	1.5.2.6
+++ uc_cart/uc_cart_checkout_pane.inc	7 Aug 2009 15:10:39 -0000
@@ -249,6 +249,9 @@ function uc_checkout_pane_delivery($op, 
         }
       }
 
+      if (uc_address_field_enabled('country')) {
+        $contents['delivery_country'] = uc_country_select(uc_get_field_name('country'), $arg1->delivery_country, NULL, 'name', uc_address_field_required('country'));
+      }
       if (uc_address_field_enabled('first_name')) {
         $contents['delivery_first_name'] = uc_textfield(uc_get_field_name('first_name'), $arg1->delivery_first_name, uc_address_field_required('first_name'));
       }
@@ -267,9 +270,6 @@ function uc_checkout_pane_delivery($op, 
       if (uc_address_field_enabled('city')) {
         $contents['delivery_city'] = uc_textfield(uc_get_field_name('city'), $arg1->delivery_city, uc_address_field_required('city'));
       }
-      if (uc_address_field_enabled('country')) {
-        $contents['delivery_country'] = uc_country_select(uc_get_field_name('country'), $arg1->delivery_country, NULL, 'name', uc_address_field_required('country'));
-      }
       if (uc_address_field_enabled('zone')) {
         if (isset($_POST['panes']['delivery']['delivery_country'])) {
           $country_id = intval($_POST['panes']['delivery']['delivery_country']);
@@ -339,6 +339,10 @@ function uc_checkout_pane_billing($op, &
           $contents['billing_address_select'] = $addresses;
         }
       }
+
+      if (uc_address_field_enabled('country')) {
+        $contents['billing_country'] = uc_country_select(uc_get_field_name('country'), $arg1->billing_country, NULL, 'name', uc_address_field_required('country'));
+      }
       if (uc_address_field_enabled('first_name')) {
         $contents['billing_first_name'] = uc_textfield(uc_get_field_name('first_name'), $arg1->billing_first_name, uc_address_field_required('first_name'));
       }
@@ -357,9 +361,6 @@ function uc_checkout_pane_billing($op, &
       if (uc_address_field_enabled('city')) {
         $contents['billing_city'] = uc_textfield(uc_get_field_name('city'), $arg1->billing_city, uc_address_field_required('city'));
       }
-      if (uc_address_field_enabled('country')) {
-        $contents['billing_country'] = uc_country_select(uc_get_field_name('country'), $arg1->billing_country, NULL, 'name', uc_address_field_required('country'));
-      }
       if (uc_address_field_enabled('zone')) {
         if (isset($_POST['panes']['billing']['billing_country'])) {
           $country_id = intval($_POST['panes']['billing']['billing_country']);
Index: uc_store/uc_store.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/uc_store.module,v
retrieving revision 1.14.2.21
diff -u -p -r1.14.2.21 uc_store.module
--- uc_store/uc_store.module	7 May 2009 20:52:28 -0000	1.14.2.21
+++ uc_store/uc_store.module	7 Aug 2009 15:10:50 -0000
@@ -666,6 +666,7 @@ function uc_store_address_fields_form() 
   );
 
   $fields = array(
+    'country' => array(t('Country'), TRUE),
     'first_name' => array(t('First name'), TRUE),
     'last_name' => array(t('Last name'), TRUE),
     'phone' => array(t('Phone number'), TRUE),
@@ -674,7 +675,6 @@ function uc_store_address_fields_form() 
     'street2' => array(t('Street address 2'), TRUE),
     'city' => array(t('City'), TRUE),
     'zone' => array(t('State/Province'), TRUE),
-    'country' => array(t('Country'), TRUE),
     'postal_code' => array(t('Postal code'), TRUE),
     'address' => array(t('Address'), FALSE),
     'street' => array(t('Street address'), FALSE),