Author: deepak
Date: Sat Jun 18 08:31:06 2016
New Revision: 1748931
URL:
http://svn.apache.org/viewvc?rev=1748931&view=revLog:
(OFBIZ-7301) Applied patch from jira issue
===================================
Add a look-up for Shipment Id and WorkEffort Id in Inventory Items Details screen under Facility Component
===================================
Thanks Pawan Verma for your contribution.
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1748931&r1=1748930&r2=1748931&view=diff==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sat Jun 18 08:31:06 2016
@@ -1347,6 +1347,8 @@ under the License.
<request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
<request-map uri="LookupInventoryItem"><security https="true" auth="true"/><response name="success" type="view" value="LookupInventoryItem"/></request-map>
<request-map uri="LookupContent"><security auth="true" https="true"/><response name="success" type="view" value="LookupContent"/></request-map>
+ <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map>
+ <request-map uri="LookupShipment"><security auth="true" https="true"/><response name="success" type="view" value="LookupShipment"/></request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -1448,6 +1450,8 @@ under the License.
<view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
<view-map name="LookupInventoryItem" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupInventoryItem"/>
<view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/>
+ <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/>
+ <view-map name="LookupShipment" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupShipment"/>
<!-- Shipment Gateway Config -->
<view-map name="FindShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfig" type="screen"/>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1748931&r1=1748930&r2=1748931&view=diff==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Sat Jun 18 08:31:06 2016
@@ -192,9 +192,9 @@ under the License.
<field name="orderId">
<lookup target-form-name="LookupOrderHeader"/>
</field>
- <field name="shipmentId"><text/></field>
+ <field name="shipmentId"><lookup target-form-name="LookupShipment"/></field>
<field name="returnId"><text/></field>
- <field name="workEffortId"><text/></field>
+ <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
<field name="reasonEnumId">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" key-field-name="enumId">
Locked
