svn commit: r1618406 - in /ofbiz/trunk/applications/prod
Locked
 
|
Author: ashish
Date: Sat Aug 16 19:45:41 2014 New Revision: 1618406 URL: http://svn.apache.org/r1618406 Log: Applied patch from jira issue - OFBIZ-5480 - Product Costs page missing lookup controls in creation section. Thanks Christian Carlow for reporting the issue and thanks to ofbiz.us team for providing patch for the issue. Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1618406&r1=1618405&r2=1618406&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Aug 16 19:45:41 2014 @@ -10329,6 +10329,9 @@ <value xml:lang="zh">æ¹éæ·»å ä¾è´§å产å</value> <value xml:lang="zh_TW">æ¹éæ·»å ä¾è²¨åç¢å</value> </property> + <property key="PageTitleLookupCostComponentCalc"> + <value xml:lang="en">Lookup Cost Component Calculation</value> + </property> <property key="PageTitleLookupFacility"> <value xml:lang="de">Einrichtung nachschlagen</value> <value xml:lang="en">Lookup Facility</value> @@ -14314,6 +14317,12 @@ <value xml:lang="zh">æ产ååç±»æåå¤å¶å°å¦ä¸ä¸ªåç±»</value> <value xml:lang="zh_TW">æç¢ååé¡æå¡è¤å¶å°å¦ä¸ååé¡</value> </property> + <property key="ProductCostComponentCalcId"> + <value xml:lang="en">Cost Component Calc Id</value> + </property> + <property key="ProductCostGlAccountTypeId"> + <value xml:lang="en">Cost Gl Account Type Id</value> + </property> <property key="ProductCostPrice"> <value xml:lang="de">Kosten Preis</value> <value xml:lang="en">Cost Price</value> @@ -21907,6 +21916,9 @@ <value xml:lang="zh">å¶é åç»çæ è¯ </value> <value xml:lang="zh_TW">製é å給çID </value> </property> + <property key="ProductOffsettingGlAccountTypeId"> + <value xml:lang="en">Off Setting GL Account Type Id</value> + </property> <property key="ProductOneInventoryFacility"> <value xml:lang="de">Eine Lagereinrichtung</value> <value xml:lang="en">One Inventory Facility</value> Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1618406&r1=1618405&r2=1618406&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Aug 16 19:45:41 2014 @@ -2974,6 +2974,7 @@ under the License. <request-map uri="LookupProductStore"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductStore"/></request-map> <request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map> <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map> + <request-map uri="LookupCostComponentCalc"><security https="true" auth="true"/><response name="success" type="view" value="LookupCostComponentCalc"/></request-map> <request-map uri="LookupDataResource"><security auth="true" https="true"/><response name="success" type="view" value="LookupDataResource"/></request-map> <request-map uri="LookupPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerson"/></request-map> <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map> @@ -3254,6 +3255,7 @@ under the License. <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/> <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/> <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> + <view-map name="LookupCostComponentCalc" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupCostComponentCalc"/> <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> @@ -3286,4 +3288,4 @@ under the License. <view-map name="LookupImageFrame" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImageFrame"/> <view-map name="ImageResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageResize"/> <!-- end of view mappings --> -</site-conf> +</site-conf> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml?rev=1618406&r1=1618405&r2=1618406&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/FieldLookupForms.xml Sat Aug 16 19:45:41 2014 @@ -338,4 +338,42 @@ under the License. <field name="storeName"><display/></field> <!-- <field name="companyName"><display/></field> --> </form> -</forms> + <form name="lookupCostComponentCalc" target="LookupCostComponentCalc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> + <field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}"><text-find/></field> + <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> + <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}"> + <drop-down allow-empty="true"> + <entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId"> + <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.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + <form name="listLookupCostComponentCalc" list-name="listIt" title="" type="list" paginate-target="LookupCostComponentCalc" + odd-row-style="alternate-row" default-table-style="basic-table" view-size="20"> + <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="CostComponentCalc"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> + </actions> + <field name="costComponentCalcId" title="${uiLabelMap.ProductCostComponentCalcId}" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${costComponentCalcId}" target="javascript:set_value('${costComponentCalcId}')"/> + </field> + <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> + <field name="costGlAccountTypeId" title="${uiLabelMap.ProductCostGlAccountTypeId}"><display/></field> + <field name="offsettingGlAccountTypeId" title="${uiLabelMap.ProductOffsettingGlAccountTypeId}"><display/></field> + </form> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1618406&r1=1618405&r2=1618406&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/LookupScreens.xml Sat Aug 16 19:45:41 2014 @@ -223,4 +223,31 @@ under the License. </widgets> </section> </screen> -</screens> + <screen name="LookupCostComponentCalc"> + <section> + <condition> + <if-service-permission service-name="catalogPermissionCheck" main-action="VIEW"/> + </condition> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.PageTitleLookupCostComponentCalc}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> + <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> + <set field="entityName" value="CostComponentCalc"/> + <set field="searchFields" value="[costComponentCalcId, description, costGlAccountTypeId, offsettingGlAccountTypeId]"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="lookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="listLookupCostComponentCalc" location="component://product/widget/catalog/FieldLookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1618406&r1=1618405&r2=1618406&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Aug 16 19:45:41 2014 @@ -1313,6 +1313,12 @@ under the License. <field name="productId"><hidden/></field> <field name="costComponentId" use-when="costComponent!=null"><display/></field> <field name="costComponentId" use-when="costComponent==null"><hidden/></field> + <field name="productFeatureId"><lookup target-form-name="LookupProductFeature"/></field> + <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="geoId"><lookup target-form-name="LookupGeo"/></field> + <field name="workEffortId"><lookup target-form-name="LookupWorkEffort"/></field> + <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> + <field name="costComponentCalcId"><lookup target-form-name="LookupCostComponentCalc"/></field> <field name="costComponentTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="CostComponentType" description="${description}"> @@ -2253,4 +2259,4 @@ under the License. <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - </forms> + </forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |