Author: jleroux Date: Sat Apr 7 11:05:10 2012 New Revision: 1310733 URL: http://svn.apache.org/viewvc?rev=1310733&view=rev Log: "Applied fix from trunk for revision: 1310731 " '(conflict handled by hand) ------------------------------------------------------------------------ r1310731 | jleroux | 2012-04-07 13:01:49 +0200 (sam., 07 avr. 2012) | 18 lines
A patch from Tom Burns for "SFA Postal Address Broken" https://issues.apache.org/jira/browse/OFBIZ-4786 SFA does not store countryGeoId or stateProvinceGeoId in PostalAddress entity when creating a new account causing postal address display to break in SFA and Party Manager profile screens. Demo data for "sfa100" does not have values for countryGeoId or stateProvinceGeoId Values countryGeoId or stateProvinceGeoId are needed to display party profile. To reproduce: 1. In Party Manager search for Party Id "sfa100" Open "sfa100" from search results See error message under "General Correspondence Address" 2. Similar in SFA Account Lookup 3. A New Account created in SFA will produce the same error. Adding address to an existing account works. For example the demo accounts created by other components. ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/marketing/data/sfaDemoData.xml ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/AccountForms.xml Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1310731 Modified: ofbiz/branches/release10.04/applications/marketing/data/sfaDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/data/sfaDemoData.xml?rev=1310733&r1=1310732&r2=1310733&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/marketing/data/sfaDemoData.xml (original) +++ ofbiz/branches/release10.04/applications/marketing/data/sfaDemoData.xml Sat Apr 7 11:05:10 2012 @@ -27,7 +27,7 @@ <ContactMech contactMechId="sfa100" contactMechTypeId="POSTAL_ADDRESS"/> <ContactMech contactMechId="sfa101" contactMechTypeId="TELECOM_NUMBER"/> <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="[email protected]"/> - <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/> + <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" countryGeoId="USA" stateProvinceGeoId="CA" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/> <TelecomNumber contactMechId="sfa101" countryCode="1" areaCode="33" contactNumber="12456" lastUpdatedStamp="2008-05-23 11:57:41.179" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:41.179" createdTxStamp="2008-05-23 11:57:39.476"/> <PartyContactMech partyId="sfa100" contactMechId="sfa100" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMech partyId="sfa100" contactMechId="sfa101" fromDate="2000-01-01 00:00:00.000"/> Modified: ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/AccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1310733&r1=1310732&r2=1310733&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/AccountForms.xml (original) +++ ofbiz/branches/release10.04/applications/marketing/widget/sfa/forms/AccountForms.xml Sat Apr 7 11:05:10 2012 @@ -38,7 +38,7 @@ under the License. <field name="city" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> <text size="30" maxlength="60"/> </field> - <field name="state" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <field name="stateProvinceGeoId" title="${uiLabelMap.CommonState}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> <drop-down allow-empty="true"> <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName} - ${geoId}"> <entity-constraint name="geoTypeId" operator="in" value="STATE,PROVINCE"/> @@ -49,7 +49,7 @@ under the License. <field name="postalCode" title="${uiLabelMap.CommonZipPostalCode}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> <text size="10" maxlength="30"/> </field> - <field name="country" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <field name="countryGeoId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> <drop-down allow-empty="false" no-current-selected-key="${defaultCountryGeoId}"> <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName} - ${geoId}"> <entity-constraint name="geoTypeId" value="COUNTRY"/>
