OFBiz › OFBiz - Commits

svn commit: r929503 - in /ofbiz/trunk/applications/product: config/ entitydef/ webapp/facility/WEB-INF/actions/facility/ webapp/facility/facility/ widget/catalog/ widget/facility/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r929503 - in /ofbiz/trunk/applications/product: config/ entitydef/ webapp/facility/WEB-INF/actions/facility/ webapp/facility/facility/ widget/catalog/ widget/facility/

jleroux@apache.org
Author: jleroux
Date: Wed Mar 31 12:37:39 2010
New Revision: 929503

URL: http://svn.apache.org/viewvc?rev=929503&view=rev
Log:
* Change Facility.squareFootage to Facility.facilitySize and change its type from numeric (no decimals) to fixed-point
* Add Facility.facilitySizeUomId
* related changes in UI

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy
    ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
    ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=929503&r1=929502&r2=929503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Mar 31 12:37:39 2010
@@ -10757,6 +10757,10 @@
         <value xml:lang="th">ประเภทรายการสินค้าคงเหลือเริ่มต้น</value>
         <value xml:lang="zh">缺省库存明细类型</value>
     </property>
+    <property key="ProductFacilityDefaultAreaUnit">
+        <value xml:lang="en">Area Unit</value>
+        <value xml:lang="fr">Unité de surface</value>
+    </property>
     <property key="ProductFacilityDefaultWeightUnit">
         <value xml:lang="de">Standart Gewichtseinheit</value>
         <value xml:lang="en">Default Weight Unit</value>
@@ -10768,7 +10772,7 @@
         <value xml:lang="ru">Единица веса по умолчанию</value>
         <value xml:lang="th">หน่วยน้ำหนักเริ่มต้น</value>
         <value xml:lang="zh">缺省重量单位</value>
-    </property>
+    </property>    
     <property key="ProductFacilityGroup">
         <value xml:lang="de">Einrichtungsgruppe</value>
         <value xml:lang="en">Facility Group</value>
@@ -19536,16 +19540,12 @@
         <value xml:lang="th">SqFt</value>
         <value xml:lang="zh">平方英尺</value>
     </property>
-    <property key="ProductSquareFootage">
-        <value xml:lang="de">Fläche (m^2)</value>
-        <value xml:lang="en">Square Footage</value>
-        <value xml:lang="es">Superficie (m^2)</value>
+    <property key="ProductFacilitySize">
+        <value xml:lang="de">Fläche</value>
+        <value xml:lang="en">Area</value>
+        <value xml:lang="es">Superficie</value>
         <value xml:lang="fr">Surface</value>
-        <value xml:lang="it">Metri Quadrati</value>
-        <value xml:lang="ro">Metri Patrati</value>
-        <value xml:lang="ru">Площадь в кв. футах</value>
-        <value xml:lang="th">Square Footage</value>
-        <value xml:lang="zh">平方英尺</value>
+        <value xml:lang="th">Area</value>
     </property>
     <property key="ProductStandard">
         <value xml:lang="de">Standard</value>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=929503&r1=929502&r2=929503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Mar 31 12:37:39 2010
@@ -992,7 +992,8 @@ under the License.
         <field name="defaultInventoryItemTypeId" type="id"></field>
         <field name="facilityName" type="name"></field>
         <field name="primaryFacilityGroupId" type="id"></field>
-        <field name="squareFootage" type="numeric"></field>
+        <field name="facilitySize" type="fixed-point"></field>
+        <field name="facilitySizeUomId" type="id"></field>
         <field name="productStoreId" type="id"></field>
         <field name="defaultDaysToShip" type="numeric"><description>In the absence of a product specific days to ship in ProductFacility, this will be used</description></field>
         <field name="openedDate" type="date-time"></field>

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy?rev=929503&r1=929502&r2=929503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy Wed Mar 31 12:37:39 2010
@@ -43,5 +43,8 @@ if (facilityTypes) {
 // all possible inventory item types
 context.inventoryItemTypes = delegator.findList("InventoryItemType", null, null, ['description'], null, true);
 
-// unit of measures
-context.weightUomList = delegator.findList("Uom", EntityCondition.makeCondition([uomTypeId : 'WEIGHT_MEASURE']), null, null, null, true);
\ No newline at end of file
+// weight unit of measures
+context.weightUomList = delegator.findList("Uom", EntityCondition.makeCondition([uomTypeId : 'WEIGHT_MEASURE']), null, null, null, true);
+
+// area unit of measures
+context.areaUomList = delegator.findList("Uom", EntityCondition.makeCondition([uomTypeId : 'AREA_MEASURE']), null, null, null, true);

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl?rev=929503&r1=929502&r2=929503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl Wed Mar 31 12:37:39 2010
@@ -100,10 +100,25 @@ under the License.
     <td><input type="text" name="facilityName" value="${facility.facilityName?if_exists}" size="30" maxlength="60"></td>
   </tr>
   <tr>
-    <td class="label">${uiLabelMap.ProductSquareFootage}</td>
-    <td><input type="text" name="squareFootage" value="${facility.squareFootage?if_exists}" size="10" maxlength="20"></td>
+    <td class="label">${uiLabelMap.ProductFacilitySize}</td>
+    <td><input type="text" name="facilitySize" value="${facility.facilitySize?if_exists}" size="10" maxlength="20"></td>
   </tr>
   <tr>
+   <td class="label">${uiLabelMap.ProductFacilityDefaultAreaUnit}</td>
+    <td>
+      <select name="facilitySizeUomId">
+          <option value=''>${uiLabelMap.CommonNone}</option>
+          <#list areaUomList as uom>
+            <option value='${uom.uomId}'
+               <#if (facility.facilitySizeUomId?has_content) && (uom.uomId == facility.facilitySizeUomId)>
+               SELECTED
+               </#if>
+             >${uom.get("description",locale)?default(uom.uomId)}</option>
+          </#list>
+      </select>
+    </td>
+  </tr>  
+  <tr>
     <td class="label">${uiLabelMap.ProductProductDescription}</td>
     <td ><input type="text" name="description" value="${facility.description?if_exists}" size="60" maxlength="250"></td>
   </tr>

Modified: ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml?rev=929503&r1=929502&r2=929503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FacilityForms.xml Wed Mar 31 12:37:39 2010
@@ -40,7 +40,7 @@ under the License.
             <display-entity entity-name="FacilityType" description="${description}"/>
         </field>
         <field name="ownerPartyId" title="${uiLabelMap.ProductFacilityOwner}"><display/></field>
-        <field name="squareFootage" title="${uiLabelMap.ProductSqFt}"><display/></field>
+        <field name="facilitySize" title="${uiLabelMap.ProductFacilitySize}"><display/></field>
         <field name="description"><display/></field>
         <on-event-update-area event-type="paginate" area-id="search-results" area-target="FacilitySearchResults"/>
     </form>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=929503&r1=929502&r2=929503&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Wed Mar 31 12:37:39 2010
@@ -40,7 +40,7 @@ under the License.
             <display-entity entity-name="FacilityType" description="${description}"/>
         </field>
         <field name="ownerPartyId" title="${uiLabelMap.ProductFacilityOwner}"><display/></field>
-        <field name="squareFootage" title="${uiLabelMap.ProductSqFt}"><display/></field>
+        <field name="FacilitySize" title="${uiLabelMap.ProductFacilitySize}"><display/></field>
         <field name="description"><display/></field>
         <on-event-update-area event-type="paginate" area-id="search-results" area-target="FacilitySearchResults"/>
     </form>


Free forum by Nabble Edit this page