Index: salesforce_api.module
===================================================================
RCS file: /cvs/salesforce/salesforce_api/salesforce_api.module,v
retrieving revision 1.3
diff -u -r1.3 salesforce_api.module
--- salesforce_api.module	30 Jun 2009 08:49:07 -0000	1.3
+++ salesforce_api.module	1 Jul 2009 21:44:55 -0000
@@ -353,7 +353,7 @@
 function salesforce_api_fieldmap_options($drupal = NULL, $salesforce = NULL, $automatic = FALSE) {
   $options = array();
   
-  $result = db_query("SELECT fieldmap, drupal, salesforce FROM {salesforce_field_map}");
+  $result = db_query("SELECT fieldmap, drupal, salesforce, automatic FROM {salesforce_field_map}");
   while ($map = db_fetch_array($result)) {
 
     // Skip the fieldmap if it is not for the appropriate Drupal object.
@@ -363,6 +363,11 @@
 
     // Skip the fieldmap if it is not for the appropriate Salesforce object.
     if (!empty($salesforce) && $map['salesforce'] != $salesforce) {
+      continue;
+    }
+    
+    // Skip the fieldmap if it is not automatic when filtering by automatic is on.
+    if ($automatic && $map['automatic'] == '0') {
       continue;
     }