svn commit: r1557459 - in /ofbiz/branches/release12.04: ./ applications/party/webapp/partymgr/party/editGeoLocation.ftl framework/common/entitydef/entitymodel.xml

Author: jleroux
Date: Sat Jan 11 20:04:55 2014
New Revision: 1557459

URL: http://svn.apache.org/r1557459
Log:
"Applied fix from trunk for revision: 1557457"
------------------------------------------------------------------------
r1557457 | jleroux | 2014-01-11 21:04:19 +0100 (sam. 11 janv. 2014) | 1 ligne

Completes r1557447, the annoyances of blind reverting
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/party/webapp/partymgr/party/editGeoLocation.ftl
    ofbiz/branches/release12.04/framework/common/entitydef/entitymodel.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1557457

Modified: ofbiz/branches/release12.04/applications/party/webapp/partymgr/party/editGeoLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/webapp/partymgr/party/editGeoLocation.ftl?rev=1557459&r1=1557458&r2=1557459&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/webapp/partymgr/party/editGeoLocation.ftl (original)
+++ ofbiz/branches/release12.04/applications/party/webapp/partymgr/party/editGeoLocation.ftl Sat Jan 11 20:04:55 2014
@@ -121,7 +121,7 @@ under the License.
         <div align="center" id="map" style="border:1px solid #979797; background-color:#e5e3df; width:500px; height:450px; margin:2em auto;"><br/></div>
         <form action="#" onsubmit="showAddress(this.address.value); return false">
             <input type="text" size="50" name="address"/>
-            <input type="submit" value="Search"/>
+            <input type="submit" value="${uiLabelMap.CommonSearch}"/>
         </form>
         <br/><br/>
         <form id="updateMapForm" method="post" action="<@ofbizUrl>editGeoLocation</@ofbizUrl>">

Modified: ofbiz/branches/release12.04/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/entitydef/entitymodel.xml?rev=1557459&r1=1557458&r2=1557459&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release12.04/framework/common/entitydef/entitymodel.xml Sat Jan 11 20:04:55 2014
@@ -282,14 +282,14 @@ under the License.
         <field name="dataSourceId" type="id"></field>
         <field name="latitude" type="short-varchar" not-null="true"></field>
         <field name="longitude" type="short-varchar" not-null="true"></field>
-        <field name="elevation" type="short-varchar"></field>
-        <field name="elevationUomId" type="id"><description>We need an UOM for elevation (feet, meters, etc.)</description></field>
+        <field name="elevation" type="fixed-point"></field>
+        <field name="elevationUomId" type="id"><description>UOM for elevation (feet, meters, etc.)</description></field>
         <field name="information" type="comment"><description>To enter any related information</description></field>
         <prim-key field="geoPointId"/>
         <relation type="one" fk-name="GEOPOINT_DTSRC" rel-entity-name="DataSource">
             <key-map field-name="dataSourceId"/>
         </relation>
-        <relation type="one" fk-name="GPT_TYPE_UOM" title="Elevation" rel-entity-name="Uom">
+        <relation type="one" fk-name="GPT_ELEV_UOM" title="Elevation" rel-entity-name="Uom">
             <key-map field-name="elevationUomId" rel-field-name="uomId"/>
         </relation>
     </entity>