svn commit: r1822411 - in /ofbiz/ofbiz-framework/trunk/a
Locked
 
|
Author: rishi
Date: Sat Jan 27 14:21:37 2018 New Revision: 1822411 URL: http://svn.apache.org/viewvc?rev=1822411&view=rev Log: Implemented: Implement and Apply Return Lookup. Added lookup with screen forms and controller entry. Use the same lookup on communication event return screen. (OFBIZ-10171) Thanks Ratnesh Upadhyay for reporting and providing fix for the issue. Thanks Yogesh Noaroliya for verification and details. Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml Modified: ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/config/OrderUiLabels.xml Sat Jan 27 14:21:37 2018 @@ -16057,4 +16057,7 @@ <value xml:lang="zh">æ´æ°ä¾¿ç¬º</value> <value xml:lang="zh-TW">æ´æ°ä¾¿ç®</value> </property> + <property key="PageTitleLookupReturnHeader"> + <value xml:lang="en">Lookup Return Header</value> + </property> </resource> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Sat Jan 27 14:21:37 2018 @@ -529,4 +529,51 @@ under the License. </field> <field name="shoppingListTypeId"><display-entity entity-name="ShoppingListType" also-hidden="true"/></field> </form> + + <form name="LookupReturnHeader" target="LookupReturnHeader" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="ReturnHeader" default-field-type="find" map-name="parameters"/> + <field name="returnId"><text-find/></field> + <field name="returnHeaderTypeId"> + <drop-down allow-empty="true"> + <entity-options entity-name="ReturnHeaderType" key-field-name="returnHeaderTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="statusId" title="${uiLabelMap.CommonStatus}"> + <drop-down allow-empty="true"> + <entity-options entity-name="StatusItem" key-field-name="statusId"> + <entity-constraint name="statusTypeId" operator="equals" value="ORDER_RETURN_STTS"/> + </entity-options> + </drop-down> + </field> + <field name="currencyUomId"> + <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> + <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom"> + <entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="ListLookupReturnHeader" title="" type="list" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupReturnHeader"> + <actions> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" value="ReturnHeader"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> + </actions> + <auto-fields-entity entity-name="ReturnHeader" default-field-type="display"/> + <field name="returnId" widget-style="buttontext"> + <hyperlink target-type="plain" also-hidden="true" description="${returnId}" target="javascript:set_value('${returnId}')"/> + </field> + <field name="returnHeaderTypeId"><display-entity entity-name="ReturnHeaderType" also-hidden="true"/></field> + </form> </forms> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml Sat Jan 27 14:21:37 2018 @@ -273,4 +273,31 @@ under the License. </widgets> </section> </screen> + <screen name="LookupReturnHeader"> + <section> + <condition> + <if-has-permission permission="ORDERMGR" action="_VIEW"/> + </condition> + <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupReturnHeader"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> + <set field="entityName" value="ReturnHeader"/> + <set field="searchFields" value="[returnId]"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="LookupReturnHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListLookupReturnHeader" location="component://order/widget/ordermgr/FieldLookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jan 27 14:21:37 2018 @@ -1192,6 +1192,7 @@ under the License. <request-map uri="LookupEmploymentApp"><security auth="true" https="true"/><response name="success" type="view" value="LookupEmploymentApp"/></request-map> <request-map uri="LookupEmplPosition"><security auth="true" https="true"/><response name="success" type="view" value="LookupEmplPosition"/></request-map> <request-map uri="LookupOrderHeader"><security auth="true" https="true"/><response name="success" type="view" value="LookupOrderHeader"/></request-map> + <request-map uri="LookupReturnHeader"><security auth="true" https="true"/><response name="success" type="view" value="LookupReturnHeader"/></request-map> <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map> <!-- Financial History Report--> @@ -1421,6 +1422,7 @@ under the License. <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/> <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> + <view-map name="LookupReturnHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupReturnHeader"/> <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> <view-map name="ViewSimpleContent" page="" type="simplecontent"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Sat Jan 27 14:21:37 2018 @@ -1100,7 +1100,7 @@ under the License. <form name="AddCommReturn" type="single" target="createCommunicationEventReturn" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId"><hidden/></field> - <field name="returnId"><text/></field> + <field name="returnId"><lookup target-form-name="LookupReturnHeader"/></field> <field name="submitButton" title="${uiLabelMap.PartyReturnAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Sat Jan 27 14:21:37 2018 @@ -1339,6 +1339,7 @@ under the License. <request-map uri="LookupOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeaderAndShipInfo"/></request-map> <request-map uri="LookupPurchaseOrderHeaderAndShipInfo"><security https="true" auth="true"/><response name="success" type="view" value="LookupPurchaseOrderHeaderAndShipInfo"/></request-map> <request-map uri="LookupOrderHeader"><security https="true" auth="true"/><response name="success" type="view" value="LookupOrderHeader"/></request-map> + <request-map uri="LookupReturnHeader"><security https="true" auth="true"/><response name="success" type="view" value="LookupReturnHeader"/></request-map> <request-map uri="LookupProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupProduct"/></request-map> <request-map uri="LookupVariantProduct"><security auth="true" https="true"/><response name="success" type="view" value="LookupVariantProduct"/></request-map> <request-map uri="LookupProductCategory"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductCategory"/></request-map> @@ -1443,6 +1444,7 @@ under the License. <view-map name="LookupOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeaderAndShipInfo"/> <view-map name="LookupPurchaseOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupPurchaseOrderHeaderAndShipInfo"/> <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> + <view-map name="LookupReturnHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupReturnHeader"/> <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> <view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/> <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1822411&r1=1822410&r2=1822411&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityForms.xml Sat Jan 27 14:21:37 2018 @@ -190,7 +190,7 @@ under the License. <lookup target-form-name="LookupOrderHeader"/> </field> <field name="shipmentId"><lookup target-form-name="LookupShipment"/></field> - <field name="returnId"><text/></field> + <field name="returnId"><lookup target-form-name="LookupReturnHeader"/></field> <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> <field name="reasonEnumId"> <drop-down allow-empty="true"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |