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 12:00:50 UTC
svn commit: r730087 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/
applications/party...
Author: jleroux
Date: Tue Dec 30 03:00:49 2008
New Revision: 730087
URL: http://svn.apache.org/viewvc?rev=730087&view=rev
Log:
Follow recent simple-method.xsd changes. But I wonder about something : before tags used in simple-method and other XML files where consistent now it's not
For instance consider "<if-compare field-name" it's always used in widget screens and menus conditions. Same for "<entity-and list-name" and I guess most of others
No functionnal changes
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml
ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Tue Dec 30 03:00:49 2008
@@ -333,7 +333,7 @@
<if-empty field="fixedAssetValue.instanceOfProductId">
<return/>
</if-empty>
- <entity-and list-name="productMaintList" entity-name="ProductMaint">
+ <entity-and list="productMaintList" entity-name="ProductMaint">
<field-map field-name="productId" env-name="fixedAssetValue.instanceOfProductId"/>
<field-map field-name="intervalMeterTypeId" env-name="meterValue.productMeterTypeId"/>
</entity-and>
@@ -550,7 +550,7 @@
<if-empty field="workEffortId">
<set field="workEffortId" from-field="maintValue.scheduleWorkEffortId"/>
</if-empty>
- <entity-and list-name="assignedParties" entity-name="PartyFixedAssetAssignAndRole" filter-by-date="true">
+ <entity-and list="assignedParties" entity-name="PartyFixedAssetAssignAndRole" filter-by-date="true">
<field-map field-name="fixedAssetId" env-name="fixedAssetId"/>
<field-map field-name="parentTypeId" value="FAM_ASSIGNEE"/>
</entity-and>
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Tue Dec 30 03:00:49 2008
@@ -564,10 +564,10 @@
</call-service>
<set-service-fields service-name="updateInvoice" map-name="invoice" to-map-name="updateInvoiceCtx"/>
<set field="updateInvoiceCtx.invoiceId" from-field="invoiceId"/>
- <if-compare field-name="updateInvoiceCtx.invoiceTypeId" operator="equals" value="SALES_INV_TEMPLATE">
+ <if-compare field="updateInvoiceCtx.invoiceTypeId" operator="equals" value="SALES_INV_TEMPLATE">
<set field="updateInvoiceCtx.invoiceTypeId" value="SALES_INVOICE"/>
</if-compare>
- <if-compare field-name="updateInvoiceCtx.invoiceTypeId" operator="equals" value="PUR_INV_TEMPLATE">
+ <if-compare field="updateInvoiceCtx.invoiceTypeId" operator="equals" value="PUR_INV_TEMPLATE">
<set field="updateInvoiceCtx.invoiceTypeId" value="PURCHASE_INVOICE"/>
</if-compare>
<clear-field field-name="invoice"/>
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Tue Dec 30 03:00:49 2008
@@ -222,7 +222,7 @@
<calculate field-name="quantityNotIssued" map-name="parameters"><number value="0"/></calculate>
</if-compare>
<if-not-empty field="workEffortGoodStandard">
- <entity-and list-name="issuances" entity-name="WorkEffortAndInventoryAssign">
+ <entity-and list="issuances" entity-name="WorkEffortAndInventoryAssign">
<field-map field-name="workEffortId" env-name="workEffortGoodStandard.workEffortId"/>
<field-map field-name="productId" env-name="workEffortGoodStandard.productId"/>
</entity-and>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Tue Dec 30 03:00:49 2008
@@ -34,7 +34,7 @@
<simple-method method-name="createCommunicationEvent" short-description="Create a CommunicationEvent with or w/o permission check">
<if-not-empty field="parameters.parentCommEventId">
- <entity-and list-name="roles" entity-name="CommunicationEventRole">
+ <entity-and list="roles" entity-name="CommunicationEventRole">
<field-map field-name="communicationEventId" env-name="parameters.parentCommEventId"/>
<field-map field-name="partyId" env-name="parameters.partyIdFrom"/>
</entity-and>
@@ -299,7 +299,7 @@
<if-not-empty field="eventRole">
<remove-value value-name="eventRole"/>
<if-compare field="parameters.deleteCommEventIfLast" operator="equals" value="Y">
- <entity-and list-name="roles" entity-name="CommunicationEventRole">
+ <entity-and list="roles" entity-name="CommunicationEventRole">
<field-map field-name="communicationEventId" env-name="eventRole.communicationEventId"/>
</entity-and>
<if-empty field="roles">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml Tue Dec 30 03:00:49 2008
@@ -274,7 +274,7 @@
<find-by-primary-key value-name="emailAddressVerification" entity-name="EmailAddressVerification" map-name="lookupHash"/>
<set field="bodyParameters.verifyHash" from-field="emailAddressVerification.verifyHash"/>
<first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
- <entity-and list-name="webSites" entity-name="WebSite">
+ <entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" env-name="storeEmail.productStoreId"/>
</entity-and>
<first-from-list entry-name="webSite" list-name="webSites"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Dec 30 03:00:49 2008
@@ -28,7 +28,7 @@
</if-empty>
<!-- check if the contact mech infostring is already existing if so, do not create a new one-->
- <entity-and list-name="partyAndContactMechs" entity-name="PartyAndContactMech" filter-by-date="true">
+ <entity-and list="partyAndContactMechs" entity-name="PartyAndContactMech" filter-by-date="true">
<field-map field-name="partyId" env-name="parameters.partyId"/>
</entity-and>
<iterate entry-name="partyAndContactMech" list-name="partyAndContactMechs">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Dec 30 03:00:49 2008
@@ -822,7 +822,7 @@
</condition-list>
</entity-condition>
<first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
- <entity-and list-name="webSites" entity-name="WebSite">
+ <entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" env-name="storeEmail.productStoreId"/>
</entity-and>
<first-from-list entry-name="webSite" list-name="webSites"/>
@@ -853,7 +853,7 @@
</condition-list>
</entity-condition>
<first-from-list entry-name="storeEmail" list-name="productStoreEmailSettings"/>
- <entity-and list-name="webSites" entity-name="WebSite">
+ <entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" env-name="storeEmail.productStoreId"/>
</entity-and>
<first-from-list entry-name="webSite" list-name="webSites"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Tue Dec 30 03:00:49 2008
@@ -87,7 +87,7 @@
<set field="updCustReq.custRequestId" from-field="parameters.custRequestId"/>
<set field="updCustReq.statusId" value="CRQ_REVIEWED"/>
<call-service service-name="setCustRequestStatus" in-map-name="updCustReq"/>
- <entity-and list-name="custRequestContents" entity-name="CustRequestContent">
+ <entity-and list="custRequestContents" entity-name="CustRequestContent">
<field-map field-name="custRequestId" env-name="parameters.custRequestId"/>
</entity-and>
<iterate entry-name="custRequestContent" list-name="custRequestContents">
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=730087&r1=730086&r2=730087&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 03:00:49 2008
@@ -99,7 +99,7 @@
<simple-method method-name="checkCommEventAccess" short-description="check if the user has access to the email of this party">
<set field="found" value="false"/>
<if-compare-field operator="not-equals" field="parameters.partyId" to-field="userLogin.partyId">
- <entity-and list-name="emailOwners" entity-name="PartyRelationship" filter-by-date="true">
+ <entity-and list"emailOwners" entity-name="PartyRelationship" filter-by-date="true">
<field-map field-name="partyIdFrom" env-name="userLogin.partyId" />
<field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN" />
<field-map field-name="partyIdTo" env-name="parameters.partyId"/>
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml Tue Dec 30 03:00:49 2008
@@ -96,7 +96,7 @@
<call-service service-name="getPartyEmail" in-map-name="getPartyEmail">
<result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/>
</call-service>
- <entity-and list-name="webSites" entity-name="WebSite">
+ <entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" env-name="storeEmail.productStoreId" />
</entity-and>
<first-from-list entry-name="webSite" list-name="webSites" />
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=730087&r1=730086&r2=730087&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 03:00:49 2008
@@ -97,7 +97,7 @@
<set field="found" value="false"/>
<if-compare-field operator="not-equals" field="parameters.partyId"
to-field="userLogin.partyId">
- <entity-and list-name="emailOwners" entity-name="PartyRelationship"
+ <entity-and list"emailOwners" entity-name="PartyRelationship"
filter-by-date="true">
<field-map field-name="partyIdFrom" value="${userLogin.partyId}"/>
<field-map field-name="roleTypeIdFrom" value="EMAIL_ADMIN"/>
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Tue Dec 30 03:00:49 2008
@@ -96,7 +96,7 @@
<call-service service-name="getPartyEmail" in-map-name="getPartyEmail">
<result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/>
</call-service>
- <entity-and list-name="webSites" entity-name="WebSite">
+ <entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" env-name="storeEmail.productStoreId" />
</entity-and>
<first-from-list entry-name="webSite" list-name="webSites" />
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=730087&r1=730086&r2=730087&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Tue Dec 30 03:00:49 2008
@@ -151,7 +151,7 @@
<!--call-simple-method method-name="checkProjectMembership"/-->
<set field="isMember" value="true" type="Boolean"/>
<!--log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.taskId} PhaseId: ${parameters.workEffortParentId} resourceDescription: ${parameters.resourceDescription} isMember: ${isMember}"/-->
- <entity-and list-name="custRequests" entity-name="WorkEffortCustRequestView">
+ <entity-and list="custRequests" entity-name="WorkEffortCustRequestView">
<field-map field-name="workEffortId" env-name="taskId"/>
</entity-and>
<first-from-list list-name="custRequests" entry-name="custRequest"/>
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=730087&r1=730086&r2=730087&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 03:00:49 2008
@@ -201,7 +201,7 @@
<set field="parameters.currentStatusId" value="PTS_COMPLETED"/>
<call-simple-method method-name="updateWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>
<!-- check for related customer request, set these too to completed -->
- <entity-and list-name="custRequests" entity-name="CustRequestWorkEffort">
+ <entity-and list="custRequests" entity-name="CustRequestWorkEffort">
<field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
</entity-and>
<if-not-empty field="custRequests">
@@ -1239,7 +1239,7 @@
<add-error><fail-message message="Invoice with ID [${parameters.invoiceId}], has the wrong status, not adding Timesheet Entries to it."/></add-error>
<check-errors/>
</if-compare>
- <entity-and list-name="entries" entity-name="TimeEntry">
+ <entity-and list="entries" entity-name="TimeEntry">
<field-map field-name="invoiceId" env-name="parameters.invoiceId"/>
</entity-and>
<iterate list-name="entries" entry-name="timeEntry">