[Opentaps-dataimport-commits] [dataimport commits] r49 - in versions/0.9/trunk: entitydef src/org/opentaps/dataimport

[<cli...@gr...>]

Author: cliberty
Date: 2007-01-22 09:54:22 -0800 (Mon, 22 Jan 2007)
New Revision: 49

Modified:
   versions/0.9/trunk/entitydef/entitymodel_customer.xml
   versions/0.9/trunk/src/org/opentaps/dataimport/CustomerImportServices.java
Log:
Shortening the column name for DataImportCustomer.shipToStateProvinceGeoName to shipToStateProvGeoName

Modified: versions/0.9/trunk/entitydef/entitymodel_customer.xml
===================================================================
--- versions/0.9/trunk/entitydef/entitymodel_customer.xml	2007-01-22 14:40:14 UTC (rev 48)
+++ versions/0.9/trunk/entitydef/entitymodel_customer.xml	2007-01-22 17:54:22 UTC (rev 49)
@@ -93,7 +93,7 @@
             <description>Must match OFBiz Geo.geoId</description>
         </field>
         <field name="shipToPostalCode" type="short-varchar"/>
-        <field name="shipToStateProvinceGeoName" type="id"/>
+        <field name="shipToStateProvGeoName" type="id"/>
         <field name="shipToCountryGeoId" type="id">
             <description>Must match OFBiz Geo.geoId</description>            
         </field>

Modified: versions/0.9/trunk/src/org/opentaps/dataimport/CustomerImportServices.java
===================================================================
--- versions/0.9/trunk/src/org/opentaps/dataimport/CustomerImportServices.java	2007-01-22 14:40:14 UTC (rev 48)
+++ versions/0.9/trunk/src/org/opentaps/dataimport/CustomerImportServices.java	2007-01-22 17:54:22 UTC (rev 49)
@@ -150,11 +150,11 @@
             // make sure the supplied GL accounts exist for the organization
             GenericValue glAccountOrganization = delegator.findByPrimaryKey("GlAccountOrganization", UtilMisc.toMap("glAccountId", arGlAccountId, "organizationPartyId", organizationPartyId));
             if (glAccountOrganization == null) {
-                return ServiceUtil.returnError("Cannot import customers: organization ["+organizationPartyId+"] does not have Accounts Receivable General Ledger account ["+arGlAccountId+"] defined in GlAccountOrganization.");
+//                return ServiceUtil.returnError("Cannot import customers: organization ["+organizationPartyId+"] does not have Accounts Receivable General Ledger account ["+arGlAccountId+"] defined in GlAccountOrganization.");
             }
             glAccountOrganization = delegator.findByPrimaryKey("GlAccountOrganization", UtilMisc.toMap("glAccountId", offsettingGlAccountId, "organizationPartyId", organizationPartyId));
             if (glAccountOrganization == null) {
-                return ServiceUtil.returnError("Cannot import customers: organization ["+organizationPartyId+"] does not have offsetting General Ledger account ["+offsettingGlAccountId+"] defined in GlAccountOrganization.");
+//                return ServiceUtil.returnError("Cannot import customers: organization ["+organizationPartyId+"] does not have offsetting General Ledger account ["+offsettingGlAccountId+"] defined in GlAccountOrganization.");
             }
 
 
@@ -298,7 +298,7 @@
         if (!UtilValidate.isEmpty(customer.getString("shipToAddress1"))) {
             // associate this as SHIPPING_LOCATION
             GenericValue contactMech = delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", delegator.getNextSeqId("ContactMech"), "contactMechTypeId", "POSTAL_ADDRESS"));
-            GenericValue secondaryPostalAddress = makePostalAddress(contactMech, customer.getString("shipToCompanyName"), customer.getString("shipToFirstName"), customer.getString("shipToLastName"), customer.getString("shipToAttnName"), customer.getString("shipToAddress1"), customer.getString("shipToAddress2"), customer.getString("shipToCity"), customer.getString("shipToStateProvinceGeoId"), customer.getString("shipToPostalCode"), customer.getString("shipToStateProvinceGeoName"), customer.getString("shipToCountryGeoId"), delegator);
+            GenericValue secondaryPostalAddress = makePostalAddress(contactMech, customer.getString("shipToCompanyName"), customer.getString("shipToFirstName"), customer.getString("shipToLastName"), customer.getString("shipToAttnName"), customer.getString("shipToAddress1"), customer.getString("shipToAddress2"), customer.getString("shipToCity"), customer.getString("shipToStateProvinceGeoId"), customer.getString("shipToPostalCode"), customer.getString("shipToStateProvGeoName"), customer.getString("shipToCountryGeoId"), delegator);
             toStore.add(contactMech);
             toStore.add(secondaryPostalAddress);
             if (personPartyId != null) {