OFBiz › OFBiz - Commits

svn commit: r1768219 [8/18] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ a...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

diveshdutta

svn commit: r1768219 [8/18] - in /ofbiz/trunk: applications/accounting/minilang/ applications/accounting/minilang/admin/ applications/accounting/minilang/agreement/ applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ a...

Modified: ofbiz/trunk/applications/party/minilang/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartyServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartyServices.xml Sat Nov 5 14:14:04 2016
@@ -180,7 +180,7 @@ under the License.
<simple-method method-name="createPartyIdentifications" short-description="create mass party identification with association between value and type">
<set field="partyIdentCtx.partyId" from-field="parameters.partyId"/>
<iterate-map key="key" value="value" map="parameters.identifications">
- <entity-one value-field="identificationType" entity-name="PartyIdentificationType" use-cache="true">
+ <entity-one entity-name="PartyIdentificationType" value-field="identificationType" use-cache="true">
<field-map field-name="partyIdentificationTypeId" from-field="value"/>
</entity-one>
<if-not-empty field="identificationType">
@@ -245,7 +245,7 @@ under the License.

<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set-service-fields service-name="createDataResource" map="parameters" to-map="dataResource"/>

<set from-field="parameters._uploadedFile_fileName" field="dataResource.dataResourceName"/>
@@ -339,7 +339,7 @@ under the License.

<set from-field="parameters._uploadedFile_contentType" field="extenLookup.mimeTypeId"/>
<find-by-and entity-name="FileExtension" map="extenLookup" list="extensions"/>
- <first-from-list entry="extension" list="extensions"/>
+ <first-from-list list="extensions" entry="extension"/>
<set-service-fields service-name="createDataResource" map="parameters" to-map="dataResource"/>


@@ -619,7 +619,7 @@ under the License.
</entity-and>
</if-empty>
<if-not-empty field="emailAddresses">
- <first-from-list entry="emailAddress" list="emailAddresses"/>
+ <first-from-list list="emailAddresses" entry="emailAddress"/>
<field-to-result field="emailAddress.infoString" result-name="emailAddress"/>
<field-to-result field="emailAddress.contactMechId" result-name="contactMechId"/>
</if-not-empty>
@@ -673,7 +673,7 @@ under the License.
<else>
<find-by-and entity-name="PartyAndContactMech" map="findMap" list="telephoneAll1"/>
<filter-list-by-date list="telephoneAll1" to-list="telephoneAll2"/>
- <first-from-list entry="telephone" list="telephoneAll2"/>
+ <first-from-list list="telephoneAll2" entry="telephone"/>
<field-to-result field="telephone.contactMechId" result-name="contactMechId"/>
<if-not-empty field="telephone.tnCountryCode">
<field-to-result field="telephone.tnCountryCode" result-name="countryCode"/>
@@ -746,7 +746,7 @@ under the License.
<else>
<find-by-and entity-name="PartyAndContactMech" map="findMap" list="addressAll1"/>
<filter-list-by-date list="addressAll1" to-list="addressAll2"/>
- <first-from-list entry="address" list="addressAll2"/>
+ <first-from-list list="addressAll2" entry="address"/>
<field-to-result field="address.contactMechId" result-name="contactMechId"/>
<if-not-empty field="address.paAddress1">
<field-to-result field="address.paAddress1" result-name="address1"/>
@@ -836,7 +836,7 @@ under the License.
<simple-method method-name="createPartyRelationshipContactAccount" short-description="create a company/contact relationship and add the related roles">
<set field="roleMap.partyId" from-field="parameters.accountPartyId"/>
<set field="roleMap.roleTypeId" value="ACCOUNT"/>
- <entity-one value-field="partyRole" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" from-field="roleMap.partyId"/>
<field-map field-name="roleTypeId" from-field="roleMap.roleTypeId"/>
</entity-one>
@@ -845,7 +845,7 @@ under the License.
</if-empty>
<set field="roleMap.partyId" from-field="parameters.contactPartyId"/>
<set field="roleMap.roleTypeId" value="CONTACT"/>
- <entity-one value-field="partyRole" entity-name="PartyRole">
+ <entity-one entity-name="PartyRole" value-field="partyRole">
<field-map field-name="partyId" from-field="roleMap.partyId"/>
<field-map field-name="roleTypeId" from-field="roleMap.roleTypeId"/>
</entity-one>
@@ -876,7 +876,7 @@ under the License.
<entity-and entity-name="WebSite" list="webSites">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
</entity-and>
- <first-from-list entry="webSite" list="webSites"/>
+ <first-from-list list="webSites" entry="webSite"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<entity-one entity-name="Person" value-field="person"/>
<set field="bodyParameters.person" from-field="person"/>
@@ -909,7 +909,7 @@ under the License.
<entity-and entity-name="WebSite" list="webSites">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
</entity-and>
- <first-from-list entry="webSite" list="webSites"/>
+ <first-from-list list="webSites" entry="webSite"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<if-not-empty field="parameters.updatedUserLogin.partyId">
<set field="partyId" from-field="parameters.updatedUserLogin.partyId"/>
@@ -923,7 +923,7 @@ under the License.
<condition-expr field-name="partyId" operator="equals" from-field="partyId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
+ <first-from-list list="partyContactDetailByPurposes" entry="partyContactDetailByPurpose"/>
<entity-one entity-name="PartyAndPerson" value-field="partyAndPerson"/>
<set field="bodyParameters.partyAndPerson" from-field="partyAndPerson"/>
<set field="contactMechId" from-field="partyContactDetailByPurpose.contactMechId"/>
@@ -1043,7 +1043,7 @@ under the License.
<entity-and entity-name="WebSite" list="webSites">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/>
</entity-and>
- <first-from-list entry="webSite" list="webSites"/>
+ <first-from-list list="webSites" entry="webSite"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<entity-one entity-name="UserLogin" value-field="userLoginParty"/>
<set field="parameters.partyId" from-field="userLoginParty.partyId"/>
@@ -1053,7 +1053,7 @@ under the License.
<condition-expr field-name="partyId" operator="equals" from-field="parameters.partyId"/>
</condition-list>
</entity-condition>
- <first-from-list entry="partyContactDetailByPurpose" list="partyContactDetailByPurposes"/>
+ <first-from-list list="partyContactDetailByPurposes" entry="partyContactDetailByPurpose"/>
<entity-one entity-name="Person" value-field="person"/>
<set field="bodyParameters.person" from-field="person"/>
<set field="emailParams.bodyParameters" from-field="bodyParameters"/>

Modified: ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml (original)
+++ ofbiz/trunk/applications/party/minilang/party/PartySimpleMethods.xml Sat Nov 5 14:14:04 2016
@@ -236,7 +236,7 @@ under the License.
<simple-method method-name="deleteBillingAccount" short-description="delete billing account">
<now-timestamp field="nowTimestamp"/>
<set field="parameters.thruDate" from-field="nowTimestamp"/>
- <set-service-fields service-name="updateBillingAccount" to-map="deleteBillingAccountCtx" map="parameters"/>
+ <set-service-fields service-name="updateBillingAccount" map="parameters" to-map="deleteBillingAccountCtx"/>/>
<call-service service-name="updateBillingAccount" in-map-name="deleteBillingAccountCtx"/>
</simple-method>
</simple-methods>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Sat Nov 5 14:14:04 2016
@@ -174,10 +174,10 @@ under the License.
<field name="contentMimeTypeId"><hidden value="text/plain"/></field>
<field name="content" title="${uiLabelMap.CommonContent}" encode-output="false"><textarea cols="72" rows="15" default-value="${parameters.content}"/></field>
<field name="send" title=" " position="1" use-when="communicationEvent!=null">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.submit())" also-hidden="false" target-type="plain"/>
</field>
<field name="save" title=" " position="2" use-when="communicationEvent!=null">
- <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.form.value='list'),(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())" also-hidden="false" target-type="plain"/>
</field>
<field name="createButton" use-when="communicationEvent==null"><submit/></field>
<field name="dummy" position="320"><hidden/></field>
@@ -211,7 +211,7 @@ under the License.
target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.statusId.value='COM_ENTERED'),(document.EditInternalNote.datetimeStarted.value='${nowDate}'),(document.EditInternalNote.submit())"/>
</field>
<field name="save" title=" " position="2" use-when="communicationEvent!=null">
- <hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.submit())"/>
+ <hyperlink description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.form.value='list'),(document.EditInternalNote.submit())" also-hidden="true" target-type="plain"/>
</field>
<field name="createButton" use-when="communicationEvent==null"><submit/></field>
<field name="dummy" position="320"><hidden/></field>
@@ -470,7 +470,7 @@ under the License.
</service>
</actions>
<field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}">
- <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="inter-app"/>
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/>
</field>
<field name="communicationEventId">
<hyperlink description="${communicationEventId}" target="ViewCommunicationEvent">
@@ -657,7 +657,7 @@ under the License.
<display-entity entity-name="CommunicationEventPrpTyp"/>
</field>
<field name="removeLink" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose" also-hidden="false">
<parameter param-name="communicationEventPrpTypId"/>
<parameter param-name="communicationEventId"/>
</hyperlink>
@@ -733,7 +733,7 @@ under the License.
<field name="fromDate"><hidden/></field>
<field name="my"><hidden/></field>
<field name="contentName">
- <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+ <hyperlink description="${contentName} [${contentId}]" target="ViewSimpleContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="dataResourceId"/>
<parameter param-name="communicationEventId"/>
@@ -832,7 +832,7 @@ under the License.
</field>
<field name="surveyResponseLink" map-name="dummy" widget-style="smallSubmit"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")==null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
- <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+ <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" target-window="_blank" also-hidden="false">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
</hyperlink>
</field>
@@ -1010,7 +1010,7 @@ under the License.
<set field="orderTypeId" from-field="orderHeader.orderTypeId"/>
</row-actions>
<field name="orderId" title="${uiLabelMap.FormFieldTitle_orderId}" widget-style="buttontext">
- <hyperlink target="/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="inter-app"/>
+ <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}" target-type="inter-app"/>
</field>
<field name="communicationEventId"><hidden/></field>
<field name="orderTypeId" title="${uiLabelMap.OrderOrderType}">

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Nov 5 14:14:04 2016
@@ -31,7 +31,7 @@ under the License.
<decorator-section name="pre-body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="CommEventTabBar"/>
@@ -42,7 +42,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<decorator-section-include name="body"/>
@@ -71,7 +71,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<decorator-section-include name="body"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml Sat Nov 5 14:14:04 2016
@@ -47,7 +47,7 @@ under the License.
</actions>

<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType"/>
@@ -87,7 +87,7 @@ under the License.
</row-actions>

<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${contactMechId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${contactMechId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="name" title="${uiLabelMap.PartyName}"><display/></field>
<field name="infoString" title="${uiLabelMap.PartyEmailAddress}"><display/></field>
@@ -117,7 +117,7 @@ under the License.
<script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType"/>
@@ -158,7 +158,7 @@ under the License.
</service>
</actions>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
<display-entity also-hidden="false" entity-name="PartyType"/>
@@ -186,7 +186,7 @@ under the License.
</actions>

<field name="partyId" widget-style="smallSubmit" title="${uiLabelMap.PartyPartyId}">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
<field name="middleName" title="${uiLabelMap.PartyMiddleInitial}"><display/></field>
@@ -222,7 +222,7 @@ under the License.
<display description="${partyId}"/>
</field>
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
</field>
<field name="lastName" title="${uiLabelMap.PartyName}"><display description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
</form>
@@ -248,7 +248,7 @@ under the License.
<script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
</actions>
<field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
+ <hyperlink description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display description="${partyId}"/>
@@ -276,7 +276,7 @@ under the License.
<field name="groupName" title="${uiLabelMap.PartyGroupName}"><display/></field>
<field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
+ <hyperlink description="${partyId}" target="javascript:set_value('${partyId}')" also-hidden="false" target-type="plain"/>
</field>
</form>

@@ -307,7 +307,7 @@ under the License.
</actions>

<field name="partyClassificationGroupId" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
+ <hyperlink description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyClassificationTypeId"><display/></field>
<field name="parentGroupId"><display/></field>
@@ -367,7 +367,7 @@ under the License.
</service>
</actions>
<field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
+ <hyperlink description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
<display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Sat Nov 5 14:14:04 2016
@@ -36,7 +36,7 @@ under the License.
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deletePartyClassification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyClassification" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>
@@ -50,7 +50,7 @@ under the License.
<entity-condition entity-name="PartyClassificationGroup"/>
</actions>
<field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" widget-style="buttontext">
- <hyperlink target="EditPartyClassificationGroup" description="${partyClassificationGroupId}" also-hidden="false">
+ <hyperlink description="${partyClassificationGroupId}" target="EditPartyClassificationGroup" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
</hyperlink>
</field>
@@ -60,7 +60,7 @@ under the License.
<field name="parentGroupId"><display/></field>
<field name="description" title=" "><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyClassificationGroup" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyClassificationGroup" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
</hyperlink>
</field>
@@ -98,7 +98,7 @@ under the License.
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>

@@ -114,7 +114,7 @@ under the License.
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>

@@ -141,7 +141,7 @@ under the License.
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deletePartyClassification" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyClassification" also-hidden="false">
<parameter param-name="partyClassificationGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="fromDate"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListForms.xml Sat Nov 5 14:14:04 2016
@@ -76,7 +76,7 @@ under the License.
<field name="statusId">
<drop-down no-current-selected-key="CLPT_PENDING">
<entity-options entity-name="StatusItem">
- <entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
+ <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -98,7 +98,7 @@ under the License.
<entity-condition entity-name="ContactList"/>
</actions>
<field name="contactListId" widget-style="smallSubmit">
- <hyperlink also-hidden="false" target-type="plain" description="${contactListId}" target="javascript:set_value('${contactListId}')"/>
+ <hyperlink description="${contactListId}" target="javascript:set_value('${contactListId}')" also-hidden="false" target-type="plain"/>
</field>
<field name="contactListName"><display/></field>
<field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Sat Nov 5 14:14:04 2016
@@ -35,7 +35,7 @@ under the License.
<section>

<condition>
- <if-has-permission action="_VIEW" permission="PARTYMGR"/>
+ <if-has-permission permission="PARTYMGR" action="_VIEW"/>
</condition>
<widgets>
<screenlet id="AddPartyContactListPanel" title="${uiLabelMap.PartyContactListPartyCreate}" collapsible="true">

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Sat Nov 5 14:14:04 2016
@@ -144,7 +144,7 @@ under the License.
</service>
</row-actions>
<field name="partyId" sort-field="true">
- <hyperlink target="viewprofile" description="${partyId}">
+ <hyperlink description="${partyId}" target="viewprofile">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -256,7 +256,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -291,7 +291,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -355,7 +355,7 @@ under the License.
<drop-down allow-empty="false" no-current-selected-key="N"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
- <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink target="backHome" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="backHome" also-hidden="false"/></field>
</form>

<form name="UpdatePassword" type="single" target="updatePassword"
@@ -371,7 +371,7 @@ under the License.
<field name="newPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -389,7 +389,7 @@ under the License.
<field name="userLdapDn" use-when="!"true".equals(ldapEnabled)"><ignored/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -502,7 +502,7 @@ under the License.
<field name="fromDate" title="${uiLabelMap.CommonFromDateTime}"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deletePartyTaxAuthInfo" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyTaxAuthInfo" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="taxAuthPartyId"/>
<parameter param-name="taxAuthGeoId"/>
@@ -526,7 +526,7 @@ under the License.
<field name="note"><textarea cols="70" rows="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -693,7 +693,7 @@ under the License.
<display-entity entity-name="RoleType"/>
</field>
<field name="deleteLink" title=" " widget-style="smallSubmit">
- <hyperlink target="deleteSegmentGroupRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteSegmentGroupRole" also-hidden="false">
<parameter param-name="segmentGroupId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
@@ -716,7 +716,7 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>

@@ -730,7 +730,7 @@ under the License.
<field use-when="attribute!=null" name="attrName" tooltip="${uiLabelMap.PartyNotModifRecreateAttribute}"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="${cancelPage}" also-hidden="false">
<parameter param-name="partyId"/>
</hyperlink>
</field>
@@ -850,7 +850,7 @@ under the License.
<field name="fromDate"><display type="date-time"></display></field>
<field name="thruDate"><display type="date-time"></display></field>
<field name="editLink" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditPartyContents">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="EditPartyContents" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="partyId"/>
<parameter param-name="dataResourceId"/>
@@ -859,7 +859,7 @@ under the License.
</hyperlink>
</field>
<field name="remove" title=" " widget-style="smallSubmit">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonRemove}" target="removePartyContent">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="removePartyContent" also-hidden="false">
<parameter param-name="contentId"/>
<parameter param-name="partyId"/>
<parameter param-name="dataResourceId"/>
@@ -916,7 +916,7 @@ under the License.
<field name="fromDate"><display/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
- <hyperlink target="updatePartyCarrierAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="updatePartyCarrierAccount" also-hidden="false">
<parameter param-name="partyId"/>
<parameter param-name="carrierPartyId"/>
<parameter param-name="fromDate"/>
@@ -931,7 +931,7 @@ under the License.
<field name="partyId"><hidden/></field>
<field name="carrierPartyId">
<drop-down allow-empty="false">
- <entity-options entity-name="PartyRole" description="${partyId}" key-field-name="partyId">
+ <entity-options entity-name="PartyRole" key-field-name="partyId" description="${partyId}">
<entity-constraint name="roleTypeId" operator="equals" value="CARRIER"/>
<entity-constraint name="partyId" operator="not-equals" value="_NA_"/>
</entity-options>
@@ -1197,7 +1197,7 @@ under the License.
<field name="description" title="${uiLabelMap.PartyRole}"><display/></field>
<field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId"/></field>
<field name="remove">
- <hyperlink target="deleterole" description="${uiLabelMap.CommonRemove}">
+ <hyperlink description="${uiLabelMap.CommonRemove}" target="deleterole">
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>
@@ -1280,7 +1280,7 @@ under the License.
</form>
<form name="PartySalesOpportunities" type="list" list-name="salesOpportunities" default-table-style="basic-table hover-bar">
<field name="opportunityName" title="${uiLabelMap.SfaOpportunityName}">
- <hyperlink target="ViewSalesOpportunity" description="${opportunityName} [${salesOpportunityId}]">
+ <hyperlink description="${opportunityName} [${salesOpportunityId}]" target="ViewSalesOpportunity">
<parameter param-name="salesOpportunityId"/>
</hyperlink>
</field>
@@ -1301,7 +1301,7 @@ under the License.
<field name="partyIdentTypeDesc"><display /></field>
<field name="idValue"><display /></field>
<field name="delete">
- <hyperlink target="deletePartyIdentification" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyIdentification">
<parameter param-name="partyId"/>
<parameter param-name="partyIdentificationTypeId"/>
</hyperlink>
@@ -1372,7 +1372,7 @@ under the License.
<field name="thruDate"><display/></field>
<field name="sequenceNum"><display/></field>
<field name="editLink" widget-style="buttontext" title="${uiLabelMap.CommonEdit}">
- <hyperlink target="FindProductStoreRoles" description="${uiLabelMap.CommonEdit}">
+ <hyperlink description="${uiLabelMap.CommonEdit}" target="FindProductStoreRoles">
<parameter param-name="partyId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="roleTypeId"/>
@@ -1380,7 +1380,7 @@ under the License.
</hyperlink>
</field>
<field name="deleteLink" widget-style="buttontext" title="${uiLabelMap.CommonDelete}">
- <hyperlink target="storeRemoveRole" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="storeRemoveRole">
<parameter param-name="partyId"/>
<parameter param-name="productStoreId"/>
<parameter param-name="roleTypeId"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Sat Nov 5 14:14:04 2016
@@ -58,7 +58,7 @@ under the License.
</service>
</actions>
<field name="partyInvitationId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
+ <hyperlink description="${partyInvitationId}" target="editPartyInvitation" also-hidden="false">
<parameter param-name="partyInvitationId"/>
</hyperlink>
</field>
@@ -69,7 +69,7 @@ under the License.
<field name="statusId"><display-entity entity-name="StatusItem"/></field>
<field name="lastInviteDate"><display/></field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyInvitation" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyInvitation">
<parameter param-name="partyInvitationId" from-field="partyInvitationId"/>
</hyperlink>
</field>
@@ -107,7 +107,7 @@ under the License.
</entity-condition>
</actions>
<field name="partyInvitationId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
+ <hyperlink description="${partyInvitationId}" target="editPartyInvitation" also-hidden="false">
<parameter param-name="partyInvitationId"/>
</hyperlink>
</field>
@@ -119,7 +119,7 @@ under the License.
</display-entity>
</field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyInvitationGroupAssoc" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyInvitationGroupAssoc">
<parameter param-name="partyInvitationId"/>
<parameter param-name="partyIdTo"/>
</hyperlink>
@@ -150,13 +150,13 @@ under the License.
</entity-condition>
</actions>
<field name="partyInvitationId" widget-style="buttontext">
- <hyperlink also-hidden="false" description="${partyInvitationId}" target="editPartyInvitation">
+ <hyperlink description="${partyInvitationId}" target="editPartyInvitation" also-hidden="false">
<parameter param-name="partyInvitationId"/>
</hyperlink>
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
<field name="remove" title=" " widget-style="buttontext">
- <hyperlink target="deletePartyInvitationRoleAssoc" description="${uiLabelMap.CommonDelete}">
+ <hyperlink description="${uiLabelMap.CommonDelete}" target="deletePartyInvitationRoleAssoc">
<parameter param-name="partyInvitationId"/>
<parameter param-name="roleTypeId"/>
</hyperlink>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml Sat Nov 5 14:14:04 2016
@@ -26,14 +26,14 @@ under the License.
<field name="partyId"><hidden/></field>
<field name="avsDeclineString" title="${uiLabelMap.PartyAvsString}"><text size="60" maxlength="250"/></field>
<field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="smallSubmit"><submit button-type="text-link"/></field>
- <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink target="backHome" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+ <field name="cancelLink" title=" " widget-style="smallSubmit"><hyperlink description="[${uiLabelMap.CommonCancelDone}]" target="backHome" also-hidden="false"/></field>
</form>

<form name="EditBillingAccount" type="single" target="updateBillingAccount" extends="EditBillingAccount" extends-resource="component://accounting/widget/BillingAccountForms.xml">
<field name="submitButton"><hidden/></field>
<field name="saveButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="buttontext">
- <hyperlink target="viewprofile" description="${uiLabelMap.CommonCancelDone}">
+ <hyperlink description="${uiLabelMap.CommonCancelDone}" target="viewprofile">
<parameter param-name="partyId" from-field="partyId"/>
</hyperlink>
</field>

Modified: ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/catalog/CatalogServices.xml Sat Nov 5 14:14:04 2016
@@ -100,7 +100,7 @@ under the License.

<simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false">

- <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/>
+ <set-service-fields service-name="getAllCategories" map="parameters" to-map="categoryFindContext"/>
<call-service service-name="getAllCategories" in-map-name="categoryFindContext">
<result-to-field result-name="categories" field="categories"/>
</call-service>
@@ -121,7 +121,7 @@ under the License.

<simple-method method-name="checkImageUrlForCategoryAndProduct" short-description="Check for image url exists or not for category and product " login-required="false">

- <set-service-fields to-map="productCategoryContext" service-name="getProductCategoryMembers" map="parameters"/>
+ <set-service-fields service-name="getProductCategoryMembers" map="parameters" to-map="productCategoryContext"/>
<call-service service-name="getProductCategoryMembers" in-map-name="productCategoryContext" >
<result-to-field result-name="categoryMembers" field="categoryMembers"/>
<result-to-field result-name="category" field="category"/>
@@ -462,7 +462,7 @@ under the License.
<iterate list="parameters.productCategories" entry="productCategoryList">

<if-empty field="category">
- <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryContentAndInfo" list="productCategoryContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
<condition-expr field-name="prodCatContentTypeId" value="ALTERNATIVE_URL"/>
@@ -475,7 +475,7 @@ under the License.
<set field="createSimpleTextContentForCategoryCtx.localeString" value="en"/>
<set field="createSimpleTextContentForCategoryCtx.productCategoryId" from-field="productCategoryList.productCategoryId"/>
<if-empty field="productCategoryList.categoryName">
- <entity-condition list="productCategoryContentList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryContentAndInfo" list="productCategoryContentList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
<condition-expr field-name="prodCatContentTypeId" value="CATEGORY_NAME"/>
@@ -483,7 +483,7 @@ under the License.
<order-by field-name="-fromDate"/>
</entity-condition>
<if-not-empty field="productCategoryContentList">
- <first-from-list entry="productCategoryContent" list="productCategoryContentList"/>
+ <first-from-list list="productCategoryContentList" entry="productCategoryContent"/>
<set field="getContentAndDataResourceCtx.contentId" from-field="productCategoryContent.contentId"/>
<call-service service-name="getContentAndDataResource" in-map-name="getContentAndDataResourceCtx">
<result-to-field result-name="resultData" field="resultMap"/>
@@ -517,7 +517,7 @@ under the License.


<if-empty field="product">
- <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductCategoryMember" list="productCategoryMemberList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
</condition-list>
@@ -525,7 +525,7 @@ under the License.
</entity-condition>
<iterate list="productCategoryMemberList" entry="productCategoryMember">
<set field="product.productId" from-field="productCategoryMember.productId"/>
- <entity-condition list="ProductContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+ <entity-condition entity-name="ProductContentAndInfo" list="ProductContentAndInfoList" filter-by-date="true" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="productId" from-field="product.productId"/>
<condition-expr field-name="productContentTypeId" value="ALTERNATIVE_URL"/>
@@ -533,7 +533,7 @@ under the License.
<order-by field-name="-fromDate"/>
</entity-condition>
<if-empty field="ProductContentAndInfoList">
- <entity-one value-field="productMap" entity-name="Product">
+ <entity-one entity-name="Product" value-field="productMap">
<field-map field-name="productId" from-field="product.productId"/>
</entity-one>
<set field="createSimpleTextContentForProductCtx.fromDate" from-field="now"/>
@@ -582,7 +582,7 @@ under the License.
</entity-and>
<iterate list="productCategoryRollups" entry="productCategoryRollup">

- <entity-one value-field="productCategory" entity-name="ProductCategory">
+ <entity-one entity-name="ProductCategory" value-field="productCategory">
<field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/>
</entity-one>
<field-to-list list="parameters.productCategories" field="productCategory"/>

Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/category/CategoryContentServices.xml Sat Nov 5 14:14:04 2016
@@ -74,7 +74,7 @@ under the License.
</entity-and>
<if-not-empty field="productCategoryContents">
<first-from-list entry="productCategoryContent" list="productCategoryContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productCategoryContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -96,7 +96,7 @@ under the License.
</entity-and>
<if-not-empty field="productCategoryContents">
<first-from-list entry="productCategoryContent" list="productCategoryContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productCategoryContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">
@@ -118,7 +118,7 @@ under the License.
</entity-and>
<if-not-empty field="productCategoryContents">
<first-from-list entry="productCategoryContent" list="productCategoryContents"/>
- <entity-one value-field="electronicText" entity-name="ElectronicText">
+ <entity-one entity-name="ElectronicText" value-field="electronicText">
<field-map field-name="dataResourceId" from-field="productCategoryContent.dataResourceId"/>
</entity-one>
<if-not-empty field="electronicText">

Modified: ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/category/CategoryServices.xml Sat Nov 5 14:14:04 2016
@@ -107,7 +107,7 @@ under the License.


<simple-method method-name="addProductToCategories" short-description="Add Product to Multiple Categories">
- <set-service-fields service-name="addProductToCategory" to-map="addProductToCategoryMap" map="parameters"/>
+ <set-service-fields service-name="addProductToCategory" map="parameters" to-map="addProductToCategoryMap"/>/>
<if-instance-of field="parameters.categories" class="java.util.List">
<iterate list="parameters.categories" entry="category">
<set field="addProductToCategoryMap.productCategoryId" from-field="category"/>
@@ -747,7 +747,7 @@ under the License.
<set field="callingMethodName" from-field="resourceDescription"/>
<set field="checkAction" from-field="parameters.mainAction" default-value="UPDATE"/>

- <entity-condition list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="true">
+ <entity-condition entity-name="ProdCatalogCategory" list="prodCatalogCategoryList" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="productCategoryId" from-field="parameters.productCategoryId"/>
<condition-list combine="or">
@@ -833,13 +833,13 @@ under the License.
<set field="week" value="52"/>
<else>
<calculate field="week">
- <calcop field="week" operator="subtract">
+ <calcop operator="subtract" field="week">
<number value="1"/>
</calcop>
</calculate>
<if-compare field="week" operator="equals" value="1">
<calculate field="year">
- <calcop field="year" operator="subtract">
+ <calcop operator="subtract" field="year">
<number value="1"/>
</calcop>
</calculate>

Modified: ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/cost/CostServices.xml Sat Nov 5 14:14:04 2016
@@ -57,7 +57,7 @@ under the License.


<simple-method method-name="getProductCost" short-description="Gets the product's costs (from CostComponent or ProductPrice)">
- <entity-condition list="costComponents" entity-name="CostComponent" filter-by-date="true">
+ <entity-condition entity-name="CostComponent" list="costComponents" filter-by-date="true">
<condition-list>
<condition-expr field-name="productId" operator="equals" from-field="parameters.productId"/>
<condition-expr field-name="costUomId" operator="equals" from-field="parameters.currencyUomId"/>
@@ -67,8 +67,8 @@ under the License.
<set field="productCost" value="0" type="BigDecimal"/>
<iterate list="costComponents" entry="costComponent">
<calculate field="productCost" decimal-scale="6">
- <calcop field="costComponent.cost" operator="add">
- <calcop field="productCost" operator="get"/>
+ <calcop operator="add" field="costComponent.cost">
+ <calcop operator="get" field="productCost"/>
</calcop>
</calculate>

@@ -158,8 +158,8 @@ under the License.
</call-service>

<calculate field="estimatedTaskTime" decimal-scale="6">
- <calcop field="totalEstimatedTaskTime" operator="subtract">
- <calcop field="setupTime" operator="get"/>
+ <calcop operator="subtract" field="totalEstimatedTaskTime">
+ <calcop operator="get" field="setupTime"/>
</calcop>
</calculate>

@@ -179,18 +179,18 @@ under the License.
</if-not-empty>
<calculate field="taskCost" decimal-scale="6">
<calcop operator="add">
- <calcop field="estimatedTaskTime" operator="multiply">
- <calcop field="usageCost.amount" operator="get"/>
+ <calcop operator="multiply" field="estimatedTaskTime">
+ <calcop operator="get" field="usageCost.amount"/>
</calcop>
- <calcop field="setupTime" operator="multiply">
- <calcop field="setupCost.amount" operator="get"/>
+ <calcop operator="multiply" field="setupTime">
+ <calcop operator="get" field="setupCost.amount"/>
</calcop>
</calcop>
</calculate>


<calculate field="taskCost" decimal-scale="6">
- <calcop field="taskCost" operator="divide">
+ <calcop operator="divide" field="taskCost">
<number value="3600000"/>
</calcop>
</calculate>
@@ -207,18 +207,18 @@ under the License.
<if-not-empty field="costComponentCalc.perMilliSecond">
<if-compare operator="not-equals" value="0" field="costComponentCalc.perMilliSecond" type="BigDecimal">
<calculate field="totalCostComponentTime" decimal-scale="6">
- <calcop field="totalEstimatedTaskTime" operator="divide">
- <calcop field="costComponentCalc.perMilliSecond" operator="get"/>
+ <calcop operator="divide" field="totalEstimatedTaskTime">
+ <calcop operator="get" field="costComponentCalc.perMilliSecond"/>
</calcop>
</calculate>
<calculate field="totalCostComponentCost" decimal-scale="6">
- <calcop field="totalCostComponentTime" operator="multiply">
- <calcop field="costComponentCalc.variableCost" operator="get"/>
+ <calcop operator="multiply" field="totalCostComponentTime">
+ <calcop operator="get" field="costComponentCalc.variableCost"/>
</calcop>
</calculate>
<calculate field="totalCostComponentCost" decimal-scale="6">
- <calcop field="totalCostComponentCost" operator="add">
- <calcop field="costComponentCalc.fixedCost" operator="get"/>
+ <calcop operator="add" field="totalCostComponentCost">
+ <calcop operator="get" field="costComponentCalc.fixedCost"/>
</calcop>
</calculate>
<set field="costsByType.${wecc.costComponentTypeId}" from-field="totalCostComponentCost"/>
@@ -271,9 +271,9 @@ under the License.
<result-to-field result-name="productCost"/>
</call-service>
<calculate field="totalProductsCost" decimal-scale="6">
- <calcop field="totalProductsCost" operator="add">
- <calcop field="componentMap.quantity" operator="multiply">
- <calcop field="productCost" operator="get"/>
+ <calcop operator="add" field="totalProductsCost">
+ <calcop operator="multiply" field="componentMap.quantity">
+ <calcop operator="get" field="productCost"/>
</calcop>
</calcop>
</calculate>
@@ -287,7 +287,7 @@ under the License.
<result-to-field result-name="productCost"/>
</call-service>
<calculate field="totalProductsCost" decimal-scale="6">
- <calcop field="productCost" operator="get"/>
+ <calcop operator="get" field="productCost"/>
</calculate>
</else>
</if-not-empty>
@@ -308,15 +308,15 @@ under the License.
<result-to-field result-name="costsByType" field="costsByType"/>
</call-service>
<calculate field="totalTaskCost" decimal-scale="6">
- <calcop field="totalTaskCost" operator="add">
- <calcop field="taskCost" operator="get"/>
+ <calcop operator="add" field="totalTaskCost">
+ <calcop operator="get" field="taskCost"/>
</calcop>
</calculate>
<iterate-map map="costsByType" key="costType" value="costAmount">
<if-not-empty field="totalCostsByType.${costType}">
<calculate field="totalCostsByType.${costType}" decimal-scale="6">
- <calcop field="costAmount" operator="add">
- <calcop field="totalCostsByType.${costType}" operator="get"/>
+ <calcop operator="add" field="costAmount">
+ <calcop operator="get" field="totalCostsByType.${costType}"/>
</calcop>
</calculate>
<else>
@@ -324,17 +324,17 @@ under the License.
</else>
</if-not-empty>
<calculate field="totalOtherTaskCost" decimal-scale="6">
- <calcop field="totalOtherTaskCost" operator="add">
- <calcop field="costAmount" operator="get"/>
+ <calcop operator="add" field="totalOtherTaskCost">
+ <calcop operator="get" field="costAmount"/>
</calcop>
</calculate>
</iterate-map>
</iterate>

<calculate field="totalCost" decimal-scale="6">
- <calcop field="totalTaskCost" operator="add">
- <calcop field="totalProductsCost" operator="get"/>
- <calcop field="totalOtherTaskCost" operator="get"/>
+ <calcop operator="add" field="totalTaskCost">
+ <calcop operator="get" field="totalProductsCost"/>
+ <calcop operator="get" field="totalOtherTaskCost"/>
</calcop>
</calculate>

@@ -397,8 +397,8 @@ under the License.
<call-service service-name="recreateCostComponent" in-map-name="callSvcMap"/>

<calculate field="totalCost" decimal-scale="6">
- <calcop field="totalCost" operator="add">
- <calcop field="productCostAdjustment" operator="get"/>
+ <calcop operator="add" field="totalCost">
+ <calcop operator="get" field="productCostAdjustment"/>
</calcop>
</calculate>
</else>

Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementEvents.xml Sat Nov 5 14:14:04 2016
@@ -45,10 +45,10 @@ under the License.
<field-map field-name="productContentTypeId" value="DEFAULT_IMAGE"/>
</entity-and>
<if-not-empty field="productContentAndInfos">
- <first-from-list entry="productContentAndInfo" list="productContentAndInfos"/>
+ <first-from-list list="productContentAndInfos" entry="productContentAndInfo"/>
<script location="component://product/groovyScripts/catalog/imagemanagement/SetDefaultImage.groovy"/>

- <entity-one value-field="product" entity-name="Product">
+ <entity-one entity-name="Product" value-field="product">
<field-map field-name="productId" from-field="parameters.productId"/>
</entity-one>
<set field="product.originalImageUrl" from-field="productContentAndInfo.drObjectInfo"/>

Modified: ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/imagemanagement/ImageManagementServices.xml Sat Nov 5 14:14:04 2016
@@ -189,7 +189,7 @@ under the License.
<remove-value value-field="contentKeyword"/>
</iterate>

- <entity-one value-field="content" entity-name="Content">
+ <entity-one entity-name="Content" value-field="content">
<field-map field-name="contentId" from-field="parameters.contentId"/>
</entity-one>
<set field="removeContentPKMap.contentId" from-field="parameters.contentId"/>
@@ -204,7 +204,7 @@ under the License.
<remove-value value-field="dataResourceRoles[0]"/>
</if-not-empty>

- <entity-one value-field="dataResource" entity-name="DataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="dataResourceId"/>
</entity-one>
<set field="removeImageFile.productId" from-field="parameters.productId"/>
@@ -220,7 +220,7 @@ under the License.
</simple-method>

<simple-method method-name="setImageDetail" short-description="Set Image Detail">
- <entity-one value-field="productContent" entity-name="ProductContent"/>
+ <entity-one entity-name="ProductContent" value-field="productContent"/>
<set field="productContent.sequenceNum" from-field="parameters.sequenceNum" type="Long"/>
<store-value value-field="productContent"/>
<if-not-empty field="parameters.sequenceNum">
@@ -230,12 +230,12 @@ under the License.
</if-not-empty>


- <entity-one value-field="content" entity-name="Content"/>
+ <entity-one entity-name="Content" value-field="content"/>
<set field="content.description" from-field="parameters.description"/>
<store-value value-field="content"/>

<if-compare field="content.statusId" operator="equals" value="IM_APPROVED">
- <entity-one value-field="dataResource" entity-name="DataResource">
+ <entity-one entity-name="DataResource" value-field="dataResource">
<field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
<set field="dataResource.isPublic" from-field="parameters.drIsPublic"/>
@@ -268,7 +268,7 @@ under the License.
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="roleTypeId" value="IMAGEAPPROVER"/>
</entity-and>
- <first-from-list entry="contentApproval" list="contentApprovals"/>
+ <first-from-list list="contentApprovals" entry="contentApproval"/>
<set field="contentApproval.approvalStatusId" from-field="parameters.checkStatusId"/>
<store-value value-field="contentApproval"/>
</else>
@@ -307,7 +307,7 @@ under the License.
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.purchaseFromDate" from-field="nowTimestamp"/>
<store-value value-field="productContent"/>
<else>
@@ -327,7 +327,7 @@ under the License.
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.purchaseFromDate" from-field="nowTimestamp"/>
<store-value value-field="productContent"/>

@@ -353,7 +353,7 @@ under the License.
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.purchaseFromDate" from-field="nowTimestamp"/>
<store-value value-field="productContent"/>

@@ -397,7 +397,7 @@ under the License.
<field-map field-name="contentId" from-field="parameters.contentId"/>
<field-map field-name="productContentTypeId" value="IMAGE"/>
</entity-and>
- <first-from-list entry="productContent" list="productContents"/>
+ <first-from-list list="productContents" entry="productContent"/>
<set field="productContent.thruDate" from-field="nowTimestam"/>
<store-value value-field="productContent"/>
</simple-method>

Modified: ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml?rev=1768219&r1=1768218&r2=1768219&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/minilang/product/inventory/InventoryIssueServices.xml Sat Nov 5 14:14:04 2016
@@ -43,7 +43,7 @@ under the License.
<iterate list="orderItemList" entry="orderItem">
<if-not-empty field="orderItem.productId">
<clear-field field="callSvcMap"/>
- <set-service-fields to-map="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map="orderItem"/>
+ <set-service-fields service-name="issueImmediatelyFulfilledOrderItem" map="orderItem" to-map="callSvcMap"/>
<set field="callSvcMap.orderHeader" from-field="orderHeader"/>
<set field="callSvcMap.orderItem" from-field="orderItem"/>
<set field="callSvcMap.productStore" from-field="productStore"/>
@@ -140,10 +140,10 @@ under the License.
<set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>

@@ -175,10 +175,10 @@ under the License.
<set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.quantityNotIssued" operator="negative"/>
+ <calcop operator="negative" field="parameters.quantityNotIssued"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>

@@ -210,7 +210,7 @@ under the License.
<clear-field field="issuanceCreateMap"/>

<calculate field="parameters.quantityNotIssued">
- <calcop field="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
+ <calcop operator="subtract" field="parameters.quantityNotIssued"><number value="1.0"/></calcop>
</calculate>
</if-compare>
</if-compare>
@@ -251,10 +251,10 @@ under the License.
<set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>

<calculate field="createDetailMap.availableToPromiseDiff" decimal-scale="6">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<calculate field="createDetailMap.quantityOnHandDiff" decimal-scale="6">
- <calcop field="parameters.deductAmount" operator="negative"/>
+ <calcop operator="negative" field="parameters.deductAmount"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>