Author: sichen
Date: Fri Sep 15 18:33:36 2006
New Revision: 446803
URL: http://svn.apache.org/viewvc?view=rev&rev=446803
Log:
Changed default product type of facility inventory view report by
FINISHED_GOOD. Also added a search by beginning of productId
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh?view=diff&rev=446803&r1=446802&r2=446803
==============================================================================
---
incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
(original)
+++
incubator/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
Fri Sep 15 18:33:36 2006
@@ -113,6 +113,10 @@
whereConditionsList.add(new EntityExpr("internalName", true,
EntityOperator.LIKE, "%" + internalName + "%", true));
}
+ // add search on productId
+ if (UtilValidate.isNotEmpty(productId)) {
+ whereConditionsList.add(new EntityExpr("productId", true,
EntityOperator.LIKE, productId + "%", true));
+ }
EntityCondition whereCondition = new
EntityConditionList(whereConditionsList, EntityOperator.AND);
boolean beganTransaction = false;
Modified:
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?view=diff&rev=446803&r1=446802&r2=446803
==============================================================================
---
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
Fri Sep 15 18:33:36 2006
@@ -23,11 +23,14 @@
default-title-style="tableheadtext"
default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="facilityId"><hidden/></field>
<field name="action"><hidden value="SEARCH"/></field>
+ <field name="productId" title="${uiLabelMap.ProductProductId}"
widget-style="inputBox">
+ <text/>
+ </field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"
widget-style="inputBox">
<text/>
</field>
<field name="productTypeId" title="${uiLabelMap.ProductProductType}"
widget-style="selectBox">
- <drop-down allow-empty="true">
+ <drop-down allow-empty="true"
no-current-selected-key="FINISHED_GOOD">
<entity-options entity-name="ProductType"
description="${description}"> <!-- [${productTypeId}] -->
<entity-constraint name="isPhysical" value="Y"
operator="equals"/>
<entity-constraint name="parentTypeId" value="GOOD"
operator="equals"/>
Modified:
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?view=diff&rev=446803&r1=446802&r2=446803
==============================================================================
---
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Fri Sep 15 18:33:36 2006
@@ -215,7 +215,8 @@
<set field="offsetATPQty"
from-field="parameters.offsetATPQty"/>
<set field="productsSoldThruTimestamp"
from-field="parameters.productsSoldThruTimestamp"/>
<set field="internalName"
from-field="parameters.internalName"/>
-
+ <set field="productId" from-field="parameters.productId"/>
+
<script
location="component://product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh"/>
</actions>
<widgets>
