svn commit: r729467 - in /ofbiz/trunk/specialpurpose: mypage/script/org/ofbiz/mypage
Locked
svn commit: r729467 - in /ofbiz/trunk/specialpurpose: mypage/script/org/ofbiz/mypage
 
|
Author: hansbak
Date: Fri Dec 26 01:06:14 2008 New Revision: 729467 URL: http://svn.apache.org/viewvc?rev=729467&view=rev Log: several enhancements errorcorrection and rewritten billing overview report for an resource Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy (with props) Removed: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Fri Dec 26 01:06:14 2008 @@ -107,6 +107,9 @@ <if-not-empty field="emailOwners"> <set field="found" value="true"/> </if-not-empty> + <else> + <set field="found" value="true"/> + </else> </if-compare-field> </simple-method> <simple-method method-name="createCommunicationEventRoles" short-description=""> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Fri Dec 26 01:06:14 2008 @@ -260,8 +260,6 @@ <menu-item name="close" title="${uiLabelMap.CommonClose}"> <condition> <and> - <not><if-empty field-name="communicationEventRole"/></not> - <if-compare field-name="communicationEvent.statusId" operator="equals" value="COM_ROLE_READ"/> <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/> </and> </condition> Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Fri Dec 26 01:06:14 2008 @@ -595,6 +595,9 @@ <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸ªà¸´à¸à¸à¸´à¹à¹à¸à¸à¸²à¸£à¹à¸à¹à¸²à¸à¸¶à¸à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²#: ${timesheetId}</value> <value xml:lang="zh">ä½ æ²¡æ访é®è¯¥æ¶é´è¡¨çæéï¼${timesheetId}</value> </property> + <property key="ProjectMgrNonBilledActualHours"> + <value xml:lang="en">Act Hrs not billed</value> + </property> <property key="ProjectMgrNoPhasesYet"> <value xml:lang="en">No phases have been created yet, tasks can not exist without a phase as parent, so create a phase first</value> <value xml:lang="fr">Aucune phase n'a encore été créée, une tâche ne peut exister sans une phase comme ancêtre, veuillez créer une phase d'abord</value> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Fri Dec 26 01:06:14 2008 @@ -530,6 +530,9 @@ <if-empty field="parameters.projectId"> <return/> </if-empty> + <if-not-empty field="parameters.partyId"> + <set field="parameters.hoursPartyId" from-field="parameters.partyId"/> + </if-not-empty> <entity-one entity-name="WorkEffort" value-name="project"> <field-map field-name="workEffortId" env-name="parameters.projectId"/> </entity-one> @@ -1052,8 +1055,9 @@ <if-not-empty field="estimate.estimatedDuration"> <if-not-empty field="highInfo.plannedHours"> <calculate field-name="highInfo.plannedHours"> - <calcop operator="get" field-name="highInfo.plannedHours"></calcop> - <calcop operator="add" field-name="estimate.estimatedDuration"/> + <calcop operator="add" field-name="estimate.estimatedDuration"> + <calcop operator="get" field-name="highInfo.plannedHours"/> + </calcop> </calculate> <else> <set field="highInfo.plannedHours" from-field="estimate.estimatedDuration"/> @@ -1062,12 +1066,41 @@ </if-not-empty> </iterate> </if-not-empty> - <!-- get the actual hours --> + <!-- get the actual billed / non billed hours --> <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="actuals"/> <if-not-empty field="actuals"> <iterate entry-name="actual" list-name="actuals"> <if-not-empty field="actual.hours"> <get-related-one value-name="actual" relation-name="Timesheet" to-value-name="timesheet"/> + + <!-- check if only a part of the registered hours need to be taken into account --> + <set field="originalActualHours" from-field="actual.hours"/> + <entity-condition entity-name="PartyRate" list-name="partyRates"> + <condition-list combine="and"> + <condition-expr field-name="partyId" env-name="timesheet.partyId"/> + <condition-expr field-name="rateTypeId" env-name="actual.rateTypeId"/> + <condition-expr field-name="fromDate" operator="less-equals" env-name="actual.fromDate"/> + <condition-list combine="or"> + <condition-expr field-name="thruDate" operator="equals" env-name="nullField"/> + <condition-expr field-name="thruDate" operator="greater-equals" env-name="actual.fromDate"/> + </condition-list> + </condition-list> + </entity-condition> + <if-not-empty field="partyRates"> + <first-from-list entry-name="partyRate" list-name="partyRates"/> + <if-not-empty field="partyRate.percentageUsed"> + <calculate field-name="actual.hours"> + <calcop operator="multiply" field-name="actual.hours"> + <calcop operator="get" field-name="partyRate.percentageUsed"/> + </calcop> + </calculate> + <calculate field-name="actual.hours"> + <calcop operator="divide" field-name="actual.hours"> + <number value="100"/> + </calcop> + </calculate> + </if-not-empty> + </if-not-empty> <if> <condition> <or> @@ -1079,27 +1112,64 @@ </or> </condition> <then> + <if-not-empty field="highInfo.originalActualHours"> + <calculate field-name="highInfo.originalActualHours"> + <calcop operator="get" field-name="highInfo.originalActualHours"> + <calcop operator="add" field-name="originalActualHours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.originalActualHours" from-field="originalActualHours"/> + </else> + </if-not-empty> <if-not-empty field="highInfo.actualHours"> <calculate field-name="highInfo.actualHours"> - <calcop operator="get" field-name="highInfo.actualHours"/> - <calcop operator="add" field-name="actual.hours"></calcop> + <calcop operator="get" field-name="highInfo.actualHours"> + <calcop operator="add" field-name="actual.hours"/> + </calcop> </calculate> <else> <set field="highInfo.actualHours" from-field="actual.hours"/> </else> </if-not-empty> + <if-empty field="actual.invoiceId"> + <if-not-empty field="highInfo.actualNonBilledHours"> + <calculate field-name="highInfo.actualNonBilledHours"> + <calcop operator="get" field-name="highInfo.actualNonBilledHours"> + <calcop operator="add" field-name="actual.hours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.actualNonBilledHours" from-field="actual.hours"/> + </else> + </if-not-empty> + </if-empty> </then> </if> <!-- keep also a general total for the actual hours of all participants --> <if-not-empty field="highInfo.actualTotalHours"> <calculate field-name="highInfo.actualTotalHours"> - <calcop operator="get" field-name="highInfo.actualTotalHours"/> - <calcop operator="add" field-name="actual.hours"></calcop> + <calcop operator="add" field-name="actual.hours"> + <calcop operator="get" field-name="highInfo.actualTotalHours"/> + </calcop> </calculate> <else> <set field="highInfo.actualTotalHours" from-field="actual.hours"/> </else> </if-not-empty> + <!-- keep also a general total for the actual hours of all participants however not yet billed --> + <if-empty field="actual.invoiceId"> + <if-not-empty field="highInfo.actualNonBilledTotalHours"> + <calculate field-name="highInfo.actualNonBilledTotalHours"> + <calcop operator="add" field-name="actual.hours"> + <calcop operator="get" field-name="highInfo.actualNonBilledTotalHours"/> + </calcop> + </calculate> + <else> + <set field="highInfo.actualNonBilledTotalHours" from-field="actual.hours"/> + </else> + </if-not-empty> + </if-empty> </if-not-empty> </iterate> </if-not-empty> Modified: ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/servicedef/services.xml Fri Dec 26 01:06:14 2008 @@ -87,9 +87,10 @@ <service name="getProject" engine="simple" location="org/ofbiz/project/ProjectServices.xml" invoke="getProject"> - <description>Get project information and realated phase and task info.</description> + <description>Get project information and related phase and task info.</description> <permission-service service-name="projectMgrPermission" main-action="VIEW"/> <attribute name="projectId" type="String" mode="INOUT" optional="true"/> + <attribute name="partyId" type="String" mode="INOUT" optional="true"/> <attribute name="projectInfo" type="java.util.Map" mode="OUT" optional="true"/> </service> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy Fri Dec 26 01:06:14 2008 @@ -1,5 +1,4 @@ /* -/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information Added: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy?rev=729467&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy (added) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy Fri Dec 26 01:06:14 2008 @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.*; +import java.lang.*; +import org.ofbiz.entity.*; +import org.ofbiz.entity.condition.*; +import org.ofbiz.entity.util.*; +import org.ofbiz.base.util.*; +import javolution.util.FastMap; +import javolution.util.FastList; + + +cond = + EntityCondition.makeCondition( + [EntityCondition.makeCondition ("workEffortTypeId", EntityOperator.EQUALS, "PROJECT"), + EntityCondition.makeCondition ("partyId", EntityOperator.EQUALS, parameters.partyId) + ],EntityOperator.AND); +allProjects = delegator.findList("WorkEffortAndPartyAssign", cond, (HashSet) ["workEffortId"], ["workEffortName"], null, true); + +projects = []; +allProjects.each { project -> + result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId, partyId : parameters.partyId]); + projects.add(result.projectInfo); +} +if (projects) { + context.billingList = projects; +} + + Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Fri Dec 26 01:06:14 2008 @@ -598,9 +598,9 @@ <security https="true" auth="true"/> <response name="success" type="view" value="listResourcesProject"/> </request-map> - <request-map uri="ListResourcesUnBilledHours"> + <request-map uri="ListResourceBillingHours"> <security https="true" auth="true"/> - <response name="success" type="view" value="ListResourcesUnBilledHours"/> + <response name="success" type="view" value="ListResourceBillingHours"/> </request-map> <request-map uri="editperson"><security https="true" auth="true"/><response name="success" type="view" value="EditPerson"/></request-map> <request-map uri="updatePerson"> @@ -851,7 +851,7 @@ <view-map name="FindProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#FindProject"/> <view-map name="EditProject" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/> <view-map name="projectBilling" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#projectBilling"/> - <view-map name="ListResourcesUnBilledHours" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#ListUnBilledHours"/> + <view-map name="ListResourceBillingHours" type="screen" page="component://projectmgr/widget/ResourceScreens.xml#ListBillingHours"/> <view-map name="EditWorkEffort" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProject"/> <view-map name="ChildWorkEfforts" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#ChildWorkEfforts"/> <view-map name="EditProjectAndAssoc" type="screen" page="component://projectmgr/widget/ProjectScreens.xml#EditProjectAndAssoc"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Fri Dec 26 01:06:14 2008 @@ -441,8 +441,8 @@ <menu-item name="EditPartyRates" title="${uiLabelMap.ProjectMgrRates}"> <link target="EditPartyRates?partyId=${partyId}"></link> </menu-item> - <menu-item name="ListUnBilledHours" title="${uiLabelMap.ProjectMgrBilling}"> - <link target="ListResourcesUnBilledHours?partyId=${partyId}"></link> + <menu-item name="ListBillingHours" title="${uiLabelMap.ProjectMgrBilling}"> + <link target="ListResourceBillingHours?partyId=${partyId}"></link> </menu-item> </menu> <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ResourceScreens.xml Fri Dec 26 01:06:14 2008 @@ -48,21 +48,21 @@ </widgets> </section> </screen> - <screen name="ListUnBilledHours"> + <screen name="ListBillingHours"> <section> <actions> - <set field="titleProperty" value="PageTitleListUnbilledHours"/> - <set field="tabButtonItem" value="ListUnBilledHours"/> + <set field="titleProperty" value="PageTitleListBillingHours"/> + <set field="tabButtonItem" value="ListBillingHours"/> <set field="labelTitleProperty" value="ProjectMgrProjectName"/> <set field="partyId" from-field="parameters.partyId"/> - <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListUnBilledHoursResources.bsh"/> + <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy"/> </actions> <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet> <screenlet title="${uiLabelMap.ProjectMgrUnbilledHours}"> - <include-form name="ListUnBilledHours" location="component://projectmgr/widget/forms/ResourceForms.xml"/> + <include-form name="ListBillingHours" location="component://projectmgr/widget/forms/ResourceForms.xml"/> </screenlet> </screenlet> </decorator-section> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Fri Dec 26 01:06:14 2008 @@ -143,6 +143,7 @@ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> + <field name="actualNonBilledTotalHours" title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display/></field> <field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> </form> <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject" Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Fri Dec 26 01:06:14 2008 @@ -40,14 +40,12 @@ <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field> <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="removeResource?partyId=${partyId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field> </form> - <form name="ListUnBilledHours" type="list" list-name="unBilledList" paginate-target="ListResourcesUnBilledHours" + <form name="ListBillingHours" type="list" list-name="billingList" paginate-target="ListResourcesBillingHours" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="projectName"><display/></field> - <field name="phaseName"><display/></field> - <field name="taskName"><display/></field> - <field name="hours"><display/></field> - <field name="rate"><display/></field> - <field name="total"><display/></field> + <field name="projectName"><hyperlink target="projectView?projectId=${projectId}" description="${projectName} [${projectId}]"/></field> + <field name="originalActualHours"><display/></field> + <field name="actualHours"><display/></field> + <field name="actualNonBilledHours"><display/></field> </form> <form name="AddResource" type="single" target="addResource" header-row-style="header-row" default-table-style="basic-table"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=729467&r1=729466&r2=729467&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Fri Dec 26 01:06:14 2008 @@ -480,7 +480,7 @@ <field name="projectId"><hidden/></field> <field name="partyId" widget-style="buttontext"> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}"> - <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/> + <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/> </display-entity> </field> <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"> @@ -495,7 +495,7 @@ <form name="ListTaskParties" type="list" list-name="taskParties" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="partyId" title="${uiLabelMap.CommonName}"> - <hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyName}"/> + <hyperlink target="viewprofile?partyId=${partyId}" description="${partyName}"/> </field> <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |