svn commit: r1603460 - in /ofbiz/trunk/applications/product/widget/facility: FacilityMenus.xml FacilityScreens.xml

[ja...@apache.org]

Author: jacopoc
Date: Wed Jun 18 14:25:16 2014
New Revision: 1603460

URL: http://svn.apache.org/r1603460
Log:
Fixed issue reported by Pierre Smits in OFBIZ-5274: the menu label "Edit Agreement" was misleading because the screen simply shows the agreements associated to the facility; the agreement type used in the screen doesn't exist in OFBiz; this is because this code (committed by Adam Heath) is a partial implementation of a feature than in its current status is only confusing.
  Now the screen only shows the agreements associated to the facility but in order to setup an agreement you have to use the Agreement screens of the Accounting application.

Modified:
    ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml
    ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml?rev=1603460&r1=1603459&r2=1603460&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml Wed Jun 18 14:25:16 2014
@@ -161,7 +161,7 @@ under the License.
                 <parameter param-name="facilityId"/>
             </link>
         </menu-item>
-        <menu-item name="EditFacilityAgreements" title="${uiLabelMap.PageTitleEditAgreement}">
+        <menu-item name="EditFacilityAgreements" title="${uiLabelMap.PageTitleViewFacilityAgreements}">
             <link target="EditFacilityAgreements">
                 <parameter param-name="facilityId"/>
             </link>

Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1603460&r1=1603459&r2=1603460&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Jun 18 14:25:16 2014
@@ -1552,18 +1552,12 @@ under the License.
                 <set field="facilityId" from-field="parameters.facilityId"/>
                 <entity-and entity-name="AgreementItemAndFacilityAppl" list="facilityAgreements">
                     <field-map field-name="facilityId"/>
-                    <field-map field-name="agreementTypeId" value="FACILITY_AGREEMENT"/>
                     <order-by field-name="fromDate"/>
                 </entity-and>
             </actions>
             <widgets>
                 <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
                     <decorator-section name="body">
-                        <container>
-                            <link target="/accounting/control/EditAgreement" url-mode="inter-app" text="${uiLabelMap.PageTitleEditAgreement}" style="buttontext">
-                                <parameter param-name="facilityId"/>
-                            </link>
-                        </container>
                         <screenlet title="${uiLabelMap.FacilityAgreements}">
                             <include-form name="ListFacilityAgreements" location="component://product/widget/facility/FacilityForms.xml"/>
                         </screenlet>