OFBiz › OFBiz - Commits

svn commit: r1768209 [7/9] - in /ofbiz/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/fixedasset/ applications/accounting/minilang/invoice/ applications/accounting/minilang/...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

diveshdutta

svn commit: r1768209 [7/9] - in /ofbiz/trunk: applications/accounting/minilang/budget/ applications/accounting/minilang/finaccount/ applications/accounting/minilang/fixedasset/ applications/accounting/minilang/invoice/ applications/accounting/minilang/...

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Sat Nov 5 12:41:35 2016
@@ -367,7 +367,7 @@
<decorator-screen name="EbaySoldListing">
<decorator-section name="body">
<screenlet title="Open Unpaid">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="OpenUnpaid"/>
+ <include-form name="OpenUnpaid" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -387,7 +387,7 @@
<decorator-screen name="EbaySoldListing">
<decorator-section name="body">
<screenlet title="${uiLabelMap.EbayAddSecondChanceOffer}">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="MakeSecondChanceOffer"/>
+ <include-form name="MakeSecondChanceOffer" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -464,7 +464,7 @@
<decorator-screen name="EbayActiveListing">
<decorator-section name="body">
<screenlet title="Active to Open Listings">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ItemOption"/>
+ <include-form name="ItemOption" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
<include-grid location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ActiveItemList"/>
</screenlet>
</decorator-section>
@@ -500,7 +500,7 @@
<decorator-screen name="EbayUnsoldListing">
<decorator-section name="body">
<screenlet title="Unsold Listing">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ItemOption"/>
+ <include-form name="ItemOption" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
<include-grid location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="UnsoldItemList"/>
</screenlet>
</decorator-section>
@@ -525,7 +525,7 @@
<decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="uiLabelMap.EbayWaitingToShipping">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="WaitingToShippingOption"/>
+ <include-form name="WaitingToShippingOption" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
<include-grid location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="SoldItemList"/>
</screenlet>
</decorator-section>
@@ -624,7 +624,7 @@
<decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet name="customerData" title="Customer Offer Data">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ViewCustomerOfferData"/>
+ <include-form name="ViewCustomerOfferData" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -657,7 +657,7 @@
<decorator-screen name="EbayclosedListing">
<decorator-section name="body">
<screenlet title="Closed Item Listings">
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ItemOption"/>
+ <include-form name="ItemOption" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
<include-grid location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ClosedItemList"/>
</screenlet>
</decorator-section>
@@ -715,8 +715,8 @@
</section>
<screenlet title="Order Listings (Import single Transactions)">
<include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayOrderSubBar"/>
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="FindEbayStoreOrders"/>
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="TransactionList"/>
+ <include-form name="FindEbayStoreOrders" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+ <include-form name="TransactionList" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
</widgets>
</section>
@@ -746,8 +746,8 @@
</section>
<screenlet title="Order Listings (Import many transactions)">
<include-menu location="component://ebaystore/widget/EbayStoreMenus.xml" name="EbayOrderSubBar"/>
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="FindEbayStoreOrders"/>
- <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="OrderList"/>
+ <include-form name="FindEbayStoreOrders" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+ <include-form name="OrderList" location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
</widgets>
</section>

Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/CustomerEvents.xml Sat Nov 5 12:41:35 2016
@@ -1290,7 +1290,7 @@ under the License.
</if-empty>
<call-object-method obj-field="parameters.captcha" method-name="toLowerCase" ret-field="submittedCaptcha"/>
<script>groovy: context.actualCaptcha = request.getSession().getAttribute("_CAPTCHA_CODE_")?.get("captchaImage")?.toLowerCase()</script>
- <if-compare-field operator="not-equals" field="submittedCaptcha" to-field="actualCaptcha">
+ <if-compare-field field="submittedCaptcha" operator="not-equals" to-field="actualCaptcha">
<add-error><fail-property resource="MyPortalUiLabels" property="MyPortalCaptchaMissingError"/></add-error>
</if-compare-field>
<check-errors/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/minilang/customer/QuickAnonCustomerEvents.xml Sat Nov 5 12:41:35 2016
@@ -254,7 +254,7 @@ under the License.
</if-compare>
</if-compare>

- <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="not-equals">
+ <if-compare field="parameters.useShippingPostalAddressForBilling" operator="not-equals" value="Y">

<if-compare field="billToPostalAddress" operator="equals" value="true">
<if-empty field="parameters.billToName">
@@ -366,7 +366,7 @@ under the License.
<call-service service-name="createPartyPostalAddress" in-map-name="shippingAddressContext">
<result-to-field result-name="contactMechId" field="parameters.shippingContactMechId"/>
</call-service>
- <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="equals">
+ <if-compare field="parameters.useShippingPostalAddressForBilling" operator="equals" value="Y">
<set field="addressPurposeContext.partyId" from-field="partyId"/>
<set field="addressPurposeContext.contactMechPurposeTypeId" from-field="parameters.billingContactMechPurposeTypeId" default-value="BILLING_LOCATION"/>
<set field="addressPurposeContext.contactMechId" from-field="parameters.shippingContactMechId"/>
@@ -382,7 +382,7 @@ under the License.
</if-empty>
</if-compare>

- <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="not-equals">
+ <if-compare field="parameters.useShippingPostalAddressForBilling" operator="not-equals" value="Y">
<if-empty field="parameters.billingContactMechId">

<set field="billingAddressContext.contactMechPurposeTypeId" from-field="parameters.billingContactMechPurposeTypeId" default-value="BILLING_LOCATION"/>
@@ -548,7 +548,7 @@ under the License.
</if-not-empty>

- <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="not-equals">
+ <if-compare field="parameters.useShippingPostalAddressForBilling" operator="not-equals" value="Y">
<field-to-session field="parameters.billingContactMechId" session-name="billingContactMechId"></field-to-session>
<else>
<if-not-empty field="cart">

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Sat Nov 5 12:41:35 2016
@@ -63,7 +63,7 @@ under the License.
<set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
<set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]" default-value="component://ecommerce/template/includes/Header.ftl"/>
<set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/template/includes/Footer.ftl"/>
- <entity-and list="webAnalyticsConfigs" entity-name="WebAnalyticsConfig">
+ <entity-and entity-name="WebAnalyticsConfig" list="webAnalyticsConfigs">
<field-map field-name="webSiteId"/>
</entity-and>
<set field="layoutSettings.javaScripts[]" value="/images/miscAjaxFunctions.js" global="true" />

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustRequestScreens.xml Sat Nov 5 12:41:35 2016
@@ -83,7 +83,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-compare-field operator="equals" field="custRequest.fromPartyId" to-field="userLogin.partyId"></if-compare-field>
+ <if-compare-field field="custRequest.fromPartyId" operator="equals" to-field="userLogin.partyId"></if-compare-field>
</condition>
<widgets>
<container style="lefthalf">

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/QuoteScreens.xml Sat Nov 5 12:41:35 2016
@@ -72,7 +72,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-compare-field operator="equals" field="quote.partyId" to-field="userLogin.partyId"></if-compare-field>
+ <if-compare-field field="quote.partyId" operator="equals" to-field="userLogin.partyId"></if-compare-field>
</condition>
<widgets>
<platform-specific>

Modified: ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/minilang/Events.xml Sat Nov 5 12:41:35 2016
@@ -46,7 +46,7 @@ under the License.
<call-object-method obj-field="parameters.captcha" method-name="toLowerCase" ret-field="submittedCaptcha"/>
<script>groovy: context.actualCaptcha = request.getSession().getAttribute("_CAPTCHA_CODE_")?.get("captchaImage")?.toLowerCase()</script>
<if-compare field="parameters.PASSWORD" value="${parameters.CONFIRM_PASSWORD}" operator="equals">
- <if-compare-field operator="equals" field="submittedCaptcha" to-field="actualCaptcha">
+ <if-compare-field field="submittedCaptcha" operator="equals" to-field="actualCaptcha">


<find-by-primary-key entity-name="UserLogin" map="userLoginContext" value-field="existingUserLogin"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectPermissionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectPermissionServices.xml Sat Nov 5 12:41:35 2016
@@ -163,7 +163,7 @@

<set field="isMember" value="true" type="Boolean"/>

- <entity-and list="custRequests" entity-name="WorkEffortCustRequestView">
+ <entity-and entity-name="WorkEffortCustRequestView" list="custRequests">
<field-map field-name="workEffortId" from-field="taskId"/>
</entity-and>
<first-from-list list="custRequests" entry="custRequest"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectServices.xml Sat Nov 5 12:41:35 2016
@@ -96,7 +96,7 @@
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
<filter-list-by-date list="oldEmailAddresses"/>
- <iterate entry="oldEmailAddress" list="oldEmailAddresses">
+ <iterate list="oldEmailAddresses" entry="oldEmailAddress">
<entity-and list="oldWorkEffortContactMechs" entity-name="WorkEffortContactMech">
<field-map field-name="workEffortId" from-field="oldEmailAddress.workEffortId"/>
<field-map field-name="contactMechId" from-field="oldEmailAddress.contactMechId"/>
@@ -185,7 +185,7 @@
<if-not-empty field="parameters.estimatedDuration">
<set-service-fields service-name="updateWorkEffortSkillStandard" to-map="updateWorkEffortSkillStandard" map="parameters"/>
<if-empty field="parameters.skillTypeId">
- <entity-and list="workEffortSkillStandards" entity-name="WorkEffortSkillStandard">
+ <entity-and entity-name="WorkEffortSkillStandard" list="workEffortSkillStandards">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="workEffortSkillStandards">
@@ -260,7 +260,7 @@
<now-timestamp field="assignment.thruDate"/>
<clear-field field="parameters.statusId"/>
</if-compare>
- <set-nonpk-fields value-field="assignment" map="parameters"/>
+ <set-nonpk-fields map="parameters" value-field="assignment"/>
<store-value value-field="assignment"/>
<if-compare field="assignment.statusId" value="PAS_COMPLETED" operator="equals">
<call-simple-method method-name="updateTaskStatusToComplete"/>
@@ -281,7 +281,7 @@
</entity-and>

<if-not-empty field="assignments">
- <iterate entry="assignment" list="assignments">
+ <iterate list="assignments" entry="assignment">
<if-compare field="assignment.statusId" value="PAS_COMPLETED" operator="not-equals">
<set field="status" value="notcomplete"/>
</if-compare>
@@ -292,11 +292,11 @@
<set field="parameters.currentStatusId" value="PTS_COMPLETED"/>
<call-simple-method method-name="updateWorkEffort" xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"/>

- <entity-and list="custRequests" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequests">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="custRequests">
- <iterate entry="custReq" list="custRequests">
+ <iterate list="custRequests" entry="custReq">
<set field="updStat.custRequestId" from-field="custReq.custRequestId"/>
<set field="updStat.statusId" value="CRQ_COMPLETED"/>
<call-service service-name="updateCustRequest" in-map-name="updStat"/>
@@ -339,7 +339,7 @@

<if-not-empty field="tasks">

- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<clear-field field="task.estimatedStartDate"/>
<clear-field field="task.estimatedCompletionDate"/>
</iterate>
@@ -360,7 +360,7 @@
<field-map field-name="workEffortIdTo" from-field="taskId"/>
</entity-and>
<if-not-empty field="assocs">
- <iterate entry="assoc" list="assocs">
+ <iterate list="assocs" entry="assoc">
<clear-field field="hours"/>
<set field="getTask.taskId" from-field="assoc.workEffortIdFrom"/>
<call-service service-name="getProjectTask" in-map-name="getTask">
@@ -431,10 +431,10 @@
</entity-one>
<get-related value-field="project" relation-name="ChildWorkEffort" list="phases"/>
<if-not-empty field="phases">
- <iterate entry="phase" list="phases">
+ <iterate list="phases" entry="phase">
<get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<get-related value-field="task" relation-name="ToWorkEffortAssoc" list="t.prevTasks"/>
<if-empty field="t.prevTasks">

@@ -503,7 +503,7 @@

<set field="hours" value="0" type="Double"/>
<if-not-empty field="timeEntries">
- <iterate entry="timeEntry" list="timeEntries">
+ <iterate list="timeEntries" entry="timeEntry">
<if-compare-field field="timeEntry.workEffortId" to-field="parameters.workEffortId" operator="equals">
<if-compare-field field="timeEntry.rateTypeId" to-field="parameters.rateTypeId" operator="equals">
<if-not-empty field="timeEntry.hours">
@@ -635,7 +635,7 @@
<get-related value-field="project" relation-name="WorkEffortPartyAssignment" list="partiesAll"/>
<filter-list-by-date list="partiesAll" to-list="parties"/>
<if-not-empty field="parties">
- <iterate entry="party" list="parties">
+ <iterate list="parties" entry="party">
<set field="parameters.workEffortId" from-field="newProjectId"/>
<set field="parameters.partyId" from-field="party.partyId"/>
<set field="parameters.roleTypeId" from-field="party.roleTypeId"/>
@@ -646,7 +646,7 @@

<get-related value-field="project" relation-name="ChildWorkEffort" list="phases"/>
<if-not-empty field="phases">
- <iterate entry="phase" list="phases">
+ <iterate list="phases" entry="phase">
<clear-field field="newPhase"/>
<if-not-empty field="toTemplate">
<set field="parameters.workEffortTypeId" value="PHASE_TEMPLATE"/>
@@ -663,7 +663,7 @@

<get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<clear-field field="newTask"/>
<if-not-empty field="toTemplate">
<set field="newTask.workEffortTypeId" value="TASK_TEMPLATE"/>
@@ -712,7 +712,7 @@
<call-simple-method method-name="combineInfo"/>


- <entity-and list="emailAddresses" entity-name="WorkEffortContactMechView">
+ <entity-and entity-name="WorkEffortContactMechView" list="emailAddresses">
<field-map field-name="workEffortId" from-field="highInfo.projectId"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
@@ -745,7 +745,7 @@
<order-by field-name="workEffortName"/>
</entity-and>
<if-not-empty field="phases">
- <iterate entry="phase" list="phases">
+ <iterate list="phases" entry="phase">

<entity-one entity-name="StatusItem" value-field="highSeq">
<field-map field-name="statusId" from-field="phase.currentStatusId"/>
@@ -785,7 +785,7 @@
<order-by field-name="workEffortName"/>
</entity-and>
<if-not-empty field="tasks">
- <iterate entry="lowInfo" list="tasks">
+ <iterate list="tasks" entry="lowInfo">
<set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
<set field="highInfo.phaseSeqNum" from-field="lowInfo.phaseSeqNum"/>
<set field="highInfo.taskId" from-field="lowInfo.workEffortId"/>
@@ -829,7 +829,7 @@
<order-by field-name="partyId"/>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<if>
<condition>
<and>
@@ -884,7 +884,7 @@
<order-by field-name="partyId"/>
</entity-condition>
<if-not-empty field="tasks">
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<if>
<condition >
<and>
@@ -1010,8 +1010,8 @@
<if>
<condition>
<or>
- <if-compare operator="greater" field="inprogressTasks" type="Long" value="0"/>
- <if-compare operator="greater" field="assignedTasks" type="Long" value="0"/>
+ <if-compare field="inprogressTasks" type="Long" operator="greater" value="0"/>
+ <if-compare field="assignedTasks" type="Long" operator="greater" value="0"/>
</or>
</condition>
<then>
@@ -1404,7 +1404,7 @@

<call-simple-method method-name="InvoiceStatusInProgress" xml-resource="component://accounting/minilang/invoice/InvoiceServices.xml"/>

- <entity-and list="entries" entity-name="TimeEntry">
+ <entity-and entity-name="TimeEntry" list="entries">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-and>
<iterate list="entries" entry="timeEntry">
@@ -1431,7 +1431,7 @@
</add-error>
<check-errors/>
</if-empty>
- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<if-empty field="notFirst">

<set-service-fields service-name="addWorkEffortTimeToNewInvoice" map="parameters" to-map="addTaskToNewInvoice"/>
@@ -1496,7 +1496,7 @@
<check-errors/>
</if-empty>

- <iterate entry="task" list="tasks">
+ <iterate list="tasks" entry="task">
<if>
<condition>
<or>
@@ -1545,7 +1545,7 @@
<if-not-empty field="assigns">
<set field="addAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="addAssign.statusId" value="PAS_ASSIGNED"/>
- <iterate entry="assign" list="assigns">
+ <iterate list="assigns" entry="assign">
<make-value value-field="newAssign" entity-name="WorkEffortPartyAssignment"/>
<set field="newAssign.workEffortId" from-field="parameters.workEffortId"/>
<set field="newAssign.partyId" from-field="assign.partyId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectSimpleEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectSimpleEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/minilang/ProjectSimpleEvents.xml Sat Nov 5 12:41:35 2016
@@ -30,7 +30,7 @@
<entity-and entity-name="CommunicationEventRole" list="commRoles">
<field-map field-name="communicationEventId" from-field="parameters.communicationEventId"/>
</entity-and>
- <iterate entry="commRole" list="commRoles">
+ <iterate list="commRoles" entry="commRole">
<set field="commRole.statusId" value="COM_ROLE_COMPLETED"/>
<store-value value-field="commRole"/>
</iterate>
@@ -103,7 +103,7 @@
</entity-and>

<if-not-empty field="assigns">
- <iterate entry="assign" list="assigns">
+ <iterate list="assigns" entry="assign">
<set-service-fields service-name="updateTaskAssigment" map="assign" to-map="upd"/>
<set field="upd.statusId" value="PAS_COMPLETED"/>
<call-service service-name="updateTaskAssigment" in-map-name="upd"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml Sat Nov 5 12:41:35 2016
@@ -27,7 +27,7 @@ under the License.
<if-has-permission permission="PROJECTMGR" action="_ADMIN"/>
</condition>
<actions>
- <entity-and list="custRequests" entity-name="CustRequest">
+ <entity-and entity-name="CustRequest" list="custRequests">
<field-map field-name="statusId" value="CRQ_ACCEPTED"/>
<order-by field-name="lastModifiedDate"/>
</entity-and>
@@ -105,13 +105,13 @@ under the License.
<get-related-one value-field="custRequest" relation-name="CurrencyUom" to-value-field="currency"/>
<get-related-one value-field="custRequest" relation-name="ProductStore" to-value-field="store"/>
<get-related-one value-field="custRequest" relation-name="FulfillContactMech" to-value-field="fulfillContactMech"/>
- <entity-and list="requestWorkEfforts" entity-name="CustRequestAndWorkEffort">
+ <entity-and entity-name="CustRequestAndWorkEffort" list="requestWorkEfforts">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
<get-related value-field="custRequest" relation-name="CustRequestParty" list="requestParties"/>
<set field="orderBy[]" value="sequenceNum"/>
<get-related value-field="custRequest" relation-name="CustRequestItem" list="custRequestItems" order-by-list="orderBy"/>
- <entity-and list="commEvents" entity-name="CommunicationEventAndCustRequest">
+ <entity-and entity-name="CommunicationEventAndCustRequest" list="commEvents">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
<entity-condition entity-name="CustRequestItemNoteView" list="custRequestItemNoteViews">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Nov 5 12:41:35 2016
@@ -1108,7 +1108,7 @@ under the License.
</or>
</condition>
<widgets>
- <include-screen location="component://party/widget/partymgr/CommunicationEventScreens.xml" name="commOverview"/>
+ <include-screen name="commOverview" location="component://party/widget/partymgr/CommunicationEventScreens.xml" />
</widgets>
</section>
</decorator-section>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumEvents.xml Sat Nov 5 12:41:35 2016
@@ -41,7 +41,7 @@
<fail-message message="There is no product backlogs in the system. Please create the product backlogs before perform this action."/>
</add-error>
</if-compare>
- <if-compare-field operator="greater" field="parameters.sprintBacklogs" to-field="parameters.maxNum" type="Integer">
+ <if-compare-field field="parameters.sprintBacklogs" operator="greater" to-field="parameters.maxNum" type="Integer">
<add-error error-list-name="_error_message_list_">
<fail-message message="Number of sprint backlogs are too much. Please enter the number equal or less than ${parameters.maxNum}."/>
</add-error>
@@ -113,7 +113,7 @@
</or>
</condition>
<then>
- <entity-and list="workEffortList" entity-name="WorkEffortAndProduct">
+ <entity-and entity-name="WorkEffortAndProduct" list="workEffortList">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
</entity-and>
<first-from-list entry="workEffortMap" list="workEffortList"/>
@@ -280,7 +280,7 @@
<entity-one value-field="sprintMap" entity-name="WorkEffort">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-one>
- <entity-and list="projectList" entity-name="WorkEffortAndProduct">
+ <entity-and entity-name="WorkEffortAndProduct" list="projectList">
<field-map field-name="workEffortId" from-field="sprintMap.workEffortParentId"/>
</entity-and>
<set field="productId" from-field="projectList[0].productId"/>
@@ -309,7 +309,7 @@
<set field="sequenceNumIn" value="1" type="Long"/>
<set field="custRequestResultMap.custRequestId" from-field="parameters.custRequestId"/>

- <if-compare operator="equals" field="getNum" value="0">
+ <if-compare field="getNum" operator="equals" value="0">
<set field="custRequestResultMap.custSequenceNum" from-field="sequenceNumIn"/>
<else>
<if-compare field="custRequest.custRequestTypeId" operator="equals" value="RF_UNPLAN_BACKLOG">
@@ -401,7 +401,7 @@
</condition>
<then>
<set field="parameters.sprintId" from-field="parameters.workEffortId"/>
- <entity-and list="custRequestWorkEfforts" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEfforts">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-and>

@@ -416,12 +416,12 @@
</call-service>


- <entity-and list="membersPartyId" entity-name="WorkEffortPartyAssignView">
+ <entity-and entity-name="WorkEffortPartyAssignView" list="membersPartyId">
<field-map field-name="workEffortId" from-field="parameters.sprintId"/>
</entity-and>

<if-not-empty field="membersPartyId">
- <iterate entry="memberPartyId" list="membersPartyId">
+ <iterate list="membersPartyId" entry="memberPartyId">
<call-service service-name="unassignPartyFromWorkEffort" in-map-name="memberPartyId"></call-service>
</iterate>
</if-not-empty>
@@ -522,7 +522,7 @@
<set-service-fields service-name="updateWorkEffort" to-map="updateProject" map="parameters"/>
<call-service service-name="updateWorkEffort" in-map-name="updateProject"/>

- <entity-and list="workEffGSDList" entity-name="WorkEffortGoodStandard">
+ <entity-and entity-name="WorkEffortGoodStandard" list="workEffGSDList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="workEffortGoodStdTypeId" value="SCRUM_PRO_WORKEFF"/>
</entity-and>
@@ -554,17 +554,17 @@
</else>
</if-not-empty>

- <if-compare operator="equals" field="parameters.currentStatusId" value="SPJ_CLOSED">
+ <if-compare field="parameters.currentStatusId" operator="equals" value="SPJ_CLOSED">




- <entity-and list="sprintList" entity-name="ProjectSprint">
+ <entity-and entity-name="ProjectSprint" list="sprintList">
<field-map field-name="projectId" from-field="parameters.projectId"/>
<field-map field-name="projectTypeId" value="SCRUM_PROJECT"/>
</entity-and>
<if-not-empty field="sprintList"></if-not-empty>
- <iterate entry="sprint" list="sprintList">
+ <iterate list="sprintList" entry="sprint">

<entity-one value-field="sprintEntry" entity-name="WorkEffort">
<field-map field-name="workEffortId" from-field="sprint.sprintId"/>
@@ -598,7 +598,7 @@

<make-value value-field="deleteCustRequestItem" entity-name="CustRequestItem"/>
<set-pk-fields value-field="deleteCustRequestItem" map="parameters"/>
- <set-nonpk-fields value-field="deleteCustRequestItem" map="parameters"/>
+ <set-nonpk-fields map="parameters" value-field="deleteCustRequestItem"/>
<remove-value value-field="deleteCustRequestItem"/>
</simple-method>

@@ -684,7 +684,7 @@

<set field="custRequestIndex" type="List"/>
<set field="custRequestIndexToSet" value="${groovy: import java.util.Set; new HashSet(custRequestIndexList);}"/>
- <iterate entry="custRequestIndexMap" list="custRequestIndexToSet">
+ <iterate list="custRequestIndexToSet" entry="custRequestIndexMap">
<set field="count" value="0" type="Integer"/>
<loop count="${custRequestListSize}" field="l">
<if-compare-field field="custRequestList[l].custSequenceNum" operator="equals" to-field="custRequestIndexMap" type="Integer">
@@ -706,7 +706,7 @@
</script>
</if-not-empty>
<if-not-empty field="uniqueCustRequestIndexList">
- <iterate entry="custRequestIndexMap" list="uniqueCustRequestIndexList">
+ <iterate list="uniqueCustRequestIndexList" entry="custRequestIndexMap">
<set field="count" value="0" type="Integer"/>
<loop count="${custRequestListSize}" field="m">
<if>
@@ -773,7 +773,7 @@
<field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-one>
<if-compare field="newCustRequestMap.custRequestTypeId" operator="equals" value="RF_PROD_BACKLOG" >
- <entity-and list="custRequestItemList" entity-name="CustRequestAndCustRequestItem">
+ <entity-and entity-name="CustRequestAndCustRequestItem" list="custRequestItemList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="custRequestTypeId" value="RF_PROD_BACKLOG"/>
<field-map field-name="statusId" value="CRQ_ACCEPTED"/>
@@ -784,7 +784,7 @@
<set field="custRequestList" from-field="custRequestItemList"/>
<call-object-method method-name="size" obj-field="custRequestList" ret-field="custCount"/>
<else>
- <entity-and list="custRequestItemList" entity-name="CustRequestAndCustRequestItem">
+ <entity-and entity-name="CustRequestAndCustRequestItem" list="custRequestItemList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="custRequestTypeId" value="RF_UNPLAN_BACKLOG"/>
<field-map field-name="statusId" value="CRQ_ACCEPTED"/>
@@ -953,7 +953,7 @@
</condition-list>
</entity-count>

- <if-compare operator="equals" field="getNum" value="0">
+ <if-compare field="getNum" operator="equals" value="0">
<set field="createCustRequestInMap.custSequenceNum" from-field="parameters.custSequenceNum"/>
<else>
<entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
@@ -1107,7 +1107,7 @@
<field-map field-name="productId" from-field="project.productId"/>
</entity-and>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="newDefaultTask.workEffortName" from-field="defaultTask.workEffortName"/>
<set field="newDefaultTask.estimatedMilliSeconds" from-field="defaultTask.estimatedMilliSeconds"/>
<set field="newDefaultTask.currentStatusId" from-field="defaultTask.currentStatusId"/>
@@ -1155,11 +1155,11 @@
</iterate>
<else>

- <entity-and list="defaultTaskScrum" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="defaultTaskScrum">
<field-map field-name="workEffortPurposeTypeId" value="SYSTEM_DEFAULT_TASK"/>
</entity-and>
<if-not-empty field="defaultTaskScrum">
- <iterate entry="defaultScrum" list="defaultTaskScrum">
+ <iterate list="defaultTaskScrum" entry="defaultScrum">
<set field="newDefaultTaskScrum.workEffortName" from-field="defaultScrum.workEffortName"/>
<set field="newDefaultTaskScrum.estimatedMilliSeconds" from-field="defaultScrum.estimatedMilliSeconds"/>
<set field="newDefaultTaskScrum.currentStatusId" from-field="defaultScrum.currentStatusId"/>
@@ -1230,7 +1230,7 @@
<simple-method method-name="addScrumResource" short-description="make parties available in the Scrum.">
<set field="userLoginIdDesc" from-field="parameters.userLoginIdDesc"/>
<set field="userLoginId" value="${groovy:userLoginIdDesc.substring(userLoginIdDesc.indexOf("|")+1)}"/>
- <entity-and list="userLogins" entity-name="UserLogin">
+ <entity-and entity-name="UserLogin" list="userLogins">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
<entity-one value-field="partyNameView" entity-name="PartyNameView"/>
@@ -1259,7 +1259,7 @@
<field-map field-name="userLoginId" value="system"/>
</entity-one>

- <entity-and list="listGroupId" entity-name="UserLoginSecurityGroup">
+ <entity-and entity-name="UserLoginSecurityGroup" list="listGroupId">
<field-map field-name="userLoginId" from-field="userLoginId"/>
<field-map field-name="groupId" from-field="parameters.groupId"/>
</entity-and>
@@ -1298,7 +1298,7 @@
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
</entity-one>
<if-empty field="formInput.formInput.sprintId">
- <entity-and list="custRequestWorkEfforts" entity-name="CustRequestAndWorkEffort">
+ <entity-and entity-name="CustRequestAndWorkEffort" list="custRequestWorkEfforts">
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
<field-map field-name="currentStatusId" value="SPRINT_ACTIVE"/>
</entity-and>
@@ -1358,16 +1358,16 @@
<set field="formInput.formInput.workEffortParentId" from-field="formInput.formInput.sprintId"/>
</if-compare>
<set field="formInput.formInput.currentStatusId" value="STS_CREATED"/>
- <if-compare operator="equals" field="formInput.formInput.workEffortTypeId" value="SCRUM_TASK_ERROR">
+ <if-compare field="formInput.formInput.workEffortTypeId" operator="equals" value="SCRUM_TASK_ERROR">
<set field="formInput.formInput.priority" value="1"/>
</if-compare>
- <if-compare operator="equals" field="formInput.formInput.workEffortTypeId" value="SCRUM_TASK_TEST">
+ <if-compare field="formInput.formInput.workEffortTypeId" operator="equals" value="SCRUM_TASK_TEST">
<set field="formInput.formInput.priority" value="2"/>
</if-compare>
- <if-compare operator="equals" field="formInput.formInput.workEffortTypeId" value="SCRUM_TASK_IMPL">
+ <if-compare field="formInput.formInput.workEffortTypeId" operator="equals" value="SCRUM_TASK_IMPL">
<set field="formInput.formInput.priority" value="3"/>
</if-compare>
- <if-compare operator="equals" field="formInput.formInput.workEffortTypeId" value="SCRUM_TASK_INST">
+ <if-compare field="formInput.formInput.workEffortTypeId" operator="equals" value="SCRUM_TASK_INST">
<set field="formInput.formInput.priority" value="4"/>
</if-compare>
<set-service-fields service-name="createWorkEffort" to-map="createWorkEffort" map="formInput.formInput"/>
@@ -1431,7 +1431,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <iterate entry="assigned" list="assigneds">
+ <iterate list="assigneds" entry="assigned">
<remove-value value-field="assigned"/>
</iterate>
<set field="newInput.partyId" from-field="formInput.formInput.partyId"></set>
@@ -1501,7 +1501,7 @@
<condition-expr field-name="roleTypeId" value="PRODUCT_OWNER"/>
</condition-list>
</entity-condition>
- <entity-and list="userLogins" entity-name="UserLogin">
+ <entity-and entity-name="UserLogin" list="userLogins">
<field-map field-name="partyId" from-field="parameters.partyId"/>
</entity-and>
<entity-one value-field="partyNameView" entity-name="PartyNameView"/>
@@ -1547,7 +1547,7 @@
<then>
<set field="taskId" from-field="parameters.taskId" default-value="${parameters.workEffortId}"/>

- <entity-and list="scrumMeetingBacklogs" entity-name="ProductBacklog">
+ <entity-and entity-name="ProductBacklog" list="scrumMeetingBacklogs">
<field-map field-name="workEffortId" from-field="taskId"/>
<field-map field-name="custRequestTypeId" value="RF_SCRUM_MEETINGS"/>
</entity-and>
@@ -1560,12 +1560,12 @@
<call-service service-name="assignPartyToWorkEffort" in-map-name="member"/>
<else>

- <entity-and list="workEffortPartyAssignments" entity-name="WorkEffortPartyAssignment">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments">
<field-map field-name="workEffortId" from-field="taskId"/>
</entity-and>
<if-not-empty field="workEffortPartyAssignments">

- <iterate entry="workEffortPartyAssignment" list="workEffortPartyAssignments">
+ <iterate list="workEffortPartyAssignments" entry="workEffortPartyAssignment">
<remove-value value-field="workEffortPartyAssignment"/>
</iterate>
</if-not-empty>
@@ -1651,7 +1651,7 @@
<set field="update.custRequestTypeId" from-field="parameters.custRequestTypeId"/>
<call-service service-name="updateCustRequest" in-map-name="update"/>

- <entity-and list="custRequestItemList" entity-name="CustRequestItem">
+ <entity-and entity-name="CustRequestItem" list="custRequestItemList">
<field-map field-name="custRequestId" from-field="parameters.custRequestId"/>
</entity-and>
<first-from-list entry="custRequestItemMap" list="custRequestItemList"/>
@@ -1799,7 +1799,7 @@
<set field="partyCompany" value="${parameters.partyId}"/>
<if-compare operator="equals" value="Y" field="parameters.isCloseBtn">
<set field="companyId" from-field="parameters.companyId"/>
- <entity-and list="owner" entity-name="PartyRelationship">
+ <entity-and entity-name="PartyRelationship" list="owner">
<field-map field-name="partyIdFrom" from-field="companyId"/>
</entity-and>

@@ -1818,12 +1818,12 @@
</if-empty>
<if-not-empty field="companyId" >
<now-timestamp field="nowTimestamp"/>
- <entity-and list="productRoleList" entity-name="ProductRole">
+ <entity-and entity-name="ProductRole" list="productRoleList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
</entity-and>
<if-empty field="productRoleList">
- <entity-and list="partyRoleList" entity-name="PartyRole">
+ <entity-and entity-name="PartyRole" list="partyRoleList">
<field-map field-name="partyId" value="${companyId}"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
</entity-and>
@@ -1845,7 +1845,7 @@
</if-empty>
<log level="info" message="${productRoleList[0].partyId}"/>
<if-compare operator="not-equals" value="${companyId}" field="productRoleList[0].partyId">
- <entity-and list="ownerProductRoles" entity-name="ProductRole" filter-by-date="true">
+ <entity-and entity-name="ProductRole" list="ownerProductRoles" filter-by-date="true">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>
@@ -1855,7 +1855,7 @@
<set field="removeProductOwnerRole.userLogin" from-field="systemUserLogin"/>
<call-service service-name="removePartyFromProduct" in-map-name="removeProductOwnerRole"/>
</if-not-empty>
- <entity-and list="companyRoles" entity-name="ProductRole" filter-by-date="true">
+ <entity-and entity-name="ProductRole" list="companyRoles" filter-by-date="true">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
<field-map field-name="partyId" from-field="productRoleList[0].partyId"/>
@@ -1873,7 +1873,7 @@
<set field="updateProdOwner.fromDate" from-field="productRole.fromDate"/>
<set field="updateProdOwner.userLogin" from-field="systemUserLogin"/>
<call-service service-name="addPartyToProduct" in-map-name="updateProdOwner"/>
- <entity-and list="productCompList" entity-name="ProductRole">
+ <entity-and entity-name="ProductRole" list="productCompList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="partyId" from-field="companyId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER_COMP"/>
@@ -1900,18 +1900,18 @@
<call-service service-name="updateProduct" in-map-name="update"/>
<if-compare operator="equals" value="PRODUCT_CLOSED" field="parameters.statusId">

- <entity-and list="defaultTaskList" entity-name="WorkEffortAndProduct">
+ <entity-and entity-name="WorkEffortAndProduct" list="defaultTaskList">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="workEffortPurposeTypeId" value="SCRUM_DEFAULT_TASK"/>
</entity-and>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTaskMap" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTaskMap">
<set field="defaultTaskMap.currentStatusId" value="STS_COMPLETED"/>
<store-value value-field="defaultTaskMap"/>
</iterate>
</if-not-empty>

- <entity-and list="projects" entity-name="WorkEffortAndProduct">
+ <entity-and entity-name="WorkEffortAndProduct" list="projects">
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="workEffortTypeId" value="SCRUM_PROJECT"/>
</entity-and>
@@ -2097,7 +2097,7 @@
</condition-list>
</entity-condition>

- <entity-and list="roleList" entity-name="ScrumPersonAndCompanyAndSecurityGroup">
+ <entity-and entity-name="ScrumPersonAndCompanyAndSecurityGroup" list="roleList">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="groupId" value="SCRUM_TEAM"/>
</entity-and>
@@ -2107,7 +2107,7 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <iterate entry="assigned" list="assigneds">
+ <iterate list="assigneds" entry="assigned">
<remove-value value-field="assigned"/>
</iterate>
<set field="newInput.partyId" from-field="parameters.partyId"/>
@@ -2124,7 +2124,7 @@
</if-not-empty>


- <entity-and list="custRequestWorkEffortList" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestWorkEffortList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<first-from-list entry="custRequestWorkEffortMap" list="custRequestWorkEffortList"/>
@@ -2213,7 +2213,7 @@
<if-compare operator="equals" value="SCRUM_STAKEHOLDER" field="parameters.groupId">
<set field="parameters.roleTypeId" value="STAKEHOLDER"/>
</if-compare>
- <entity-and list="partyRoles" entity-name="PartyRole">
+ <entity-and entity-name="PartyRole" list="partyRoles">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>
@@ -2228,7 +2228,7 @@
<field-map field-name="groupId" from-field="parameters.groupId"/>
</entity-and>
<if-not-empty field="userLoginSecurityGroups">
- <iterate entry="userLoginSecurityGroup" list="userLoginSecurityGroups">
+ <iterate list="userLoginSecurityGroups" entry="userLoginSecurityGroup">
<remove-value value-field="userLoginSecurityGroup"/>
</iterate>
</if-not-empty>
@@ -2245,7 +2245,7 @@
<select-field field-name="roleTypeId"/>
</entity-condition>
<if-not-empty field="partyRoleList">
- <iterate entry="partyRoleMap" list="partyRoleList">
+ <iterate list="partyRoleList" entry="partyRoleMap">
<if>
<condition>
<and>
@@ -2385,7 +2385,7 @@
<get-related relation-name="CustRequestWorkEffort" list="custRequestWorkEffortList" value-field="custRequestMap"/>

<if-not-empty field="custRequestWorkEffortList">
- <iterate entry="custRequestWorkEffortMap" list="custRequestWorkEffortList">
+ <iterate list="custRequestWorkEffortList" entry="custRequestWorkEffortMap">
<get-related-one relation-name="WorkEffort" value-field="custRequestWorkEffortMap" to-value-field="workEffortMap" />
<if-compare field="workEffortMap.workEffortTypeId" operator="equals" value="SCRUM_SPRINT" >
<remove-value value-field="custRequestWorkEffortMap"/>
@@ -2403,16 +2403,16 @@
<set field="setCustStatus.statusId" value="CRQ_REOPENED"/>
<call-service service-name="setCustRequestStatus" in-map-name="setCustStatus"/>

- <entity-and list="backlog" entity-name="CustRequest">
+ <entity-and entity-name="CustRequest" list="backlog">
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
</entity-and>
- <entity-and list="projectAndTaskList" entity-name="ProjectSprintBacklogAndTask">
+ <entity-and entity-name="ProjectSprintBacklogAndTask" list="projectAndTaskList">
<field-map field-name="sprintTypeId" value="SCRUM_SPRINT"/>
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
<select-field field-name="projectId"/>
<select-field field-name="sprintId"/>
</entity-and>
- <entity-and list="unPlannedTasks" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-and entity-name="UnPlannedBacklogsAndTasks" list="unPlannedTasks">
<field-map field-name="custRequestId" from-field="formInput.formInput.custRequestId"/>
<field-map field-name="workEffortId" from-field="formInput.formInput.workEffortId"/>
<select-field field-name="productId"/>
@@ -2436,7 +2436,7 @@
</else>
</if-not-empty>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="workEffortTypeId" from-field="defaultTask.workEffortTypeId"/>
<if>
<condition>
@@ -2454,11 +2454,11 @@
</iterate>
<else>

- <entity-and list="defaultTaskList" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="defaultTaskList">
<field-map field-name="workEffortPurposeTypeId" value="SYSTEM_DEFAULT_TASK"/>
</entity-and>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="workEffortTypeId" from-field="defaultTask.workEffortTypeId"/>
<if>
<condition>
@@ -2728,7 +2728,7 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="roleTypeId" value="SCRUM_TEAM"/>
</entity-and>
- <iterate entry="assigned" list="assigneds">
+ <iterate list="assigneds" entry="assigned">
<remove-value value-field="assigned"/>
</iterate>
<set field="newInput.partyId" from-field="parameters.partyId"></set>
@@ -3107,7 +3107,7 @@
<call-service service-name="getScrumPlanHour" in-map-name="planMap">
<result-to-field result-name="planHours"/>
</call-service>
- <if-compare-field operator="not-equals" field="planHours" to-field="actualHours" type="Double">
+ <if-compare-field field="planHours" operator="not-equals" to-field="actualHours" type="Double">
<set field="planHours" from-field="actualHours" />
<entity-condition entity-name="TimeEntry" list="lastTimeEntrys">
<condition-list combine="and">
@@ -3140,7 +3140,7 @@
</loop>

<if-not-empty field="assigns">
- <iterate entry="assign" list="assigns">
+ <iterate list="assigns" entry="assign">
<set field="assign.statusId" value="SCAS_COMPLETED"/>
<store-value value-field="assign" />
</iterate>
@@ -3180,7 +3180,7 @@
<get-related relation-name="CustRequestWorkEffort" list="custRequestWorkEffortList" value-field="custRequest"/>

<if-not-empty field="custRequestWorkEffortList">
- <iterate entry="custRequestWorkEffortMap" list="custRequestWorkEffortList">
+ <iterate list="custRequestWorkEffortList" entry="custRequestWorkEffortMap">
<get-related-one relation-name="WorkEffort" value-field="custRequestWorkEffortMap" to-value-field="workEffortMap" />
<if-compare field="workEffortMap.workEffortTypeId" operator="equals" value="SCRUM_SPRINT" >
<remove-value value-field="custRequestWorkEffortMap"/>
@@ -3260,7 +3260,7 @@

<if-empty field="assignedList">

- <entity-and list="custRequestList" entity-name="CustRequestWorkEffort">
+ <entity-and entity-name="CustRequestWorkEffort" list="custRequestList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<entity-one value-field="custRequest" entity-name="CustRequest">
@@ -3308,7 +3308,7 @@
<entity-and entity-name="WorkEffortPartyAssignment" list="assigneds">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
- <iterate entry="assigned" list="assigneds">
+ <iterate list="assigneds" entry="assigned">
<remove-value value-field="assigned"/>
</iterate>
<set field="partyId" from-field="parameters.partyId"/>
@@ -3329,7 +3329,7 @@
</simple-method>

<simple-method method-name="CopyMemberLastSprint" short-description="">
- <entity-and list="sprintList" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="sprintList">
<field-map field-name="workEffortParentId" from-field="parameters.projectId"/>
<field-map field-name="workEffortTypeId" value="SCRUM_SPRINT"/>
<order-by field-name="createdDate DESC"/>
@@ -3351,7 +3351,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="memberPrevSprint">
- <iterate entry="member" list="memberPrevSprint">
+ <iterate list="memberPrevSprint" entry="member">
<entity-and list="sprintmember" entity-name="WorkEffortPartyAssignment">
<field-map field-name="partyId" from-field="member.partyId"/>
<field-map field-name="roleTypeId" from-field="member.roleTypeId"/>
@@ -3477,7 +3477,7 @@
<if-not-empty field="custWorkEffortList">
<remove-related value-field="workEffortMap" relation-name="CustRequestWorkEffort"/>
</if-not-empty>
- <entity-and list="workEffGSDList" entity-name="WorkEffortGoodStandard">
+ <entity-and entity-name="WorkEffortGoodStandard" list="workEffGSDList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="workEffGSDList">
@@ -3537,7 +3537,7 @@
</condition-list>
</entity-count>

- <if-compare operator="equals" field="getNum" value="0">
+ <if-compare field="getNum" operator="equals" value="0">
<set field="createCustRequestInMap.custSequenceNum" from-field="parameters.custSequenceNum"/>
<else>
<entity-condition list="custRequestList" entity-name="CustRequestAndCustRequestItem">
@@ -3645,7 +3645,7 @@
<field-map field-name="productId" from-field="parameters.productId"/>
</entity-and>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="newDefaultTask.workEffortName" from-field="defaultTask.workEffortName"/>
<set field="newDefaultTask.estimatedMilliSeconds" from-field="defaultTask.estimatedMilliSeconds"/>
<set field="newDefaultTask.currentStatusId" from-field="defaultTask.currentStatusId"/>
@@ -3697,11 +3697,11 @@
</iterate>
<else>

- <entity-and list="defaultTaskScrum" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="defaultTaskScrum">
<field-map field-name="workEffortPurposeTypeId" value="SYSTEM_DEFAULT_TASK"/>
</entity-and>
<if-not-empty field="defaultTaskScrum">
- <iterate entry="defaultScrum" list="defaultTaskScrum">
+ <iterate list="defaultTaskScrum" entry="defaultScrum">
<set field="newDefaultTaskScrum.workEffortName" from-field="defaultScrum.workEffortName"/>
<set field="newDefaultTaskScrum.estimatedMilliSeconds" from-field="defaultScrum.estimatedMilliSeconds"/>
<set field="newDefaultTaskScrum.currentStatusId" from-field="defaultScrum.currentStatusId"/>
@@ -3807,7 +3807,7 @@
<field-map field-name="productId" from-field="parameters.productId"/>
</entity-and>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="newDefaultTask.workEffortName" from-field="defaultTask.workEffortName"/>
<set field="newDefaultTask.estimatedMilliSeconds" from-field="defaultTask.estimatedMilliSeconds"/>
<set field="newDefaultTask.currentStatusId" from-field="defaultTask.currentStatusId"/>
@@ -3838,11 +3838,11 @@
</iterate>
<else>

- <entity-and list="defaultTaskScrum" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="defaultTaskScrum">
<field-map field-name="workEffortPurposeTypeId" value="SYSTEM_DEFAULT_TASK"/>
</entity-and>
<if-not-empty field="defaultTaskScrum">
- <iterate entry="defaultScrum" list="defaultTaskScrum">
+ <iterate list="defaultTaskScrum" entry="defaultScrum">
<set field="newDefaultTaskScrum.workEffortName" from-field="defaultScrum.workEffortName"/>
<set field="newDefaultTaskScrum.estimatedMilliSeconds" from-field="defaultScrum.estimatedMilliSeconds"/>
<set field="newDefaultTaskScrum.currentStatusId" from-field="defaultScrum.currentStatusId"/>
@@ -3898,7 +3898,7 @@
<set field="update.currentStatusId" value="STS_CREATED"/>
<call-service service-name="updateWorkEffort" in-map-name="update"/>

- <entity-and list="assign" entity-name="WorkEffortPartyAssignment">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assign">
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
</entity-and>
<if-not-empty field="assign">
@@ -3912,17 +3912,17 @@
</call-service>
</if-not-empty>

- <entity-and list="backlogTask" entity-name="ProjectSprintBacklogAndTask">
+ <entity-and entity-name="ProjectSprintBacklogAndTask" list="backlogTask">
<field-map field-name="taskId" from-field="parameters.taskId"/>
<field-map field-name="sprintTypeId" value="SCRUM_SPRINT"/>
</entity-and>
<if-empty field="backlogTask">
- <entity-and list="backlogTask" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-and entity-name="UnPlannedBacklogsAndTasks" list="backlogTask">
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
<field-map field-name="custRequestTypeId" value="RF_UNPLAN_BACKLOG"/>
</entity-and>
</if-empty>
- <entity-and list="backlog" entity-name="CustRequest">
+ <entity-and entity-name="CustRequest" list="backlog">
<field-map field-name="custRequestId" from-field="backlogTask[0].custRequestId"/>
</entity-and>

@@ -3934,13 +3934,13 @@


<if-compare field="workEffortMap.workEffortTypeId" operator="not-equals" value="SCRUM_TASK_TEST">
- <entity-and list="projectAndTaskList" entity-name="ProjectSprintBacklogAndTask">
+ <entity-and entity-name="ProjectSprintBacklogAndTask" list="projectAndTaskList">
<field-map field-name="sprintTypeId" value="SCRUM_SPRINT"/>
<field-map field-name="taskId" from-field="parameters.taskId"/>
<select-field field-name="projectId"/>
<select-field field-name="sprintId"/>
</entity-and>
- <entity-and list="unPlannedTasks" entity-name="UnPlannedBacklogsAndTasks">
+ <entity-and entity-name="UnPlannedBacklogsAndTasks" list="unPlannedTasks">
<field-map field-name="custRequestId" from-field="backlog[0].custRequestId"/>
<field-map field-name="workEffortId" from-field="parameters.taskId"/>
<select-field field-name="productId"/>
@@ -3964,7 +3964,7 @@
</else>
</if-not-empty>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="workEffortTypeId" from-field="defaultTask.workEffortTypeId"/>
<if>
<condition>
@@ -3999,11 +3999,11 @@
</iterate>
<else>

- <entity-and list="defaultTaskList" entity-name="WorkEffort">
+ <entity-and entity-name="WorkEffort" list="defaultTaskList">
<field-map field-name="workEffortPurposeTypeId" value="SYSTEM_DEFAULT_TASK"/>
</entity-and>
<if-not-empty field="defaultTaskList">
- <iterate entry="defaultTask" list="defaultTaskList">
+ <iterate list="defaultTaskList" entry="defaultTask">
<set field="workEffortTypeId" from-field="defaultTask.workEffortTypeId"/>
<if>
<condition>
@@ -4309,14 +4309,14 @@
<entity-one entity-name="UserLogin" value-field="systemUserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
- <entity-and list="productRoleList" entity-name="ProductRole">
+ <entity-and entity-name="ProductRole" list="productRoleList">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="productId" from-field="parameters.productId"/>
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
<field-map field-name="thruDate" value=""/>
</entity-and>
<if-empty field="productRoleList">
- <entity-and list="partyRoleList" entity-name="PartyRole">
+ <entity-and entity-name="PartyRole" list="partyRoleList">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>

Modified: ofbiz/trunk/specialpurpose/scrum/minilang/ScrumPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/minilang/ScrumPermissionServices.xml?rev=1768209&r1=1768208&r2=1768209&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/minilang/ScrumPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/minilang/ScrumPermissionServices.xml Sat Nov 5 12:41:35 2016
@@ -136,17 +136,17 @@
</condition>
<then>

- <entity-and list="productRoles" entity-name="ProductRole">
+ <entity-and entity-name="ProductRole" list="productRoles">
<field-map field-name="productId" from-field="productId"/>
<field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="roleTypeId" value="PRODUCT_OWNER"/>
</entity-and>

- <entity-and list="projectSprints" entity-name="ProjectSprint">
+ <entity-and entity-name="ProjectSprint" list="projectSprints">
<field-map field-name="productId" from-field="productId"/>
</entity-and>
<set field="isMembership" type="Boolean" value="false"/>
- <iterate entry="projectSprintEntry" list="projectSprints">
+ <iterate list="projectSprints" entry="projectSprintEntry">
<entity-condition list="assigns" entity-name="WorkEffortPartyAssignAndRoleType">
<condition-list>
<condition-expr field-name="workEffortId" operator="equals" from-field="projectSprintEntry.sprintId"/>