You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 13:17:05 UTC
svn commit: r730118 [2/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accoun...
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730118&r1=730117&r2=730118&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 04:17:03 2008
@@ -113,7 +113,7 @@
</if-compare-field>
</simple-method>
<simple-method method-name="createCommunicationEventRoles" short-description="">
- <entity-condition list-name="commEvents" entity-name="CommunicationEvent" />
+ <entity-condition list="commEvents" entity-name="CommunicationEvent" />
<set field="count" value="0" type="Integer" />
<iterate entry="commEvent" list="commEvents">
<get-related value-name="commEvent" relation-name="CommunicationEventRole" list-name="roles" />
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730118&r1=730117&r2=730118&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 04:17:03 2008
@@ -114,7 +114,7 @@
</if-compare-field>
</simple-method>
<simple-method method-name="createCommunicationEventRoles" short-description="">
- <entity-condition list-name="commEvents" entity-name="CommunicationEvent"/>
+ <entity-condition list="commEvents" entity-name="CommunicationEvent"/>
<set field="count" value="0" type="Integer"/>
<iterate entry="commEvent" list="commEvents">
<log level="always" message="====processing: ${commEvent.communicationEventId}"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730118&r1=730117&r2=730118&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 04:17:03 2008
@@ -242,7 +242,7 @@
<field-to-result map-name="parameters" field="projectId"/>
<!-- find a starting point being either the estimated start date of a project or the earliest actual start date. -->
- <entity-condition entity-name="ProjectAndPhaseAndTask" list-name="tasks">
+ <entity-condition entity-name="ProjectAndPhaseAndTask" list="tasks">
<condition-expr field-name="actualStartDate" operator="not-equals" env-name="null"/>
<order-by field-name="-actualStartDate"/>
</entity-condition>
@@ -785,7 +785,7 @@
</simple-method>
<simple-method method-name="getProjectsByParties" short-description="get Project information by party member" login-required="true">
- <entity-condition entity-name="ProjectAndPhaseAndTaskParty" list-name="tasks">
+ <entity-condition entity-name="ProjectAndPhaseAndTaskParty" list="tasks">
<condition-list combine="and">
<condition-expr field-name="projectId" operator="equals" env-name="parameters.projectId" ignore-if-empty="true"/>
<condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId" ignore-if-empty="true"/>
@@ -848,7 +848,7 @@
<if-empty field="parameters.workEffortId">
<set field="parameters.workEffortId" value="%"/>
</if-empty>
- <entity-condition entity-name="WorkEffortPartyAssignment" list-name="tasks" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="tasks" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="partyId" operator="like" env-name="parameters.partyId"/>
<condition-expr field-name="workEffortId" operator="like" env-name="parameters.workEffortId"/>
@@ -1038,7 +1038,7 @@
<!-- check if only a part of the registered hours need to be taken into account -->
<set field="originalActualHours" from-field="actual.hours"/>
- <entity-condition entity-name="PartyRate" list-name="partyRates">
+ <entity-condition entity-name="PartyRate" list="partyRates">
<condition-list combine="and">
<condition-expr field-name="partyId" env-name="timesheet.partyId"/>
<condition-expr field-name="rateTypeId" env-name="actual.rateTypeId"/>
@@ -1187,7 +1187,7 @@
<simple-method method-name="createTimeEntryInTimesheet" short-description="Creates TimeEntry and searches for a timesheetId if not provided">
<if-not-empty field="parameters.fromDate">
<if-empty field="parameters.timesheetId">
- <entity-condition entity-name="Timesheet" list-name="timesheets">
+ <entity-condition entity-name="Timesheet" list="timesheets">
<condition-list combine="and">
<condition-expr field-name="fromDate" operator="less-equals" env-name="parameters.fromDate"/>
<condition-expr field-name="thruDate" operator="greater-equals" env-name="parameters.fromDate"/>
@@ -1251,7 +1251,7 @@
<remove-by-and entity-name="InvoiceItem" map-name="removeItems"/>
<set field="notFirst" value="Y"/><!-- do not create, only add -->
</if-compare>
- <entity-condition entity-name="ProjectPhaseTaskAndTimeEntryTimeSheet" list-name="tasks">
+ <entity-condition entity-name="ProjectPhaseTaskAndTimeEntryTimeSheet" list="tasks">
<condition-list combine="and">
<condition-expr field-name="projectId" operator="equals" env-name="parameters.projectId"/>
<condition-expr field-name="invoiceId" operator="equals" env-name="nullField"/>
@@ -1304,7 +1304,7 @@
<simple-method method-name="addValidationPartiesToTask" short-description="SECA to add either project-testing or -approval parties to a task when a task is set to complete">
<!-- check if this is the last party which completed his task -->
- <entity-condition entity-name="WorkEffortPartyAssignment" list-name="openTasks" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="openTasks" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="workEffortId" operator="equals" env-name="parameters.workEffortId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PAS_COMPLETED"/>
@@ -1317,7 +1317,7 @@
<result-to-field result-name="projectId"/>
</call-service>
<!-- see who is reponsible for testing/validation in this project -->
- <entity-condition entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true">
+ <entity-condition entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="workEffortId" operator="equals" env-name="projectId"/>
<condition-expr field-name="partyId" operator="not-equals" env-name="parameters.partyId"/><!-- should not test/val own work -->
Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml?rev=730118&r1=730117&r2=730118&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml Tue Dec 30 04:17:03 2008
@@ -21,7 +21,7 @@
<simple-method method-name="FindProducts" short-description="Find products by name/description" login-required="false">
<!-- Search by product name -->
<if-compare field="parameters.searchBy" operator="equals" value="productName">
- <entity-condition entity-name="Product" list-name="products">
+ <entity-condition entity-name="Product" list="products">
<select-field field-name="productId"/>
<select-field field-name="productName"/>
<order-by field-name="productName"/>
@@ -37,7 +37,7 @@
<else>
<!-- Search by product description -->
<if-compare field="parameters.searchBy" operator="equals" value="productDescription">
- <entity-condition entity-name="Product" list-name="products">
+ <entity-condition entity-name="Product" list="products">
<select-field field-name="productId"/>
<select-field field-name="description"/>
<order-by field-name="description"/>
@@ -57,7 +57,7 @@
<simple-method method-name="FindProductsByIdentification" short-description="Find products by good identification" login-required="false">
<!-- Search by good identification -->
- <entity-condition entity-name="GoodIdentificationAndProduct" list-name="products">
+ <entity-condition entity-name="GoodIdentificationAndProduct" list="products">
<select-field field-name="productId"/>
<select-field field-name="idValue"/>
<order-by field-name="idValue"/>