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:04:26 UTC
svn commit: r730109 [3/3] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/ledger/
applications/accounting...
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 04:04:24 2008
@@ -224,7 +224,7 @@
</if-not-empty>
</if-not-empty>
<set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
- <clear-field field-name="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created -->
+ <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created -->
<call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap">
<result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/>
</call-service>
@@ -250,7 +250,7 @@
<set field="invoiceItemMap.description" from-field="workEffort.workEffortName"/>
</if-empty>
<set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/>
- <clear-field field-name="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created -->
+ <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created -->
<call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap">
<result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/>
</call-service>
@@ -333,7 +333,7 @@
<simple-method method-name="unlinkInvoiceFromTimeEntry" short-description="Delete TimeEntry">
<entity-one entity-name="TimeEntry" value-name="lookedUpValue"/>
<field-to-result field-name="invoiceId" map-name="lookedUpValue"/>
- <clear-field field-name="lookedUpValue.invoiceId"/>
+ <clear-field field="lookedUpValue.invoiceId"/>
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="getTimeEntryRate" short-description="Get TimeEntry Rate">
Modified: ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml (original)
+++ ofbiz/trunk/framework/bi/script/org/ofbiz/bi/DimensionServices.xml Tue Dec 30 04:04:24 2008
@@ -26,12 +26,12 @@
<call-service service-name="loadDateDimension" in-map-name="inMap"/>
<check-errors/>
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<call-service service-name="loadCurrencyDimension" in-map-name="inMap"/>
<check-errors/>
<!-- loads all products in the ProductDimension -->
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<call-service service-name="loadAllProductsInProductDimension" in-map-name="inMap"/>
<check-errors/>
@@ -44,7 +44,7 @@
</condition-list>
</entity-condition>
<iterate list="invoices" entry="invoice">
- <clear-field field-name="inMap"/>
+ <clear-field field="inMap"/>
<set field="inMap.invoiceId" from-field="invoice.invoiceId"/>
<call-service service-name="loadSalesInvoiceFact" in-map-name="inMap"/>
<check-errors/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Tue Dec 30 04:04:24 2008
@@ -63,7 +63,7 @@
</call-service>
<iterate entry="curOrganizationPartyId" list="parentOrganizationPartyIdList">
- <clear-field field-name="orgTimePeriodList"/>
+ <clear-field field="orgTimePeriodList"/>
<entity-condition entity-name="CustomTimePeriod" list-name="orgTimePeriodList">
<condition-list combine="and">
<condition-list combine="or">
Modified: ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml (original)
+++ ofbiz/trunk/specialpurpose/googleCheckout/script/org/ofbiz/googleCheckout/ShoppingCartServices.xml Tue Dec 30 04:04:24 2008
@@ -83,7 +83,7 @@
<!-- tax table for item-->
<call-simple-method method-name="getItemTaxTable"/>
<field-to-list field-name="thisItem" list-name="items"/>
- <clear-field field-name="thisItem"/>
+ <clear-field field="thisItem"/>
</iterate>
</simple-method>
<simple-method method-name="setupExpiration"
Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730109&r1=730108&r2=730109&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Tue Dec 30 04:04:24 2008
@@ -39,7 +39,7 @@
<simple-method method-name="tc_ReceiveProductQty" short-description="Receive Product to Facility" login-required="false">
<log level="info" message="Receive product ${parameters.productId} qty ${parameters.qty} to location ${parameters.location} in facility ${parameters.facilityId} "/>
<now-timestamp-to-env env-name="nowTimestamp"/>
- <clear-field field-name="receiveCtx"/>
+ <clear-field field="receiveCtx"/>
<set from-field="parameters.facilityId" field="receiveCtx.facilityId"/>
<set from-field="parameters.productId" field="receiveCtx.productId"/>
<set from-field="parameters.productQty" field="receiveCtx.quantityAccepted"/>
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=730109&r1=730108&r2=730109&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:04:24 2008
@@ -167,7 +167,7 @@
<if-compare field="parameters.statusId" value="PAS_ENDED" operator="equals">
<!-- special case to indicate end of assignment -->
<now-date-to-env env-name="assignment.thruDate"/>
- <clear-field field-name="parameters.statusId"/>
+ <clear-field field="parameters.statusId"/>
</if-compare>
<set-nonpk-fields value-field="assignment" map="parameters"/>
<store-value value-name="assignment"/>
@@ -250,8 +250,8 @@
<if-not-empty field="tasks">
<!-- remove all estimated dates -->
<iterate entry="task" list="tasks">
- <clear-field field-name="task.estimatedStartDate"/>
- <clear-field field-name="task.estimatedCompletionDate"/>
+ <clear-field field="task.estimatedStartDate"/>
+ <clear-field field="task.estimatedCompletionDate"/>
</iterate>
<first-from-list entry="task" list="tasks"/>
@@ -271,7 +271,7 @@
</entity-and>
<if-not-empty field="assocs">
<iterate entry="assoc" list="assocs">
- <clear-field field-name="hours"/>
+ <clear-field field="hours"/>
<set field="getTask.taskId" from-field="assoc.workEffortIdFrom"/>
<call-service service-name="getProjectTask" in-map-name="getTask">
<result-to-field result-name="estimatedHours"/>
@@ -531,7 +531,7 @@
</else>
</if-not-empty>
<set field="parameters.currentStatusId" value="PRJ_ACTIVE"/>
- <clear-field field-name="parameters.workEffortId"/>
+ <clear-field field="parameters.workEffortId"/>
<set field="parameters.workEffortName" from-field="project.workEffortName"/>
<call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
<set field="newProjectId" from-field="newEntity.workEffortId"/>
@@ -552,7 +552,7 @@
<get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/>
<if-not-empty field="phases">
<iterate entry="phase" list="phases">
- <clear-field field-name="newPhase"/>
+ <clear-field field="newPhase"/>
<if-not-empty field="toTemplate">
<set field="parameters.workEffortTypeId" value="PHASE_TEMPLATE"/>
<else>
@@ -562,14 +562,14 @@
<set field="parameters.workEffortName" from-field="phase.workEffortName"/>
<set field="parameters.workEffortParentId" from-field="newProjectId"/>
<set field="parameters.currentStatusId" value="_NA_"/>
- <clear-field field-name="parameters.workEffortId"/>
+ <clear-field field="parameters.workEffortId"/>
<call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
<set field="newPhaseId" from-field="newEntity.workEffortId"/>
<get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/>
<if-not-empty field="tasks">
<iterate entry="task" list="tasks">
- <clear-field field-name="newTask"/>
+ <clear-field field="newTask"/>
<if-not-empty field="toTemplate">
<set field="newTask.workEffortTypeId" value="TASK_TEMPLATE"/>
<else>
@@ -580,7 +580,7 @@
<set field="parameters.priority" from-field="task.priority"/>
<set field="parameters.workEffortParentId" from-field="newPhaseId"/>
<set field="parameters.currentStatusId" value="PTS_CREATED"/>
- <clear-field field-name="parameters.workEffortId"/>
+ <clear-field field="parameters.workEffortId"/>
<call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
</iterate>
</if-not-empty>
@@ -681,7 +681,7 @@
<entity-one entity-name="StatusItem" value-name="highSeq">
<field-map field-name="statusId" from-field="phase.currentStatusId"/>
</entity-one>
- <clear-field field-name="highInfo"/>
+ <clear-field field="highInfo"/>
<set field="highInfo.sequenceId" from-field="highSeq.sequenceId"/>
<set field="highInfo.phaseId" from-field="phase.workEffortId"/>
<set field="highInfo.phaseName" from-field="phase.workEffortName"/>
@@ -711,7 +711,7 @@
<field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
</entity-and>
<first-from-list entry="status" list="statusses"/>
- <clear-field field-name="highInfo.sequenceId"/>
+ <clear-field field="highInfo.sequenceId"/>
<set field="highInfo.currentStatusId" from-field="status.statusId"/>
<!-- however the status 'completed' can only be 'completed' when all related tasks are completed -->
@@ -754,14 +754,14 @@
<iterate entry="lowInfo" list="tasks">
<set field="highInfo.phaseName" from-field="lowInfo.phaseName"/>
<call-simple-method method-name="combineInfo"/>
- <clear-field field-name="highInfo.sequenceId"/>
+ <clear-field field="highInfo.sequenceId"/>
<set field="highInfo.currentStatusId" from-field="lowInfo.currentStatusId"/>
<call-simple-method method-name="createDates"/>
<call-simple-method method-name="getHours"/>
<set field="highInfo.workEffortId" from-field="lowInfo.workEffortId"/>
<set field="highInfo.workEffortName" from-field="lowInfo.workEffortName"/>
<field-to-list field-name="highInfo" list-name="taskList"/>
- <clear-field field-name="highInfo"/>
+ <clear-field field="highInfo"/>
</iterate>
</if-not-empty>
<!-- results -->
@@ -805,8 +805,8 @@
</condition>
<then>
<field-to-list field-name="projectParty" list-name="projectParties"/>
- <clear-field field-name="projectParty"/>
- <clear-field field-name="highInfo"/>
+ <clear-field field="projectParty"/>
+ <clear-field field="highInfo"/>
</then>
</if>
@@ -869,7 +869,7 @@
</condition>
<then>
<field-to-list field-name="taskParty" list-name="taskParties"/>
- <clear-field field-name="taskParty"/>
+ <clear-field field="taskParty"/>
</then>
</if>
@@ -1166,7 +1166,7 @@
<set field="teDelMap.timeEntryId" from-field="timeEntry.timeEntryId"/>
<call-service service-name="deleteTimeEntry" in-map-name="teDelMap"/>
<else>
- <clear-field field-name="teUpdMap"/>
+ <clear-field field="teUpdMap"/>
<set field="teUpdMap.hours" from-field="hours"/>
<set field="teUpdMap.timeEntryId" from-field="timeEntry.timeEntryId"/>
<set field="teUpdMap.rateTypeId" from-field="parameters.rateTypeId"/>
@@ -1243,8 +1243,8 @@
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
</entity-and>
<iterate list="entries" entry="timeEntry">
- <clear-field field-name="timeEntry.invoiceId"/>
- <clear-field field-name="timeEntry.invoiceItemSeqId"/>
+ <clear-field field="timeEntry.invoiceId"/>
+ <clear-field field="timeEntry.invoiceItemSeqId"/>
<store-value value-name="timeEntry"/>
</iterate>
<set field="removeItems.invoiceId" from-field="parameters.invoiceId"/>