OFBiz › OFBiz - Commits

svn commit: r762215 [3/9] - in /ofbiz/trunk: applications/accounting/webapp/accounting/agreement/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accounting/payment...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r762215 [3/9] - in /ofbiz/trunk: applications/accounting/webapp/accounting/agreement/ applications/accounting/webapp/accounting/fixedasset/ applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accounting/payment...

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Mon Apr 6 06:25:24 2009
@@ -51,34 +51,34 @@
<field name="contentName"><display/></field>
<field name="edit" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
- <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
- <parameter param-name="caFromDate" from-field="caFromDate"/>
+ <parameter param-name="caContentAssocTypeId"/>
+ <parameter param-name="caFromDate"/>
</hyperlink>
</field>
<field name="edit" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
- <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
- <parameter param-name="caFromDate" from-field="caFromDate"/>
+ <parameter param-name="caContentAssocTypeId"/>
+ <parameter param-name="caFromDate"/>
</hyperlink>
</field>
<field name="edit" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
- <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
- <parameter param-name="caFromDate" from-field="caFromDate"/>
+ <parameter param-name="caContentAssocTypeId"/>
+ <parameter param-name="caFromDate"/>
</hyperlink>
</field>
<field name="edit" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
- <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
- <parameter param-name="caFromDate" from-field="caFromDate"/>
+ <parameter param-name="caContentAssocTypeId"/>
+ <parameter param-name="caFromDate"/>
</hyperlink>
</field>
<field name="tree" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
@@ -142,26 +142,26 @@
<field name="comments"><display/></field>
<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevision">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</hyperlink>
</field>
<field name="itemLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</hyperlink>
</field>
<field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevision">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</hyperlink>
</field>
<field name="tree" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)">
@@ -203,19 +203,19 @@
<field name="newDataResourceId"><display/></field>
<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="itemContentId" from-field="itemContentId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="itemContentId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</hyperlink>
</field>
<field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</hyperlink>
</field>
</form>
@@ -297,9 +297,9 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
<hyperlink target="removeContentApproval" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="contentApprovalId" from-field="contentApprovalId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentApprovalId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</hyperlink>
</field>
</form>
@@ -471,7 +471,7 @@
<hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
<parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
</hyperlink>
</field>
<field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
@@ -480,7 +480,7 @@
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
<parameter param-name="surveyResponseId" from-field="dataResource.relatedDetailId"/>
<parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
</hyperlink>
</field>

@@ -548,10 +548,10 @@

<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="approvalCount > 0">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="itemContentId" from-field="itemContentId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="itemContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId/>
</hyperlink>
</field>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Mon Apr 6 06:25:24 2009
@@ -42,8 +42,8 @@
</or>
</condition>
<link target="ViewCompDocTemplateTree">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="viewtree2" title="${uiLabelMap.ContentCompDocViewTree}">
@@ -54,26 +54,26 @@
</or>
</condition>
<link target="ViewCompDocInstanceTree">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="edit" title="${uiLabelMap.CommonEdit}">
<link target="EditRootCompDoc">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="approval" title="${uiLabelMap.ContentCompDocApprovals}">
<link target="ListContentApproval">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="revision" title="${uiLabelMap.ContentCompDocRevisions}">
<link target="ListContentRevisions">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</menu-item>
</menu>
@@ -88,8 +88,8 @@
</or>
</condition>
<link target="ViewCompDocTemplateTree">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="viewtree2" title="${uiLabelMap.PageTitleViewCompDocTree}">
@@ -100,16 +100,16 @@
</or>
</condition>
<link target="ViewCompDocInstanceTree">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="edit" title="${uiLabelMap.CommonEdit}">
<link target="EditChildCompDoc" >
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="itemContentRevisionSeqId" from-field="itemContentRevisionSeqId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="itemContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
<parameter param-name="caFromDate" from-field="parameters.caFromDate"/>
</link>
</menu-item>
@@ -119,13 +119,13 @@
selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple">
<menu-item name="edit-inplace" title="${contentName}[${contentId}]" widget-style="h2">
<link target="EditRootCompDoc">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
</link>
</menu-item>
<menu-item name="edit-link" title="${uiLabelMap.CommonEdit}">
<link target="EditRootCompDoc">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
</link>
</menu-item>
@@ -149,13 +149,13 @@

</menu-item>
</menu>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Mon Apr 6 06:25:24 2009
@@ -52,8 +52,8 @@
<decorator-section name="body">
<container>
<link target="ListWaitingContentApproval" text="${uiLabelMap.ContentCompDocViewWaitingApprovals}" style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
</link>
</container>
<section>
@@ -423,20 +423,20 @@
<decorator-section name="body">
<container>
<link target="FindCompDoc" style="buttontext" text="${uiLabelMap.CommonFind">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="rootTemplateContentId" from-field="rootTemplateContentId"/>
- <parameter param-name="rootTemplateRevSeqId" from-field="rootTemplateRevSeqId"/>
- <parameter param-name="rootInstanceContentId" from-field="rootInstanceContentId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="rootTemplateContentId"/>
+ <parameter param-name="rootTemplateRevSeqId"/>
+ <parameter param-name="rootInstanceContentId"/>
<parameter param-name="rootInstanceRevSeqId" from-field="rootInstanceRevSeqId}"/>
</link>
<link target="AddRootCompDocTemplate" text="${ContentCreateNewRootCompDocTemplate}" style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
- <parameter param-name="rootTemplateContentId" from-field="rootTemplateContentId"/>
- <parameter param-name="rootTemplateRevSeqId" from-field="rootTemplateRevSeqId"/>
- <parameter param-name="rootInstanceContentId" from-field="rootInstanceContentId"/>
- <parameter param-name="rootInstanceRevSeqId" from-field="rootInstanceRevSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
+ <parameter param-name="rootTemplateContentId"/>
+ <parameter param-name="rootTemplateRevSeqId"/>
+ <parameter param-name="rootInstanceContentId"/>
+ <parameter param-name="rootInstanceRevSeqId"/>
</link>
</container>
</decorator-section>
@@ -480,8 +480,8 @@
<widgets>
<container>
<link target="AddRootCompDocTemplate" text="${uiLabelMap.PageTitleCreateNewRootCompDocTemplate}" style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentRevisionSeqId"/>
</link>
</container>
<include-form name="ListCompDocInstances" location="component://content/widget/compdoc/CompDocForms.xml"/>
@@ -544,7 +544,7 @@
<parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
</link>
<link target="ViewInstances">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
</link>
</container>
@@ -678,8 +678,8 @@
<container>
<label style="tableheadtext" text="${uiLabelMap.ContentCompDocRevisions} [${rootContentRevisionSeqId}], Latest is [${mostRecentRevisionSeqId}]"/>
<link style="buttontext" text="${uiLabelMap.ContentLatest}" target="EditChildCompDoc">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="caFromDate" from-field="fromDate"/>
</link>
<include-screen name="ContentViewLink"/>
@@ -756,9 +756,9 @@
<widgets>
<container>
<link target="ViewCompDocContentBinary" text="${uiLabelMap.PageTitleViewCompDocContentBinary}" style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId" from-field="itemContentRevisionSeqId"/>
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
</link>
</container>
</widgets>
@@ -775,7 +775,7 @@
<widgets>
<container>
<link target="ViewCompDocContentHtml" text="${uiLabelMap.PageTitleViewCompDocContentHtml}" style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="contentRevisionSeqId" from-field="itemContentRevisionSeqId"/>
<parameter param-name="rootContentId"/>
</link>
@@ -1106,12 +1106,12 @@
<decorator-section name="body">
<container>
<link target="ViewInstances" text="${uiLabelMap.ContentCompDocViewInstances}" style="buttontext">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
</link>
<link target="AddRootCompDocInstance" text="${uiLabelMap.PageTitleCreateInstanceOfThisTemplate}" style="buttontext">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</container>
<include-tree name="CompDocTemplateTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/>
@@ -1205,8 +1205,8 @@
</condition>
<widgets>
<link text="${uiLabelMap.ContentCompDocStartApprovalProcess}" target="prepForApproval" style="buttontext">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
</widgets>
</section>
@@ -1278,7 +1278,7 @@
</condition>
<widgets>
<link text="${uiLabelMap.PageTitleAddCompDocInstance}" target="AddChildCompDocInstance" style="buttontext">
- <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentId"/>
<parameter param-name="instanceOfContentId" from-field="contentId"/>
<parameter param-name="caSequenceNum" from-field="maxRevisionSeqId"/>
</link>
@@ -1304,7 +1304,7 @@
<parameter param-name="caContentAssocTypeId" from-field="assocRevisionItemView.contentAssocTypeId"/>
<parameter param-name="caFromDate" from-field="assocRevisionItemView.fromDate"/>
<parameter param-name="contentRevisionSeqId" from-field="assocRevisionItemView.maxRevisionSeqId"/>
- <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ <parameter param-name="rootContentRevisionSeqId"/>
</link>
<link text="${uiLabelMap.ContentCompDocGeneratePDF}" target="GenContentPdf" style="buttontext">
<parameter param-name="contentId" from-field="assocRevisionItemView.contentId"/>

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Mon Apr 6 06:25:24 2009
@@ -74,7 +74,7 @@
<field name="contentName" widget-style="tabletext">
<display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
<sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -87,14 +87,14 @@
<field name="dataResourceId" use-when="dataResourceId!=null">
<display-entity entity-name="DataResource" description="${dataResourceName}">
<sub-hyperlink target="EditDataResource" link-style="buttontext" description="[${dataResourceId}]">
- <parameter param-name="dataResourceId" from-field="dataResourceId"/>
+ <parameter param-name="dataResourceId"/>
</sub-hyperlink>
</display-entity>
</field>
<field name="ownerContentId">
<display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
<sub-hyperlink target="editContent" description="[${contentId}]" link-style="buttontext">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -289,10 +289,10 @@
<field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentIdTo" from-field="contentIdTo"/>
- <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentIdTo"/>
+ <parameter param-name="contentAssocTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
<field name="thruDate"><date-time/></field>
@@ -310,7 +310,7 @@
<field name="contentId">
<display-entity entity-name="Content" description="${contentName},${description}">
<sub-hyperlink target="EditContentAssoc" description="${contentId}" link-style="tabletext">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -320,10 +320,10 @@
<field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentIdTo" from-field="contentIdTo"/>
- <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentIdTo"/>
+ <parameter param-name="contentAssocTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
<field name="thruDate"><date-time/></field>
@@ -371,10 +371,10 @@
</field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="roleTypeId" from-field="roleTypeId"/>
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -404,8 +404,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurpose">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentPurposeTypeId" from-field="contentPurposeTypeId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentPurposeTypeId"/>
</hyperlink>
</field>
</form>
@@ -431,8 +431,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAttribute">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="attrName" from-field="attrName"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="attrName"/>
</hyperlink>
</field>
</form>
@@ -469,8 +469,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentMetaData">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="metaDataPredicateId" from-field="metaDataPredicateId"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="metaDataPredicateId"/>
</hyperlink>
</field>
</form>
@@ -521,7 +521,7 @@
<field name="workEffortId" widget-style="tabletext">
<display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}" also-hidden="true">
<sub-hyperlink target="/workeffort/control/EditWorkEffort" description="${workEffortId}" link-style="buttontext" target-type="inter-app">
- <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="workEffortId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -531,10 +531,10 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent">
- <parameter param-name="workEffortContentTypeId" from-field="workEffortContentTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
- <parameter param-name="workEffortId" from-field="workEffortId"/>
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="workEffortContentTypeId"/>
+ <parameter param-name="fromDate"/>
+ <parameter param-name="workEffortId"/>
+ <parameter param-name="contentId"/>
</hyperlink>
</field>
</form>
@@ -569,10 +569,10 @@
<field name="createdDate"><display description="${content.createdDate}"/></field>
<field name="delete" title="${uiLabelMap.CommonDelete}">
<hyperlink target="removeDocumentFromTree" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="contentId" from-field="contentId"/>
- <parameter param-name="contentIdTo" from-field="contentIdTo"/>
- <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentIdTo"/>
+ <parameter param-name="contentAssocTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Mon Apr 6 06:25:24 2009
@@ -70,7 +70,7 @@
<field name="dataResourceName" widget-style="tabletext">
<display-entity entity-name="DataResource" description="${dataResourceName}" key-field-name="dataResourceId">
<sub-hyperlink target="EditDataResource" description="[${dataResourceId}]" link-style="buttontext">
- <parameter param-name="dataResourceId" from-field="dataResourceId"/>
+ <parameter param-name="dataResourceId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -203,7 +203,7 @@
</actions>
<field name="contentId" widget-style="buttontext">
<hyperlink also-hidden="false" description="${contentId}" target="/EditContent">
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
</hyperlink>
</field>
<field name="contentName"><display/></field>
@@ -346,8 +346,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceAttribute">
- <parameter param-name="dataResourceId" from-field="dataResourceId"/>
- <parameter param-name="attrName" from-field="attrName"/>
+ <parameter param-name="dataResourceId"/>
+ <parameter param-name="attrName"/>
</hyperlink>
</field>
</form>
@@ -378,10 +378,10 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole">
- <parameter param-name="dataResourceId" from-field="dataResourceId"/>
- <parameter param-name="roleTypeId" from-field="roleTypeId"/>
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="dataResourceId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -405,8 +405,8 @@
<auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceProductFeature">
- <parameter param-name="dataResourceId" from-field="dataResourceId"/>
- <parameter param-name="productFeatureId" from-field="productFeatureId"/>
+ <parameter param-name="dataResourceId"/>
+ <parameter param-name="productFeatureId"/>
</hyperlink>
</field>
</form>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Mon Apr 6 06:25:24 2009
@@ -59,7 +59,7 @@
<hyperlink target="updateForum">
<parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
<parameter param-name="contentIdTo" from-field="parameters.forumGroupId"/>
- <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentId"/>
<parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/>
<parameter param-name="fromDate" from-field="caFromDate"/>
<parameter param-name="deactivateExisting" value="yes"/>

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Mon Apr 6 06:25:24 2009
@@ -37,85 +37,85 @@
type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="EditEmployment" title="${uiLabelMap.HumanResEmployment}">
<link target="EditEmployment" >
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</link>
</menu-item>
<menu-item name="EditPartyBenefit" title="${uiLabelMap.HumanResEditPartyBenefit}">
<link target="EditPartyBenefits" >
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</link>
</menu-item>
<menu-item name="EditPayrollPreference" title="${uiLabelMap.HumanResEditPayrollPreference}">
<link target="EditPayrollPreferences" >
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</link>
</menu-item>
<menu-item name="EditPayHistory" title="${uiLabelMap.HumanResEditPayHistory}">
<link target="ListPayHistories" >
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</link>
</menu-item>
<menu-item name="EditUnemploymentClaims" title="${uiLabelMap.HumanResEditUnemploymentClaim}">
<link target="EditUnemploymentClaims" >
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</link>
</menu-item>
<menu-item name="EditAgreementEmploymentAppls" title="${uiLabelMap.HumanResAgreementEmploymentAppl}">
<link target="EditAgreementEmploymentAppls">
- <parameter param-name="agreementId" from-field="agreementId"/>
- <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="agreementId"/>
+ <parameter param-name="agreementItemSeqId"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</link>
</menu-item>
</menu>
<menu name="EmplPostionBar" default-menu-item-name="EmplPositionView" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="EmplPositionView" title="${uiLabelMap.CommonSummary}">
<link target="emplPositionView">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="emplPositionId"/>
</link>
</menu-item>
<menu-item name="EditEmplPosition" title="${uiLabelMap.HumanResEmployeePosition}">
<link target="EditEmplPosition">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="emplPositionId"/>
</link>
</menu-item>
<menu-item name="EditEmplPositionFulfillments" title="${uiLabelMap.HumanResPositionFulfillments}">
<link target="EditEmplPositionFulfillments">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="emplPositionId"/>
</link>
</menu-item>
<menu-item name="EditEmplPositionResponsibilities" title="${uiLabelMap.HumanResEmplPositionResponsibilities}">
<link target="EditEmplPositionResponsibilities">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="emplPositionId"/>
</link>
</menu-item>
<menu-item name="EditEmplPositionReportingStructs" title="${uiLabelMap.HumanResEmplPositionReportingStruct}">
<link target="EditEmplPositionReportingStructs">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="emplPositionId"/>
</link>
</menu-item>
</menu>
@@ -123,7 +123,7 @@
type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}">
<link target="EditPerfReviewItems">
- <parameter param-name="perfReviewId" from-field="perfReviewId"/>
+ <parameter param-name="perfReviewId"/>
</link>
</menu-item>
</menu>
@@ -131,12 +131,12 @@
type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="subTabButtonItem">
<menu-item name="EditPayGrade" title="${uiLabelMap.HumanResPayGrade}">
<link target="EditPayGrade">
- <parameter param-name="payGradeId" from-field="payGradeId"/>
+ <parameter param-name="payGradeId"/>
</link>
</menu-item>
<menu-item name="EditSalaryStep" title="${uiLabelMap.HumanResEditSalaryStep}">
<link target="EditSalarySteps">
- <parameter param-name="payGradeId" from-field="payGradeId"/>
+ <parameter param-name="payGradeId"/>
</link>
</menu-item>
</menu>
@@ -171,7 +171,7 @@
default-menu-item-name="EditEmployeeSkills">
<menu-item name="EmployeeProfile" title="${uiLabelMap.PartyProfile}">
<link target="EmployeeProfile">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</link>
</menu-item>
<menu-item name="ListEmployment" title="${uiLabelMap.HumanResEmployment}">
@@ -186,38 +186,38 @@
</menu-item>
<menu-item name="EditEmployeeSkills" title="${uiLabelMap.HumanResSkills}">
<link target="EditEmployeeSkills">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</link>
</menu-item>
<menu-item name="EditEmployeeQuals" title="${uiLabelMap.HumanResPartyQualification}">
<link target="EditEmployeeQuals">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</link>
</menu-item>
<menu-item name="EditEmployeeTrainings" title="${uiLabelMap.HumanResTraining}">
<link target="EditEmployeeTrainings">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</link>
</menu-item>

<menu-item name="EditEmployeeLeaves" title="${uiLabelMap.HumanResEmplLeave}">
<link target="EditEmployeeLeaves">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</link>
</menu-item>
</menu>
@@ -226,12 +226,12 @@
default-menu-item-name="EditEmplPositionType" selected-menuitem-context-field-name="tabButtonItem2">
<menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEmplPositionType}">
<link target="EditEmplPositionTypes">
- <parameter param-name="emplPositionTypeId" from-field="emplPositionTypeId"/>
+ <parameter param-name="emplPositionTypeId"/>
</link>
</menu-item>
<menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}">
<link target="EditEmplPositionTypeRates">
- <parameter param-name="emplPositionTypeId" from-field="emplPositionTypeId"/>
+ <parameter param-name="emplPositionTypeId"/>
</link>
</menu-item>
</menu>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Mon Apr 6 06:25:24 2009
@@ -76,7 +76,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmplLeaveType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="leaveTypeId" from-field="leaveTypeId"/>
+ <parameter param-name="leaveTypeId"/>
</hyperlink>
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Mon Apr 6 06:25:24 2009
@@ -32,13 +32,13 @@
<auto-fields-entity entity-name="EmplPosition" default-field-type="display"/>
<field name="emplPositionId" title="${uiLabelMap.HumanResEmployeePositionId}" widget-style="linktext">
<hyperlink also-hidden="false" description="${emplPositionId}" target="emplPositionView">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="emplPositionId"/>
</hyperlink>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -72,7 +72,7 @@
<field name="partyId" use-when="emplPosition!=null" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -108,7 +108,7 @@
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -117,9 +117,9 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmplPositionFulfillment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="emplPositionId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -149,9 +149,9 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmplPositionReportingStruct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="emplPositionIdReportingTo" from-field="emplPositionIdReportingTo"/>
- <parameter param-name="emplPositionIdManagedBy" from-field="emplPositionIdManagedBy"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="emplPositionIdReportingTo"/>
+ <parameter param-name="emplPositionIdManagedBy"/>
+ <parameter param-name="fromDate"/>
<parameter param-name="emplPositionId" from-field="parameters.emplPositionId"/>
</hyperlink>
</field>
@@ -182,9 +182,9 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmplPositionReportingStruct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="emplPositionIdReportingTo" from-field="emplPositionIdReportingTo"/>
- <parameter param-name="emplPositionIdManagedBy" from-field="emplPositionIdManagedBy"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="emplPositionIdReportingTo"/>
+ <parameter param-name="emplPositionIdManagedBy"/>
+ <parameter param-name="fromDate"/>
<parameter param-name="emplPositionId" from-field="parameters.emplPositionId"/>
</hyperlink>
</field>
@@ -213,9 +213,9 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmplPositionResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="emplPositionId" from-field="emplPositionId"/>
- <parameter param-name="responsibilityTypeId" from-field="responsibilityTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="emplPositionId"/>
+ <parameter param-name="responsibilityTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -245,8 +245,8 @@
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteValidResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="emplPositionTypeId" from-field="emplPositionId"/>
- <parameter param-name="responsibilityTypeId" from-field="responsibilityTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="responsibilityTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Mon Apr 6 06:25:24 2009
@@ -97,8 +97,8 @@
<field name="skillLevel"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmployeeSkill" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="skillTypeId" from-field="skillTypeId"/>
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="skillTypeId"/>
+ <parameter param-name="partyId"/>
</hyperlink>
</field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
@@ -164,9 +164,9 @@
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmployeeQualification" also-hidden="false" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="partyQualTypeId" from-field="partyQualTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="partyQualTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
@@ -199,9 +199,9 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmployeeTraining" also-hidden="false" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="trainingClassTypeId" from-field="trainingClassTypeId"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="trainingClassTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Mon Apr 6 06:25:24 2009
@@ -61,9 +61,9 @@
<field name="applicationDate" title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteEmploymentApp" description="${uiLabelMap.CommonDelete}" also-hidden="true">
- <parameter param-name="applicationId" from-field="applicationId"/>
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="referredByPartyId" from-field="referredByPartyId"/>
+ <parameter param-name="applicationId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="referredByPartyId"/>
</hyperlink>
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Mon Apr 6 06:25:24 2009
@@ -69,11 +69,11 @@
<field name="terminationTypeId"><display/></field>
<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="fromDate"/>
+ <parameter param-name="roleTypeIdTo"/>
</hyperlink>
</field>
</form>
@@ -97,11 +97,11 @@
<field name="terminationTypeId"><display/></field>
<field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="fromDate"/>
+ <parameter param-name="roleTypeIdTo"/>
</hyperlink>
</field>
</form>
@@ -174,11 +174,11 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="deletePayHistory" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
- <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
- <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
- <parameter param-name="partyIdTo" from-field="partyIdTo"/>
- <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -261,9 +261,9 @@
<field name="thruDate"><date-time/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deletePayrollPreference" description="${uiLabelMap.CommonDelete}" also-hidden="true">
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="roleTypeId" from-field="roleTypeId"/>
- <parameter param-name="payrollPreferenceSeqId" from-field="payrollPreferenceSeqId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="payrollPreferenceSeqId"/>
</hyperlink>
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
@@ -308,7 +308,7 @@
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="/partymgr/control/viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
</field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Mon Apr 6 06:25:24 2009
@@ -30,7 +30,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteSkillType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="skillTypeId" from-field="skillTypeId"/>
+ <parameter param-name="skillTypeId"/>
</hyperlink>
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
@@ -52,7 +52,7 @@
<field name="responsibilityTypeId" title="${uiLabelMap.HumanResResponsibilityTypeId}"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteResponsibilityType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="responsibilityTypeId" from-field="responsibilityTypeId"/>
+ <parameter param-name="responsibilityTypeId"/>
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
@@ -75,7 +75,7 @@
<field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteTerminationType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="terminationTypeId" from-field="terminationTypeId"/>
+ <parameter param-name="terminationTypeId"/>
</hyperlink>
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
@@ -110,7 +110,7 @@
<auto-fields-service service-name="updateEmplPositionType" default-field-type="hidden"/>
<field name="emplPositionTypeId" title="${uiLabelMap.HumanResEmplPositionType}">
<hyperlink also-hidden="false" description="${emplPositionTypeId}" target="EditEmplPositionTypes">
- <parameter param-name="emplPositionTypeId" from-field="emplPositionTypeId"/>
+ <parameter param-name="emplPositionTypeId"/>
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -198,7 +198,7 @@
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deleteTerminationReason" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="terminationReasonId" from-field="terminationReasonId"/>
+ <parameter param-name="terminationReasonId"/>
</hyperlink>
</field>
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Mon Apr 6 06:25:24 2009
@@ -64,7 +64,7 @@
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
</field>
@@ -91,8 +91,8 @@
<field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deletePartyQual" also-hidden="false" description="${uiLabelMap.CommonDelete}">
- <parameter param-name="partyId" from-field="partyId"/>
- <parameter param-name="partyQualTypeId" from-field="partyQualTypeId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="partyQualTypeId"/>
</hyperlink>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=762215&r1=762214&r2=762215&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Mon Apr 6 06:25:24 2009
@@ -40,19 +40,19 @@
<auto-fields-entity entity-name="PartyResume" default-field-type="display"/>
<field name="resumeId" widget-style="linktext">
<hyperlink also-hidden="false" description="${resumeId}" target="EditPartyResume">
- <parameter param-name="resumeId" from-field="resumeId"/>
+ <parameter param-name="resumeId"/>
</hyperlink>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
<sub-hyperlink target="viewprofile" link-style="smallSubmit" target-type="inter-app" description="${partyId}">
- <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyId"/>
</sub-hyperlink>
</display-entity>
</field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="deletePartyResume" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="resumeId" from-field="resumeId"/>
+ <parameter param-name="resumeId"/>
</hyperlink>
</field>
</form>