svn commit: r815159 - in /ofbiz/branches/release09.04: ./ applications/product/webapp/facility/facility/FacilityForms.xml

Author: jleroux
Date: Tue Sep 15 06:19:24 2009
New Revision: 815159

URL: http://svn.apache.org/viewvc?rev=815159&view=rev
Log:
"Applied fix from trunk for revision: 815158  "
------------------------------------------------------------------------
r815158 | jleroux | 2009-09-15 08:16:46 +0200 (mar. 15 sept. 2009) | 2 lignes

This file was missing in r814681
Thanks to Arun Patidar for reminder
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityForms.xml

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 06:19:24 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158

Modified: ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityForms.xml?rev=815159&r1=815158&r2=815159&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityForms.xml Tue Sep 15 06:19:24 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="FindFacility" type="list" list-name="listIt" paginate-target="FindFacility"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
@@ -422,13 +422,6 @@
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"
         paginate-target="${facilityInventoryByProductScreen}" override-list-size="${overrideListSize}">
         <row-actions>
-            <service service-name="getProductInventoryAndFacilitySummary" result-map="resultMap">
-                <field-map field-name="minimumStock" from-field="minimumStock"/>
-                <field-map field-name="productId" from-field="productId"/>
-                <field-map field-name="facilityId" from-field="facilityId"/>
-                <field-map field-name="checkTime" from-field="checkTime"/>
-                <field-map field-name="statusId" from-field="statusId"/>
-            </service>
         </row-actions>
         <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
             <hyperlink target="EditFacilityInventoryItems" description="${productId}">
@@ -443,18 +436,18 @@
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="totalAvailableToPromise" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductAtp}"><display description="${resultMap.totalAvailableToPromise}"/></field>
-        <field name="totalQuantityOnHand" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductQoh}"><display description="${resultMap.totalQuantityOnHand}"/></field>
-        <field name="quantityOnOrder" title="${uiLabelMap.ProductOrderedQuantity}"><display description="${resultMap.quantityOnOrder}"/></field>
-        <field name="minimumStock" title="${uiLabelMap.ProductMinimumStock}"><display /></field>
+        <field name="totalAvailableToPromise" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductAtp}"><display/></field>
+        <field name="totalQuantityOnHand" title="${uiLabelMap.CommonTotal} ${uiLabelMap.ProductQoh}"><display/></field>
+        <field name="quantityOnOrder" title="${uiLabelMap.ProductOrderedQuantity}"><display/></field>
+        <field name="minimumStock" title="${uiLabelMap.ProductMinimumStock}"><display/></field>
         <field name="reorderQuantity" title="${uiLabelMap.ProductReorderQuantity}"><display/></field>
         <field name="daysToShip" title="${uiLabelMap.ProductDaysToShip}"><display/></field>
-        <field name="offsetQOHQtyAvailable" title="${uiLabelMap.ProductQtyOffsetQOH}"><display description="${resultMap.offsetQOHQtyAvailable}"/></field>
-        <field name="offsetATPQtyAvailable" title="${uiLabelMap.ProductQtyOffsetATP}"><display description="${resultMap.offsetATPQtyAvailable}"/></field>
-        <field name="usageQuantity" title="${uiLabelMap.ProductUsage}"><display description="${resultMap.usageQuantity}"/></field>
-        <field name="defaultPrice" title="${uiLabelMap.ProductDefaultPrice}"><display description="${resultMap.defultPrice}"/></field>
-        <field name="listPrice" title="${uiLabelMap.ProductListPrice}"><display description="${resultMap.listPrice}"/></field>
-        <field name="wholeSalePrice" title="${uiLabelMap.ProductWholeSalePrice}"><display description="${resultMap.wholeSalePrice}"/></field>
+        <field name="offsetQOHQtyAvailable" title="${uiLabelMap.ProductQtyOffsetQOH}"><display/></field>
+        <field name="offsetATPQtyAvailable" title="${uiLabelMap.ProductQtyOffsetATP}"><display/></field>
+        <field name="usageQuantity" title="${uiLabelMap.ProductUsage}"><display/></field>
+        <field name="defaultPrice" title="${uiLabelMap.ProductDefaultPrice}"><display/></field>
+        <field name="listPrice" title="${uiLabelMap.ProductListPrice}"><display/></field>
+        <field name="wholeSalePrice" title="${uiLabelMap.ProductWholeSalePrice}"><display/></field>
     </form>
 
     <!-- multi-form for list of packages ready to be weighted and scheduled for shipment -->