<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -25,6 +25,7 @@ module Salesforce
     #Raise connection if not initialized already   
     conn = DataMapper::DmConnection.new unless DataMapper::DmConnection.connection.present?
     
+    #TODO : pass variable to clear tables first
     #User.delete_all!
     #Account.delete_all!
     #Contact.delete_all!
@@ -123,15 +124,7 @@ module Salesforce
     # :company_name,                      String
     # :phone,                             String
     # :mobile_phone,                      String  
-    # :is_active,                         Boolean --&gt; suspended_at
-    
-    #Custom User columns required 
-    # :fax,                               String               
-    # :street,                            String 
-    # :city,                              String                                                                                                                        
-    # :postal_code,                       String                                                                        
-    # :state,                             String                                                     
-    # :country                            String                                                    
+    # :is_active,                         Boolean --&gt; suspended_at                                                  
     
     #---------------------------------------------------------------------------
     
@@ -162,14 +155,14 @@ module Salesforce
          :suspended_at =&gt; suspended_date 
        }
        
-       address_details = %w( street city state postal_code country )
-       address = address_details.collect{|i| u.send(i) }.compact.join(', ')
-
-       custom_values = {
-         :fax =&gt; u.fax,
-         :address =&gt; address           
-       }
-       update_values.update(custom_values)
+       # address_details = %w( street city state postal_code country )
+       # address = address_details.collect{|i| u.send(i) }.compact.join(', ')
+       #     
+       # custom_values = {
+       #   :fax =&gt; u.fax,
+       #   :address =&gt; address           
+       # }
+       # update_values.update(custom_values)
        
        #Avoid mass assignment protection
        update_values.each do |k,v|
@@ -237,19 +230,6 @@ module Salesforce
     #  &quot;created_at&quot;,
     #  &quot;updated_at&quot;
     
-    #custom Account columns required
-    # :description
-    # :abn__c,                                                                                                               
-    # :acn__c,                                                                                          
-    # :bhc_used_for_grower_delivery__c,                                                                               
-    # :grn_number__c,                                                       
-    # :grn_type__c,                                                               
-    # :registration_type__c,                                                      
-    # :relationship_to_clear__c,                                  
-    # :rough_guide_to_grain_volume_mt__c,                                  
-    # :what_grains_do_you_trade_in__c,
-    
-    
     account_counter = 0
      #Generate Accounts
     DataMapper::Objects::Account.all.each do |a| 
@@ -259,7 +239,6 @@ module Salesforce
         shipping_address = address_details.collect{|i| &quot;shipping_#{i}&quot;}.collect{|i| a.send(i) }.compact.join(', ')
         billing_address  = address_details.collect{|i| &quot;billing_#{i}&quot;}.collect{|i| a.send(i) }.compact.join(', ') 
         
-        #( shipping_address + billing_address ).each { |i| crm_account[i] = a.send(i) }
         sf_user = DataMapper::Objects::User.get(a.owner_id)
         crm_user = User.find_with_deleted(:first, :conditions =&gt; {:username =&gt; sf_user.username}) 
         raise &quot;Error - Unable to find user for account - #{a.inspect}.\nPlease ensure the full usernames were saved in User model.\nIt could need the field size increased (if the user object saved).&quot; if crm_user.blank? #Users should have been loaded and *should* be there
@@ -282,15 +261,15 @@ module Salesforce
            :shipping_address =&gt; shipping_address,
            :deleted_at =&gt; deleted_at
          } 
-         custom_values = {
-           :description =&gt; a.description,
-           :abn =&gt; a.abn__c,                               
-           :acn =&gt; a.acn__c,                                                       
-           :registration_type =&gt; a.registration_type__c,                  
-           :relationship_to_clear =&gt; a.relationship_to_clear__c,              
-           :rough_guide_to_grain_volume_mt =&gt; a.rough_guide_to_grain_volume_mt__c,     
-           :what_grains_do_you_trade_in =&gt; a.what_grains_do_you_trade_in__c         
-         }
+         # custom_values = {
+         #           :description =&gt; a.description,
+         #           :abn =&gt; a.abn__c,                               
+         #           :acn =&gt; a.acn__c,                                                       
+         #           :registration_type =&gt; a.registration_type__c,                  
+         #           :relationship_to_clear =&gt; a.relationship_to_clear__c,              
+         #           :rough_guide_to_grain_volume_mt =&gt; a.rough_guide_to_grain_volume_mt__c,     
+         #           :what_grains_do_you_trade_in =&gt; a.what_grains_do_you_trade_in__c         
+         #         } 
          update_values.update(custom_values) 
          
         #Avoid mass assignment protection
@@ -511,10 +490,10 @@ module Salesforce
            :deleted_at =&gt; deleted_at
          }
          
-         custom_values = {
-           :description =&gt; o.description
-         }
-         update_values.update(custom_values) 
+         # custom_values = {
+         #   :description =&gt; o.description
+         # }
+         # update_values.update(custom_values)   
 
         #Avoid mass assignment protection
         update_values.each do |k,v|
@@ -604,28 +583,6 @@ module Salesforce
      # &quot;deleted_at&quot;,
      # &quot;created_at&quot;,
      # &quot;updated_at&quot; 
-    
-     #Lead Custom fields:
-     #description
-     #website
-     #     mobile__c 
-     #     abn__c
-     #     acn__c
-     #     bhc_used_for_grower_delivery__c 
-     # mobile__c                                                      
-     # abn__c
-     # acn__c
-     # bhc_used_for_grower_delivery__c
-     # fax__c
-     # grn_number__c
-     # grn_type__c
-     # growers_broker__c  =&gt; growers_broker (Account)
-     # if_growers_broker_is_not_clear_user__c 
-     # registration_type__c =&gt; [&quot;Grower&quot;, &quot;Buyer&quot;, &quot;Other&quot;, &quot;Broker&quot;]
-     # rough_guide_to_grain_volume_mt__c
-     # what_grains_do_you_trade_in__c
-     # feedback__c
-     
      
     leads_counter = 0
      unable = []   
@@ -676,22 +633,22 @@ module Salesforce
            :deleted_at =&gt; deleted_at
          }
           
-         custom_values = {
-           :description =&gt; l.description,
-           :abn =&gt; l.abn__c,                               
-           :acn =&gt; l.acn__c,                               
-           :bhc_used_for_grower_delivery =&gt; l.bhc_used_for_grower_delivery__c,
-           :fax =&gt; l.fax__c, 
-           :grn_number =&gt; l.grn_number__c,                         
-           :grn_type =&gt; l.grn_type__c,
-           :growers_broker_id =&gt; crm_broker_id, 
-           :if_growers_broker_is_not_clear_user =&gt; l.if_growers_broker_is_not_clear_user__c,
-           :registration_type =&gt; l.registration_type__c,                             
-           :rough_guide_to_grain_volume_mt =&gt; l.rough_guide_to_grain_volume_mt__c,     
-           :what_grains_do_you_trade_in =&gt; l.what_grains_do_you_trade_in__c,
-           :feedback =&gt; l.feedback__c         
-         }                                                                   
-         update_values.update(custom_values) 
+         # custom_values = {
+         #   :description =&gt; l.description,
+         #   :abn =&gt; l.abn__c,                               
+         #   :acn =&gt; l.acn__c,                               
+         #   :bhc_used_for_grower_delivery =&gt; l.bhc_used_for_grower_delivery__c,
+         #   :fax =&gt; l.fax__c, 
+         #   :grn_number =&gt; l.grn_number__c,                         
+         #   :grn_type =&gt; l.grn_type__c,
+         #   :growers_broker_id =&gt; crm_broker_id, 
+         #   :if_growers_broker_is_not_clear_user =&gt; l.if_growers_broker_is_not_clear_user__c,
+         #   :registration_type =&gt; l.registration_type__c,                             
+         #   :rough_guide_to_grain_volume_mt =&gt; l.rough_guide_to_grain_volume_mt__c,     
+         #   :what_grains_do_you_trade_in =&gt; l.what_grains_do_you_trade_in__c,
+         #   :feedback =&gt; l.feedback__c         
+         # }                                                                   
+         # update_values.update(custom_values) 
          
         #Avoid mass assignment protection
         update_values.each do |k,v|
@@ -744,9 +701,6 @@ module Salesforce
      #  &quot;deleted_at&quot;,
      #  &quot;created_at&quot;,
      #  &quot;updated_at&quot;
-
-     #Custom fields required 
-     #  description
      
      task_counter = 0
      unable = []
@@ -804,10 +758,10 @@ module Salesforce
                   :created_at =&gt; t.activity_date,
                   :updated_at =&gt; t.activity_date
                 }
-                custom_values = {
-                  :description =&gt; t.description,      
-                }                                                                   
-                update_values.update(custom_values) 
+                # custom_values = {
+                #   :description =&gt; t.description,      
+                # }                                                                   
+                # update_values.update(custom_values)   
                
                #Avoid mass assignment protection
                update_values.each do |k,v|
@@ -996,16 +950,6 @@ module Salesforce
     
     #Salesforce Objects
     #To view list of objects run Salesforce.list_total_content with a fully loaded dm_mapped_objects.rb file
-    
-    #These are just objects required for me to map in this import. Enhance and add for more objects:
-    #    LeadStatus - Total items : 9 
-    #    Account - Total items : 150  
-    #    Lead - Total items : 1000
-    #    User - User 
-    #    Task - Total items : 1000 (Find objects to associate manually)
-    #    TaskStatus - Total items : 5
-    #    EmailTemplate - Total items : 109 
-    #    Note - Total items : 119 (Find objects via association manually) 
       
     @objects_map = {  DataMapper::Objects::User =&gt; User,
                       DataMapper::Objects::Account =&gt; Account,</diff>
      <filename>lib/salesforce.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>215ea6d5a0872c7ad136022b67a07b602445bb9f</id>
    </parent>
  </parents>
  <author>
    <name>Tom Meier</name>
    <email>ozmeier@yahoo.co.uk</email>
  </author>
  <url>http://github.com/tommeier/crm_salesforce_importer/commit/5ef59957a7cb5374de9698ad1a024806e03f6f1d</url>
  <id>5ef59957a7cb5374de9698ad1a024806e03f6f1d</id>
  <committed-date>2009-11-07T19:26:59-08:00</committed-date>
  <authored-date>2009-11-07T19:26:59-08:00</authored-date>
  <message>Comment out custom fields, but leave as an example for others</message>
  <tree>c809b31a9cbc1784df116ea0a80a44e9d43d10f9</tree>
  <committer>
    <name>Tom Meier</name>
    <email>ozmeier@yahoo.co.uk</email>
  </committer>
</commit>
