Author: jleroux
Date: Thu Jan 1 15:05:41 2009
New Revision: 730630
URL: http://svn.apache.org/viewvc?rev=730630&view=rev
Log:
<remove-by-and(.*)map-name= => <remove-by-and$1map=
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
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=730630&r1=730629&r2=730630&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
Thu Jan 1 15:05:41 2009
@@ -321,7 +321,7 @@
<set field="paymentApplicationMap.invoiceItemSeqId"
from-field="parameters.invoiceItemSeqId"/>
<if-not-empty field="parameters.invoiceItemSeqId">
<!-- check if there are specific item paymentApplications when yes
remove those -->
- <remove-by-and entity-name="PaymentApplication"
map-name="paymentApplicationMap"/>
+ <remove-by-and entity-name="PaymentApplication"
map="paymentApplicationMap"/>
<else><!-- update global application with a null sequence number
-->
<!-- TODO: reduce amount on global paymentApplication record
-->
</else>
@@ -485,7 +485,7 @@
<!-- if new status is cancelled remove existing payment
applications and time entries. -->
<if-compare field="parameters.statusId" operator="equals"
value="INVOICE_CANCELLED">
<set field="removePaymentApplicationMap.invoiceId"
from-field="parameters.invoiceId"/>
- <remove-by-and entity-name="PaymentApplication"
map-name="removePaymentApplicationMap"/>
+ <remove-by-and entity-name="PaymentApplication"
map="removePaymentApplicationMap"/>
<entity-and entity-name="TimeEntry" list="entries">
<field-map field-name="invoiceId"
from-field="parameters.invoiceId"/>
</entity-and>
Modified:
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=730630&r1=730629&r2=730630&view=diff
==============================================================================
---
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
(original)
+++
ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
Thu Jan 1 15:05:41 2009
@@ -444,7 +444,7 @@
</simple-method>
<simple-method method-name="updateSingleContentPurpose"
short-description="Updates the purpose making sure there is only one">
<set field="toRemove.contentId" from-field="parameters.contentId"/>
- <remove-by-and entity-name="ContentPurpose" map-name="toRemove"/>
+ <remove-by-and entity-name="ContentPurpose" map="toRemove"/>
<call-simple-method method-name="createContentPurpose"/>
</simple-method>
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=730630&r1=730629&r2=730630&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
Thu Jan 1 15:05:41 2009
@@ -1173,18 +1173,18 @@
</if-not-empty>
<if-not-empty field="parameters.removeWorkEffortAssocs">
- <remove-by-and entity-name="WorkEffortAssoc"
map-name="workEffortAssocFindContext"/>
+ <remove-by-and entity-name="WorkEffortAssoc"
map="workEffortAssocFindContext"/>
<!-- small difference here, also do the reverse assocs... -->
- <remove-by-and entity-name="WorkEffortAssoc"
map-name="reverseWorkEffortFindContext"/>
+ <remove-by-and entity-name="WorkEffortAssoc"
map="reverseWorkEffortFindContext"/>
</if-not-empty>
<if-not-empty field="parameters.removeWorkEffortContents">
- <remove-by-and entity-name="WorkEffortContent"
map-name="workEffortFindContext"/>
+ <remove-by-and entity-name="WorkEffortContent"
map="workEffortFindContext"/>
</if-not-empty>
<if-not-empty field="parameters.removeWorkEffortNotes">
- <remove-by-and entity-name="WorkEffortNote"
map-name="workEffortFindContext"/>
+ <remove-by-and entity-name="WorkEffortNote"
map="workEffortFindContext"/>
</if-not-empty>
<if-not-empty field="parameters.removeWorkEffortAssignmentRates">
- <remove-by-and entity-name="RateAmount"
map-name="workEffortFindContext"/>
+ <remove-by-and entity-name="RateAmount"
map="workEffortFindContext"/>
</if-not-empty>
</simple-method>
Modified:
ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730630&r1=730629&r2=730630&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
(original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
Thu Jan 1 15:05:41 2009
@@ -86,7 +86,7 @@
<set field="newEntity.portalPageId"
from-field="portlet.portalPageId"/>
<set field="newEntity.portalPortletId"
from-field="portlet.portalPortletId"/>
<set field="newEntity.portletSeqId"
from-field="portlet.portletSeqId"/>
- <remove-by-and entity-name="PortletAttribute"
map-name="newEntity"/>
+ <remove-by-and entity-name="PortletAttribute" map="newEntity"/>
<remove-value value-field="portlet"/>
</if-not-empty>
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=730630&r1=730629&r2=730630&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
Thu Jan 1 15:05:41 2009
@@ -1248,7 +1248,7 @@
<store-value value-field="timeEntry"/>
</iterate>
<set field="removeItems.invoiceId"
from-field="parameters.invoiceId"/>
- <remove-by-and entity-name="InvoiceItem" map-name="removeItems"/>
+ <remove-by-and entity-name="InvoiceItem" map="removeItems"/>
<set field="notFirst" value="Y"/><!-- do not create, only add -->
</if-compare>
<entity-condition entity-name="ProjectPhaseTaskAndTimeEntryTimeSheet"
list="tasks">
