You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/06/14 10:37:36 UTC
svn commit: r667757 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/order/script/org/ofbiz/order/shoppinglist/
applications/party/script/org/ofbiz/party/contact/
applications/party/script/org/ofbiz/party/par...
Author: lektran
Date: Sat Jun 14 01:37:35 2008
New Revision: 667757
URL: http://svn.apache.org/viewvc?rev=667757&view=rev
Log:
Fix a few errors I introduced earlier
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.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/PartyPermissionServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.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=667757&r1=667756&r2=667757&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 Sat Jun 14 01:37:35 2008
@@ -283,7 +283,7 @@
<!-- check if the productNumber is updated, when yes retrieve product description and price -->
<if-not-empty field="productId">
- <if-compare-field to-field="lookedUpValue." field="savedValue.productId" operator="not-equals">
+ <if-compare-field to-field="lookedUpValue.productId" field="savedValue.productId" operator="not-equals">
<entity-one entity-name="Product" value-name="product"/>
<set from-field="product.description" field="lookedUpValue.description"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=667757&r1=667756&r2=667757&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Sat Jun 14 01:37:35 2008
@@ -25,7 +25,7 @@
<condition>
<and>
<not><if-empty field="parameters.partyId"/></not>
- <not><if-compare-field to-field="userLogin." field="parameters.partyId" operator="equals"/></not>
+ <not><if-compare-field to-field="userLogin.partyId" field="parameters.partyId" operator="equals"/></not>
<not><if-has-permission permission="PARTYMGR" action="_CREATE"/></not>
</and>
</condition>
@@ -261,7 +261,7 @@
<if>
<condition>
<and>
- <not><if-compare-field to-field="shoppingList." field="userLogin.partyId" operator="equals"/></not>
+ <not><if-compare-field to-field="shoppingList.partyId" field="userLogin.partyId" operator="equals"/></not>
<not><if-has-permission permission="PARTYMGR" action="_${permissionAction}"/></not>
</and>
</condition>
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=667757&r1=667756&r2=667757&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 Sat Jun 14 01:37:35 2008
@@ -64,7 +64,7 @@
<make-value entity-name="ContactMech" value-name="ContactMechMap"/>
<set-pk-fields value-name="ContactMechMap" map-name="parameters"/>
<find-by-primary-key entity-name="ContactMech" map-name="ContactMechMap" value-name="oldValue" />
- <if-compare-field to-field="oldValue." field="parameters.infoString" operator="not-equals">
+ <if-compare-field to-field="oldValue.infoString" field="parameters.infoString" operator="not-equals">
<log level="info" message="Contact mech need updating"/>
<clone-value value-name="oldValue" new-value-name="newValue"/>
<set-nonpk-fields map-name="parameters" value-name="newValue" set-if-null="false"/>
@@ -148,7 +148,7 @@
<default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
<result-to-field result-name="contactMechId" map-name="newValue"/>
</call-service>
- <if-compare-field to-field="newValue." field="oldValue.contactMechId" operator="not-equals">
+ <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals">
<log level="info" message="Postal address need updating, contact mech changed"/>
<create-value value-name="newValue"/>
<else>
@@ -195,7 +195,7 @@
<default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
<result-to-field result-name="contactMechId" map-name="newValue"/>
</call-service>
- <if-compare-field to-field="newValue." field="oldValue.contactMechId" operator="not-equals">
+ <if-compare-field to-field="newValue.contactMechId" field="oldValue.contactMechId" operator="not-equals">
<log level="info" message="Telecom Number need updating, contact mech changed"/>
<create-value value-name="newValue"/>
<else>
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=667757&r1=667756&r2=667757&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 Sat Jun 14 01:37:35 2008
@@ -86,7 +86,7 @@
<store-value value-name="partyContactMech"/>
<create-value value-name="newPartyContactMech"/>
- <if-compare-field to-field="newPartyContactMech." field="parameters.contactMechId" operator="not-equals">
+ <if-compare-field to-field="newPartyContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
<get-related value-name="partyContactMech" relation-name="PartyContactMechPurpose" list-name="partyContactMechPurposes"/>
<iterate entry-name="partyContactMechPurposeOld" list-name="partyContactMechPurposes">
<clone-value value-name="partyContactMechPurposeOld" new-value-name="partyContactMechPurpose"/>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml?rev=667757&r1=667756&r2=667757&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyPermissionServices.xml Sat Jun 14 01:37:35 2008
@@ -123,7 +123,7 @@
<if-empty field="parameters.partyId">
<set field="parameters.partyId" from-field="userLogin.partyId"/>
</if-empty>
- <if-compare-field to-field="userLogin." field="parameters.partyId" operator="equals">
+ <if-compare-field to-field="userLogin.partyId" field="parameters.partyId" operator="equals">
<set field="hasPermission" type="Boolean" value="true"/>
<field-to-result field-name="hasPermission"/>
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=667757&r1=667756&r2=667757&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 Sat Jun 14 01:37:35 2008
@@ -303,7 +303,7 @@
<if-empty field="parameters.partyId">
<if-not-empty field="parameters.userLogin">
<set from-field="userLogin.partyId" field="parameters.partyId"/>
- <if-compare-field to-field="userLogin." field="parameters.partyId" operator="not-equals">
+ <if-compare-field to-field="userLogin.partyId" field="parameters.partyId" operator="not-equals">
<check-permission permission="PARTYMGR" action="_UPDATE">
<fail-property resource="PartyUiLabels" property="PartyPermissionErrorForThisParty"/>
</check-permission>
@@ -383,7 +383,7 @@
<if-empty field="parameters.partyId">
<if-not-empty field="parameters.userLogin">
<set from-field="userLogin.partyId" field="parameters.partyId"/>
- <if-compare-field to-field="userLogin." field="parameters.partyId" operator="not-equals">
+ <if-compare-field to-field="userLogin.partyId" field="parameters.partyId" operator="not-equals">
<check-permission permission="PARTYMGR" action="_UPDATE">
<fail-property resource="PartyUiLabels" property="PartyPermissionErrorForThisParty"/>
</check-permission>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=667757&r1=667756&r2=667757&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Sat Jun 14 01:37:35 2008
@@ -90,7 +90,7 @@
<!-- if setting the primaryParentCategoryId, create a rollup entity too -->
<!-- NOTE: this is commented out to disable because it is dangerous to add category rollups on a live site without being able to specify a fromDate
<if-not-empty field="lookedUpValue.primaryParentCategoryId">
- <if-compare-field to-field="saveIdMap." field="lookedUpValue.primaryParentCategoryId" operator="not-equals">
+ <if-compare-field to-field="saveIdMap.primaryParentCategoryId" field="lookedUpValue.primaryParentCategoryId" operator="not-equals">
<make-value entity-name="ProductCategoryRollup" value-name="newRollup"/>
<field-to-field field-name="productCategoryId" map-name="lookedUpValue" to-field-name="productCategoryId" to-map-name="newRollup"/>
<field-to-field field-name="primaryParentCategoryId" map-name="lookedUpValue" to-field-name="parentProductCategoryId" to-map-name="newRollup"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=667757&r1=667756&r2=667757&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Sat Jun 14 01:37:35 2008
@@ -106,7 +106,7 @@
<!-- if setting the primaryParentCategoryId, create a rollup entity too -->
<!-- THIS IS REMOVED BECAUSE IT CAUSES PROBLEMS FOR WORKING ON PRODUCTION SITES
<if-not-empty field="lookedUpValue.primaryProductCategoryId">
- <if-compare-field to-field="saveIdMap." field="lookedUpValue.primaryProductCategoryId" operator="equals">
+ <if-compare-field to-field="saveIdMap.primaryProductCategoryId" field="lookedUpValue.primaryProductCategoryId" operator="equals">
<make-value entity-name="ProductCategoryMember" value-name="newMember"/>
<set from-field="productId" map-name="newEntity" to-field-name="productId" to-map-name="newMember"/>
<set from-field="primaryProductCategoryId" map-name="newEntity" to-field-name="productCategoryId" to-map-name="newMember"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=667757&r1=667756&r2=667757&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Sat Jun 14 01:37:35 2008
@@ -93,7 +93,7 @@
<store-value value-name="facilityContactMech"/>
<create-value value-name="newFacilityContactMech"/>
- <if-compare-field to-field="newFacilityContactMech." field="parameters.contactMechId" operator="not-equals">
+ <if-compare-field to-field="newFacilityContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
<get-related value-name="facilityContactMech" relation-name="FacilityContactMechPurpose" list-name="facilityContactMechPurposes"/>
<iterate entry-name="facilityContactMechPurposeOld" list-name="facilityContactMechPurposes">
<clone-value value-name="facilityContactMechPurposeOld" new-value-name="facilityContactMechPurpose"/>
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=667757&r1=667756&r2=667757&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 Sat Jun 14 01:37:35 2008
@@ -345,7 +345,7 @@
</else>
</if-empty>
- <if-compare-field to-field="newWorkEffortContactMech." field="parameters.contactMechId" operator="not-equals">
+ <if-compare-field to-field="newWorkEffortContactMech.contactMechId" field="parameters.contactMechId" operator="not-equals">
<set-nonpk-fields value-name="newWorkEffortContactMech" map-name="parameters" set-if-null="false"/>
<create-value value-name="newWorkEffortContactMech"/>
<remove-value value-name="workEffortContactMech"/>
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=667757&r1=667756&r2=667757&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Sat Jun 14 01:37:35 2008
@@ -722,7 +722,7 @@
<if-empty field="highInfo.estimatedStartDate">
<set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate" />
<else>
- <if-compare-field to-field="lowInfo." field="highInfo.estimatedStartDate" operator="greater">
+ <if-compare-field to-field="lowInfo.estimatedStartDate" field="highInfo.estimatedStartDate" operator="greater">
<set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate" />
</if-compare-field>
</else>
@@ -732,7 +732,7 @@
<if-empty field="highInfo.estimatedCompletionDate">
<set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate" />
<else>
- <if-compare-field to-field="lowInfo." field="highInfo.estimatedCompletionDate" operator="less">
+ <if-compare-field to-field="lowInfo.estimatedCompletionDate" field="highInfo.estimatedCompletionDate" operator="less">
<set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate" />
</if-compare-field>
</else>
@@ -742,7 +742,7 @@
<if-empty field="highInfo.actualStartDate">
<set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate" />
<else>
- <if-compare-field to-field="lowInfo." field="highInfo.actualStartDate" operator="greater">
+ <if-compare-field to-field="lowInfo.actualStartDate" field="highInfo.actualStartDate" operator="greater">
<set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate" />
</if-compare-field>
</else>
@@ -752,7 +752,7 @@
<if-empty field="highInfo.actualCompletionDate">
<set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" />
<else>
- <if-compare-field to-field="lowInfo." field="highInfo.actualCompletionDate" operator="less">
+ <if-compare-field to-field="lowInfo.actualCompletionDate" field="highInfo.actualCompletionDate" operator="less">
<set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" />
</if-compare-field>
</else>
@@ -764,7 +764,7 @@
<if-empty field="highInfo.priority">
<set field="highInfo.priority" from-field="lowInfo.priority" />
<else>
- <if-compare-field to-field="lowInfo." field="highInfo.priority" operator="greater">
+ <if-compare-field to-field="lowInfo.priority" field="highInfo.priority" operator="greater">
<set field="highInfo.priority" from-field="lowInfo.priority" />
</if-compare-field>
</else>