OFBiz › OFBiz - Commits

svn commit: r762648 [7/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accou...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r762648 [7/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/admin/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/accou...

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue Apr 7 08:27:15 2009
@@ -325,7 +325,7 @@
</menu-item>
<menu-item name="openEvents" title="${uiLabelMap.PartyOpenEvents}">
<condition>
- <if-compare field="parameters.all" operator="equals" value="true" />
+ <if-compare field="parameters.all" operator="equals" value="true"/>
</condition>
<link target="${parameters._LAST_VIEW_NAME_}" >
<parameter param-name="all" value="false"/>
@@ -334,7 +334,7 @@
<menu-item name="allOtherEvents" title="${uiLabelMap.PartyAllEvents}">
<condition>
<or>
- <if-compare field="parameters.all" operator="equals" value="false" />
+ <if-compare field="parameters.all" operator="equals" value="false"/>
<if-empty field="parameters.all"/>
</or>
</condition>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Tue Apr 7 08:27:15 2009
@@ -913,7 +913,7 @@
<set field="titleProperty" value="PageTitleListContent"/>
<set field="headerItem" value="find"/>
<set field="tabButtonItem" value="PartyContents"/>
- <set field="partyId" from-field="parameters.partyId" />
+ <set field="partyId" from-field="parameters.partyId"/>
<set field="contentId" from-field="parameters.contentId"/>
<entity-one entity-name="Content" value-field="content"/>
</actions>
@@ -1051,7 +1051,7 @@
</condition>
<actions>
<set field="actualCurrency" value="true" type="Boolean"/>
- <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId"/>
</actions>
<widgets>
<label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
@@ -1080,7 +1080,7 @@
</condition>
<actions>
<set field="actualCurrency" value="true" type="Boolean"/>
- <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId"/>
</actions>
<widgets>
<label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
@@ -1107,7 +1107,7 @@
</condition>
<actions>
<set field="actualCurrency" value="true" type="Boolean"/>
- <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId"/>
</actions>
<widgets>
<label style="h2" text="${uiLabelMap.PartyCurrency}"></label>
@@ -1134,7 +1134,7 @@
</condition>
<actions>
<set field="actualCurrency" value="true" type="Boolean"/>
- <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId" />
+ <set field="actualCurrencyUomId" from-field="party.preferredCurrencyUomId"/>
</actions>
<widgets>
<label style="h2" text="${uiLabelMap.PartyCurrency}"></label>

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Tue Apr 7 08:27:15 2009
@@ -263,7 +263,7 @@
<screen name="FinAccounts">
<section>
<actions>
- <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
+ <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/>
<entity-condition entity-name="FinAccount" list="ownedFinAccountList" filter-by-date="true">
<condition-expr field-name="ownerPartyId" operator="equals" from-field="parameters.partyId"/>
<order-by field-name="-fromDate"/>

Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Tue Apr 7 08:27:15 2009
@@ -537,7 +537,7 @@

<SubscriptionType description="Product" hasTable="N" parentTypeId="" subscriptionTypeId="PRODUCT_SUBSCR"/>

- <WebSite webSiteId="PRODCATALOG" siteName="Catalog Manager" visualThemeSetId="BACKOFFICE" />
- <WebSite webSiteId="FACILITY" siteName="Facility Manager" visualThemeSetId="BACKOFFICE" />
+ <WebSite webSiteId="PRODCATALOG" siteName="Catalog Manager" visualThemeSetId="BACKOFFICE"/>
+ <WebSite webSiteId="FACILITY" siteName="Facility Manager" visualThemeSetId="BACKOFFICE"/>

</entity-engine-xml>

Modified: ofbiz/trunk/applications/product/entitydef/entitygroup_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitygroup_olap.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitygroup_olap.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitygroup_olap.xml Tue Apr 7 08:27:15 2009
@@ -24,5 +24,5 @@



- <entity-group group="org.ofbiz.olap" entity="ProductDimension" />
+ <entity-group group="org.ofbiz.olap" entity="ProductDimension"/>
</entitygroup>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Tue Apr 7 08:27:15 2009
@@ -275,8 +275,8 @@
<member-entity entity-alias="PCC" entity-name="ProductCategoryContent"/>
<member-entity entity-alias="CO" entity-name="Content"/>
<member-entity entity-alias="DR" entity-name="DataResource"/>
- <alias-all entity-alias="PCC" />
- <alias-all entity-alias="CO" />
+ <alias-all entity-alias="PCC"/>
+ <alias-all entity-alias="CO"/>
<alias-all entity-alias="DR" prefix="dr"/>
<view-link entity-alias="PCC" rel-entity-alias="CO">
<key-map field-name="contentId"/>
@@ -288,16 +288,16 @@
<key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="ImageDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="OtherDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
</view-entity>
<entity entity-name="ProductCategoryContentType"
@@ -2457,8 +2457,8 @@
title="GoodIdentification and Product View Entity">
<member-entity entity-alias="GI" entity-name="GoodIdentification"/>
<member-entity entity-alias="PR" entity-name="Product"/>
- <alias-all entity-alias="GI" />
- <alias-all entity-alias="PR" />
+ <alias-all entity-alias="GI"/>
+ <alias-all entity-alias="PR"/>
<view-link entity-alias="GI" rel-entity-alias="PR">
<key-map field-name="productId"/>
</view-link>
@@ -2806,8 +2806,8 @@
<member-entity entity-alias="PC" entity-name="ProductContent"/>
<member-entity entity-alias="CO" entity-name="Content"/>
<member-entity entity-alias="DR" entity-name="DataResource"/>
- <alias-all entity-alias="PC" />
- <alias-all entity-alias="CO" />
+ <alias-all entity-alias="PC"/>
+ <alias-all entity-alias="CO"/>
<alias-all entity-alias="DR" prefix="dr"/>
<view-link entity-alias="PC" rel-entity-alias="CO">
<key-map field-name="contentId"/>
@@ -2819,16 +2819,16 @@
<key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="ImageDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="one-nofk" rel-entity-name="OtherDataResource">
- <key-map field-name="dataResourceId" />
+ <key-map field-name="dataResourceId"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewFrom">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
- <key-map field-name="contentId" rel-field-name="contentIdStart" />
+ <key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
</view-entity>
<entity entity-name="ProductContentType"

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Tue Apr 7 08:27:15 2009
@@ -124,13 +124,13 @@
</call-service>
<field-to-result field="resCategories" result-name="categories"/>

</simple-method>
<simple-method method-name="getRelatedCategories" short-description="get All Related categories" login-required="false">
<set value="sequenceNum" field="orderByString"/>
<field-to-list list="orderByStringList" field="orderByString"/>
- <set field="productCategoryRollUpContext.parentProductCategoryId" from-field="parameters.parentProductCategoryId" />
+ <set field="productCategoryRollUpContext.parentProductCategoryId" from-field="parameters.parentProductCategoryId"/>

<find-by-and entity-name="ProductCategoryRollup" list="rollups" map="productCategoryRollUpContext" order-by-list="orderByStringList"/>
<if-not-empty field="parameters.categories">
@@ -164,7 +164,7 @@
</if-not-empty>
<field-to-result field="categories" result-name="categories"/>

</if-not-empty>

@@ -178,7 +178,7 @@
</else>
</if-not-empty>

<field-to-result result-name="categories" field="categories"/>
</simple-method>
@@ -197,7 +197,7 @@
<result-to-field result-name="fileNotExists" field="fileStatusMap.fileNotExists"/>
</call-service>
<set field="categoryId" from-field="category.productCategoryId"/>
- <set field="categoriesMap.${categoryId}" from-field="fileStatusMap" />
+ <set field="categoriesMap.${categoryId}" from-field="fileStatusMap"/>
</iterate>
<field-to-result field="categoriesMap" result-name="categoriesMap"/>
</if-not-empty>
@@ -362,7 +362,7 @@
</call-service>
<set field="categoryImageUrlMap.categoryImageUrl" from-field="category.categoryImageUrl"/>
<set field="categoryImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.categoryImageUrlMap" from-field="categoryImageUrlMap" />
+ <set field="filesImageMap.categoryImageUrlMap" from-field="categoryImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
<clear-field field="category.categoryImageUrl"></clear-field>
</if-compare>
@@ -376,7 +376,7 @@
</call-service>
<set field="linkOneImageUrlMap.linkOneImageUrl" from-field="category.linkOneImageUrl"/>
<set field="linkOneImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.linkOneImageUrlMap" from-field="linkOneImageUrlMap" />
+ <set field="filesImageMap.linkOneImageUrlMap" from-field="linkOneImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
<clear-field field="category.linkOneImageUrl"></clear-field>
</if-compare>
@@ -390,7 +390,7 @@
</call-service>
<set field="linkTwoImageUrlMap.largeImageUrl" from-field="category.linkTwoImageUrl"/>
<set field="linkTwoImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.linkTwoImageUrlMap" from-field="linkTwoImageUrlMap" />
+ <set field="filesImageMap.linkTwoImageUrlMap" from-field="linkTwoImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
<clear-field field="category.linkTwoImageUrl"></clear-field>
</if-compare>
@@ -413,9 +413,9 @@
</call-service>
<set field="smallImageUrlMap.smallImageUrl" from-field="product.smallImageUrl"/>
<set field="smallImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.smallImageUrlMap" from-field="smallImageUrlMap" />
+ <set field="filesImageMap.smallImageUrlMap" from-field="smallImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
- <log level="info" message="Update SmallImage for product Id ${parameters.productId}" />
+ <log level="info" message="Update SmallImage for product Id ${parameters.productId}"/>
<clear-field field="product.smallImageUrl"></clear-field>
</if-compare>
</if-not-empty>
@@ -428,7 +428,7 @@
</call-service>
<set field="mediumImageUrlMap.mediumImageUrl" from-field="product.mediumImageUrl"/>
<set field="mediumImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.mediumImageUrlMap" from-field="mediumImageUrlMap" />
+ <set field="filesImageMap.mediumImageUrlMap" from-field="mediumImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
<clear-field field="product.mediumImageUrl"></clear-field>
</if-compare>
@@ -442,7 +442,7 @@
</call-service>
<set field="largeImageUrlMap.largeImageUrl" from-field="product.largeImageUrl"/>
<set field="largeImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.largeImageUrlMap" from-field="largeImageUrlMap" />
+ <set field="filesImageMap.largeImageUrlMap" from-field="largeImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
<clear-field field="product.largeImageUrl"></clear-field>
</if-compare>
@@ -456,7 +456,7 @@
</call-service>
<set field="detailImageUrlMap.detailImageUrl" from-field="product.detailImageUrl"/>
<set field="detailImageUrlMap.isExists" from-field="isExists"/>
- <set field="filesImageMap.detailImageUrlMap" from-field="detailImageUrlMap" />
+ <set field="filesImageMap.detailImageUrlMap" from-field="detailImageUrlMap"/>
<if-compare value="N" field="isExists" operator="equals">
<clear-field field="product.detailImageUrl"></clear-field>
</if-compare>
@@ -495,7 +495,7 @@
</call-class-method>
</then>
<else>
- <set field="imageUrl" value="/framework/images/webapp${parameters.imageUrl}" />
+ <set field="imageUrl" value="/framework/images/webapp${parameters.imageUrl}"/>
<call-class-method method-name="fromOfbizHomePath" class-name="org.ofbiz.base.util.UtilURL" ret-field="url">
<string value="${imageUrl}"/>
</call-class-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Tue Apr 7 08:27:15 2009
@@ -28,7 +28,7 @@

<if-empty field="newEntity.fromDate">
<now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>

<create-value value-field="newEntity"/>
@@ -60,7 +60,7 @@
<set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/>
<set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleTextMap"/>
<call-service service-name="createSimpleTextContent" in-map-name="createSimpleTextMap">
- <result-to-field result-name="contentId" field="createCategoryContentMap.contentId" />
+ <result-to-field result-name="contentId" field="createCategoryContentMap.contentId"/>
</call-service>
<call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/>
</simple-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Apr 7 08:27:15 2009
@@ -22,8 +22,8 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">

<simple-method method-name="createProductConfig" short-description="Create a ProductConfig">
- <set field="callingMethodName" value="createProductConfig" />
- <set field="checkAction" value="CREATE" />
+ <set field="callingMethodName" value="createProductConfig"/>
+ <set field="checkAction" value="CREATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
@@ -35,15 +35,15 @@
<now-timestamp field="nowTimestamp"/>

<if-empty field="newEntity.fromDate">
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
<field-to-result field="newEntity.fromDate" result-name="fromDate"/>

<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductConfig" short-description="Update an ProductConfig">
- <set field="callingMethodName" value="updateProductConfig" />
- <set field="checkAction" value="UPDATE" />
+ <set field="callingMethodName" value="updateProductConfig"/>
+ <set field="checkAction" value="UPDATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
@@ -57,8 +57,8 @@
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductConfig" short-description="Delete an ProductConfig">
- <set field="callingMethodName" value="deleteProductConfig" />
- <set field="checkAction" value="DELETE" />
+ <set field="callingMethodName" value="deleteProductConfig"/>
+ <set field="checkAction" value="DELETE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml Tue Apr 7 08:27:15 2009
@@ -28,7 +28,7 @@

<if-empty field="newEntity.fromDate">
<now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>

<create-value value-field="newEntity"/>
@@ -62,7 +62,7 @@
<set-service-fields service-name="createProductConfigItemContent" map="parameters" to-map="createProductConfigItemContent"/>
<set-service-fields service-name="createSimpleTextContent" map="parameters" to-map="createSimpleText"/>
<call-service service-name="createSimpleTextContent" in-map-name="createSimpleText" break-on-error="true" >
- <result-to-field result-name="contentId" field="createProductConfigItemContent.contentId" />
+ <result-to-field result-name="contentId" field="createProductConfigItemContent.contentId"/>
</call-service>
<call-service service-name="createProductConfigItemContent" in-map-name="createProductConfigItemContent"/>
</simple-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml Tue Apr 7 08:27:15 2009
@@ -99,7 +99,7 @@
<filter-list-by-date list="otherCosts"/>
<first-from-list list="otherCosts" entry="otherCost"/>

- <set field="productCost" value="0" type="BigDecimal" />
+ <set field="productCost" value="0" type="BigDecimal"/>
<calculate field="productCost" decimal-scale="6">
<calcop field="laborCost.cost" operator="add">
<calcop field="materialsCost.cost" operator="get"/>
@@ -379,7 +379,7 @@
<calculate field="absValOfTotalQOH">
<calcop operator="add">
<calcop operator="get" field="absValOfTotalQOH"/>
- <calcop operator="negative" field="inventoryItem.quantityOnHandTotal" />
+ <calcop operator="negative" field="inventoryItem.quantityOnHandTotal"/>
</calcop>
</calculate>
<calculate field="absValOfTotalInvCost" type="BigDecimal">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Apr 7 08:27:15 2009
@@ -381,14 +381,14 @@
<now-timestamp field="nowTimestamp"/>

<if-empty field="newEntity.fromDate">
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
<field-to-result field="newEntity.fromDate" result-name="fromDate"/>

- <set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
- <set field="newEntity.createdDate" from-field="nowTimestamp" />
- <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
- <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId" />
+ <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/>
+ <set field="newEntity.createdDate" from-field="nowTimestamp"/>
+ <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
+ <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId"/>

<create-value value-field="newEntity"/>
</simple-method>
@@ -398,8 +398,8 @@
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>

<now-timestamp field="nowTimestamp"/>
- <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" />
- <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
+ <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/>
+ <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>

<store-value value-field="lookedUpValue"/>
</simple-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryIssueServices.xml Tue Apr 7 08:27:15 2009
@@ -43,14 +43,14 @@
<if-not-empty field="orderItem.productId">
<clear-field field="callSvcMap"/>
<set-service-fields to-map="callSvcMap" service-name="issueImmediatelyFulfilledOrderItem" map="orderItem"/>
- <set field="callSvcMap.orderHeader" from-field="orderHeader" />
- <set field="callSvcMap.orderItem" from-field="orderItem" />
- <set field="callSvcMap.productStore" from-field="productStore" />
+ <set field="callSvcMap.orderHeader" from-field="orderHeader"/>
+ <set field="callSvcMap.orderItem" from-field="orderItem"/>
+ <set field="callSvcMap.productStore" from-field="productStore"/>
<call-service service-name="issueImmediatelyFulfilledOrderItem" in-map-name="callSvcMap"/>
</if-not-empty>
</iterate>

- <set field="orderHeader.needsInventoryIssuance" value="N" />
+ <set field="orderHeader.needsInventoryIssuance" value="N"/>
<store-value value-field="orderHeader"/>
<log level="info" message="Issued inventory for orderId ${orderHeader.orderId}."/>
<else>
@@ -64,7 +64,7 @@
<if-empty field="parameters.orderItem">
<entity-one entity-name="OrderItem" value-field="orderItem"/>
<else>
- <set field="orderItem" from-field="parameters.orderItem" />
+ <set field="orderItem" from-field="parameters.orderItem"/>
</else>
</if-empty>

@@ -76,7 +76,7 @@
<if-empty field="parameters.orderHeader">
<entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<else>
- <set field="orderHeader" from-field="parameters.orderHeader" />
+ <set field="orderHeader" from-field="parameters.orderHeader"/>
</else>
</if-empty>

@@ -86,22 +86,22 @@
<field-map field-name="productStoreId" from-field="orderHeader.productStoreId"/>
</entity-one>
<else>
- <set field="productStore" from-field="parameters.productStore" />
+ <set field="productStore" from-field="parameters.productStore"/>
</else>
</if-empty>


<if-compare value="INVRO_FIFO_EXP" operator="equals" field="productStore.reserveOrderEnumId">
- <set field="orderByString" value="+expireDate" />
+ <set field="orderByString" value="+expireDate"/>
<else>
<if-compare value="INVRO_LIFO_EXP" operator="equals" field="productStore.reserveOrderEnumId">
- <set field="orderByString" value="-expireDate" />
+ <set field="orderByString" value="-expireDate"/>
<else>
<if-compare value="INVRO_LIFO_REC" operator="equals" field="productStore.reserveOrderEnumId">
- <set field="orderByString" value="+datetimeReceived" />
+ <set field="orderByString" value="+datetimeReceived"/>
<else>

- <set field="orderByString" value="-datetimeReceived" />
+ <set field="orderByString" value="-datetimeReceived"/>
</else>
</if-compare>
</else>
@@ -109,11 +109,11 @@
</else>
</if-compare>
<field-to-list field="orderByString" list="orderByList"/>
- <set field="lookupFieldMap.productId" from-field="orderItem.productId" />
- <set field="lookupFieldMap.facilityId" from-field="orderHeader.originFacilityId" />
+ <set field="lookupFieldMap.productId" from-field="orderItem.productId"/>
+ <set field="lookupFieldMap.facilityId" from-field="orderHeader.originFacilityId"/>
<find-by-and entity-name="InventoryItem" map="lookupFieldMap" list="inventoryItemList" order-by-list="orderByList"/>

- <set field="parameters.quantityNotIssued" from-field="orderItem.quantity" />
+ <set field="parameters.quantityNotIssued" from-field="orderItem.quantity"/>

<iterate entry="inventoryItem" list="inventoryItemList">

@@ -124,20 +124,20 @@
<if-compare field="parameters.quantityNotIssued" operator="not-equals" value="0" type="BigDecimal">
<if-not-empty field="lastNonSerInventoryItem">

- <set field="issuanceCreateMap.orderId" from-field="parameters.orderId" />
- <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
- <set field="issuanceCreateMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId" />
- <set field="issuanceCreateMap.quantity" from-field="parameters.quantityNotIssued" />
+ <set field="issuanceCreateMap.orderId" from-field="parameters.orderId"/>
+ <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
+ <set field="issuanceCreateMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId"/>
+ <set field="issuanceCreateMap.quantity" from-field="parameters.quantityNotIssued"/>
<call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap">
<result-to-field result-name="itemIssuanceId"/>
</call-service>



- <set field="createDetailMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId" />
- <set field="createDetailMap.orderId" from-field="parameters.orderId" />
- <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
- <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" />
+ <set field="createDetailMap.inventoryItemId" from-field="lastNonSerInventoryItem.inventoryItemId"/>
+ <set field="createDetailMap.orderId" from-field="parameters.orderId"/>
+ <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
+ <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<calculate field="createDetailMap.availableToPromiseDiff">
<calcop field="parameters.quantityNotIssued" operator="negative"/>
</calculate>
@@ -160,19 +160,19 @@
</call-service>


- <set field="issuanceCreateMap.orderId" from-field="parameters.orderId" />
- <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
+ <set field="issuanceCreateMap.orderId" from-field="parameters.orderId"/>
+ <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
<set field="issuanceCreateMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/>
- <set field="issuanceCreateMap.quantity" from-field="parameters.quantityNotIssued" />
+ <set field="issuanceCreateMap.quantity" from-field="parameters.quantityNotIssued"/>
<call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap">
<result-to-field result-name="itemIssuanceId"/>
</call-service>


<set field="createDetailMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/>
- <set field="createDetailMap.orderId" from-field="parameters.orderId" />
- <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
- <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" />
+ <set field="createDetailMap.orderId" from-field="parameters.orderId"/>
+ <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
+ <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>
<calculate field="createDetailMap.availableToPromiseDiff">
<calcop field="parameters.quantityNotIssued" operator="negative"/>
</calculate>
@@ -196,7 +196,7 @@
<if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId">
<if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId">

- <set field="inventoryItem.statusId" value="INV_DELIVERED" />
+ <set field="inventoryItem.statusId" value="INV_DELIVERED"/>
<set-service-fields service-name="updateInventoryItem" map="inventoryItem" to-map="inventoryItemMap"/>
<call-service service-name="updateInventoryItem" in-map-name="inventoryItemMap"/>

@@ -228,26 +228,26 @@
</condition>
<then>
<if-compare-field field="parameters.quantityNotIssued" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="BigDecimal">
- <set field="parameters.deductAmount" from-field="inventoryItem.availableToPromiseTotal" />
+ <set field="parameters.deductAmount" from-field="inventoryItem.availableToPromiseTotal"/>
<else>
- <set field="parameters.deductAmount" from-field="parameters.quantityNotIssued" />
+ <set field="parameters.deductAmount" from-field="parameters.quantityNotIssued"/>
</else>
</if-compare-field>


- <set field="issuanceCreateMap.orderId" from-field="parameters.orderId" />
- <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
- <set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId" />
- <set field="issuanceCreateMap.quantity" from-field="parameters.deductAmount" />
+ <set field="issuanceCreateMap.orderId" from-field="parameters.orderId"/>
+ <set field="issuanceCreateMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
+ <set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
+ <set field="issuanceCreateMap.quantity" from-field="parameters.deductAmount"/>
<call-service service-name="createItemIssuance" in-map-name="issuanceCreateMap">
<result-to-field result-name="itemIssuanceId"/>
</call-service>


- <set field="createDetailMap.inventoryItemId" from-field="inventoryItem.inventoryItemId" />
- <set field="createDetailMap.orderId" from-field="parameters.orderId" />
- <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId" />
- <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId" />
+ <set field="createDetailMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
+ <set field="createDetailMap.orderId" from-field="parameters.orderId"/>
+ <set field="createDetailMap.orderItemSeqId" from-field="parameters.orderItemSeqId"/>
+ <set field="createDetailMap.itemIssuanceId" from-field="itemIssuanceId"/>

<calculate field="createDetailMap.availableToPromiseDiff">
<calcop field="parameters.deductAmount" operator="negative"/>
@@ -269,7 +269,7 @@



- <set field="lastNonSerInventoryItem" from-field="inventoryItem" />
+ <set field="lastNonSerInventoryItem" from-field="inventoryItem"/>
</then>
</if>
</if-compare>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Apr 7 08:27:15 2009
@@ -86,8 +86,8 @@
<if-empty field="resourceDescription">
<property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field="resourceDescription"/>
</if-empty>
- <set field="callingMethodName" from-field="resourceDescription" />
- <set field="checkAction" from-field="mainAction" />
+ <set field="callingMethodName" from-field="resourceDescription"/>
+ <set field="checkAction" from-field="mainAction"/>
<set field="alternatePermissionRoot" value="FACILITY"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<if-empty field="error_list">

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Apr 7 08:27:15 2009
@@ -22,8 +22,8 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">

<simple-method method-name="createProductPrice" short-description="Create an ProductPrice">
- <set field="callingMethodName" value="createProductPrice" />
- <set field="checkAction" value="CREATE" />
+ <set field="callingMethodName" value="createProductPrice"/>
+ <set field="checkAction" value="CREATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
@@ -35,20 +35,20 @@
<now-timestamp field="nowTimestamp"/>

<if-empty field="newEntity.fromDate">
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
<field-to-result field="newEntity.fromDate" result-name="fromDate"/>

- <set field="newEntity.lastModifiedDate" from-field="nowTimestamp" />
- <set field="newEntity.createdDate" from-field="nowTimestamp" />
- <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
- <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId" />
+ <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/>
+ <set field="newEntity.createdDate" from-field="nowTimestamp"/>
+ <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
+ <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId"/>

<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductPrice" short-description="Update an ProductPrice">
- <set field="callingMethodName" value="updateProductPrice" />
- <set field="checkAction" value="UPDATE" />
+ <set field="callingMethodName" value="updateProductPrice"/>
+ <set field="checkAction" value="UPDATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
@@ -61,14 +61,14 @@
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>

<now-timestamp field="nowTimestamp"/>
- <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp" />
- <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId" />
+ <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/>
+ <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>

<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPrice" short-description="Delete an ProductPrice">
- <set field="callingMethodName" value="deleteProductPrice" />
- <set field="checkAction" value="DELETE" />
+ <set field="callingMethodName" value="deleteProductPrice"/>
+ <set field="checkAction" value="DELETE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission>
<check-errors/>
@@ -99,18 +99,18 @@
<set-nonpk-fields map="parameters" value-field="newEntity"/>

<sequenced-id sequence-name="ProductPriceChange" field="productPriceChangeId"/>
- <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId" />
+ <set field="newEntity.productPriceChangeId" from-field="productPriceChangeId"/>
<now-timestamp field="nowTimestamp"/>
- <set field="newEntity.changedDate" from-field="nowTimestamp" />
- <set field="newEntity.changedByUserLogin" from-field="userLogin.userLoginId" />
+ <set field="newEntity.changedDate" from-field="nowTimestamp"/>
+ <set field="newEntity.changedByUserLogin" from-field="userLogin.userLoginId"/>

<create-value value-field="newEntity"/>
</simple-method>


<simple-method method-name="createProductPaymentMethodType" short-description="create a ProductPaymentMethodType">
- <set field="callingMethodName" value="createProductPaymentMethodType" />
- <set field="checkAction" value="CREATE" />
+ <set field="callingMethodName" value="createProductPaymentMethodType"/>
+ <set field="checkAction" value="CREATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
<make-value entity-name="ProductPaymentMethodType" value-field="newEntity"/>
@@ -120,8 +120,8 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProductPaymentMethodType" short-description="update a ProductPaymentMethodType">
- <set field="callingMethodName" value="updateProductPaymentMethodType" />
- <set field="checkAction" value="UPDATE" />
+ <set field="callingMethodName" value="updateProductPaymentMethodType"/>
+ <set field="checkAction" value="UPDATE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
<entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/>
@@ -129,8 +129,8 @@
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteProductPaymentMethodType" short-description="delete a ProductPaymentMethodType">
- <set field="callingMethodName" value="deleteProductPaymentMethodType" />
- <set field="checkAction" value="DELETE" />
+ <set field="callingMethodName" value="deleteProductPaymentMethodType"/>
+ <set field="checkAction" value="DELETE"/>
<call-simple-method method-name="checkProductRelatedPermission" xml-resource="org/ofbiz/product/product/ProductServices.xml"/>
<check-errors/>
<entity-one entity-name="ProductPaymentMethodType" value-field="lookedUpValue"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Tue Apr 7 08:27:15 2009
@@ -28,7 +28,7 @@

<if-empty field="newEntity.fromDate">
<now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>

<create-value value-field="newEntity"/>
@@ -62,7 +62,7 @@
<set-service-fields service-name="createProductContent" map="parameters" to-map="createProductContent"/>
<set-service-fields service-name="createEmailContent" map="parameters" to-map="createEmail"/>
<call-service service-name="createEmailContent" in-map-name="createEmail" break-on-error="true" >
- <result-to-field result-name="contentId" field="createProductContent.contentId" />
+ <result-to-field result-name="contentId" field="createProductContent.contentId"/>
</call-service>
<call-service service-name="createProductContent" in-map-name="createProductContent"/>
</simple-method>
@@ -79,7 +79,7 @@
<set field="persistContentAndAssoc.contentTypeId" value="DOCUMENT"/>
<set field="persistContentAndAssoc.dataResourceTypeId" value="IMAGE_OBJECT"/>
<call-service service-name="persistContentAndAssoc" in-map-name="persistContentAndAssoc" break-on-error="true" >
- <result-to-field result-name="contentId" field="createProductContent.contentId" />
+ <result-to-field result-name="contentId" field="createProductContent.contentId"/>
</call-service>
<call-service service-name="createProductContent" in-map-name="createProductContent"/>
</simple-method>

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=762648&r1=762647&r2=762648&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 Tue Apr 7 08:27:15 2009
@@ -29,18 +29,18 @@
<if-empty field="parameters.contactMechId">

<set-service-fields service-name="createContactMech" map="parameters" to-map="createContactMechMap"/>
- <set field="createContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" />
+ <set field="createContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId"/>
<call-service service-name="createContactMech" in-map-name="createContactMechMap">
<default-message>Contact Mechanism successfully created.</default-message>
<result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
</call-service>
<log level="info" message="ContactMech created"/>
<else>
- <set field="newValue.contactMechId" from-field="parameters.contactMechId" />
+ <set field="newValue.contactMechId" from-field="parameters.contactMechId"/>
</else>
</if-empty>
<log level="info" message="Creating a FacilityContactMech with id: ${parameters.contactMechId}"/>
- <set field="newValue.facilityId" from-field="parameters.facilityId" />
+ <set field="newValue.facilityId" from-field="parameters.facilityId"/>
<field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
<field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
<set-nonpk-fields map="parameters" value-field="newValue"/>
@@ -73,7 +73,7 @@

<if-empty field="parameters.newContactMechId">
<set-service-fields service-name="updateContactMech" map="parameters" to-map="updateContactMechMap"/>
- <set field="updateContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId" />
+ <set field="updateContactMechMap.contactMechTypeId" from-field="parameters.contactMechTypeId"/>
<call-service service-name="updateContactMech" in-map-name="updateContactMechMap">
<default-message>Contact Mechanism successfully updated.</default-message>

@@ -173,7 +173,7 @@
<set-service-fields service-name="updatePostalAddress" map="parameters" to-map="updatePostalAddressMap"/>
<call-service in-map-name="updatePostalAddressMap" service-name="updatePostalAddress">
<default-message>Postal Address successfully updated</default-message>
- <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId" />
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>

<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -220,7 +220,7 @@
<set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="updateTelecomNumberMap"/>
<call-service service-name="updateTelecomNumber" in-map-name="updateTelecomNumberMap">
<default-message>Telecom Number successfully updated</default-message>
- <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId" />
+ <result-to-field result-name="contactMechId" field="newFacilityContactMech.contactMechId"/>
</call-service>

<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
@@ -269,7 +269,7 @@

<set-service-fields service-name="updateFacilityContactMech" map="parameters" to-map="updateFacilityContactMechMap"/>
<set field="updateFacilityContactMechMap.infoString" from-field="parameters.emailAddress"/>
- <set field="updateFacilityContactMechMap.contactMechTypeId" value="EMAIL_ADDRESS" />
+ <set field="updateFacilityContactMechMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
<call-service service-name="updateFacilityContactMech" in-map-name="updateFacilityContactMechMap">

<default-message>Facility Contact Mechanism successfully updated.</default-message>
@@ -283,9 +283,9 @@
<check-errors/>

<make-value value-field="lookUpMap" entity-name="FacilityContactMechPurpose"/>
- <set field="lookUpMap.facilityId" from-field="parameters.facilityId" />
- <set field="lookUpMap.contactMechId" from-field="parameters.contactMechId" />
- <set field="lookUpMap.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
+ <set field="lookUpMap.facilityId" from-field="parameters.facilityId"/>
+ <set field="lookUpMap.contactMechId" from-field="parameters.contactMechId"/>
+ <set field="lookUpMap.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
<find-by-and entity-name="FacilityContactMechPurpose" map="lookUpMap" list="purposeList"/>
<filter-list-by-date list="purposeList"/>

@@ -297,10 +297,10 @@

<now-timestamp field="nowTimestamp"/>
<make-value value-field="newEntity" entity-name="FacilityContactMechPurpose"/>
- <set field="newEntity.facilityId" from-field="parameters.facilityId" />
- <set field="newEntity.contactMechId" from-field="parameters.contactMechId" />
- <set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId" />
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.facilityId" from-field="parameters.facilityId"/>
+ <set field="newEntity.contactMechId" from-field="parameters.contactMechId"/>
+ <set field="newEntity.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>

<create-value value-field="newEntity"/>

@@ -322,7 +322,7 @@
</if-empty>

<now-timestamp field="nowTimestamp"/>
- <set field="purposeEntity.thruDate" from-field="nowTimestamp" />
+ <set field="purposeEntity.thruDate" from-field="nowTimestamp"/>

<store-value value-field="purposeEntity"/>
</simple-method>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/StorageServices.xml Tue Apr 7 08:27:15 2009
@@ -27,19 +27,19 @@

<sequenced-id sequence-name="Facility" field="facilityId"/>
<to-string field="facilityId"/>
- <set field="newEntity.facilityId" from-field="facilityId" />
+ <set field="newEntity.facilityId" from-field="facilityId"/>
<field-to-result field="facilityId" result-name="facilityId"/>

<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFacility" short-description="Update a Facility">
- <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
+ <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
<find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
<set-nonpk-fields map="parameters" value-field="facility"/>
<store-value value-field="facility"/>
</simple-method>
<simple-method method-name="deleteFacility" short-description="Delete a Facility">
- <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
+ <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
<find-by-primary-key entity-name="Facility" map="lookupPKMap" value-field="facility"/>
<remove-value value-field="facility"/>
</simple-method>
@@ -51,8 +51,8 @@
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="removeContactMechFromFacility" short-description="Remove ContactMech From Facility">
- <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
- <set field="lookupPKMap.contactMechId" from-field="parameters.contactMechId" />
+ <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
+ <set field="lookupPKMap.contactMechId" from-field="parameters.contactMechId"/>
<find-by-primary-key entity-name="FacilityContactMech" map="lookupPKMap" value-field="facilityContactMech"/>
<remove-value value-field="facilityContactMech"/>
</simple-method>
@@ -61,21 +61,21 @@
<simple-method method-name="createFacilityLocation" short-description="Create a Facility Location">
<make-value value-field="newEntity" entity-name="FacilityLocation"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set field="newEntity.facilityId" from-field="parameters.facilityId" />
+ <set field="newEntity.facilityId" from-field="parameters.facilityId"/>

<set field="locationSeqId" value="${parameters.areaId}${parameters.aisleId}${parameters.sectionId}${parameters.levelId}${parameters.positionId}"/>

<if-not-empty field="locationSeqId">
- <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" />
- <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" />
+ <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId"/>
+ <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId"/>
<find-by-primary-key entity-name="FacilityLocation" map="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
<if-not-empty field="checkLocationSeqIdValue">
- <set field="locationSeqId" value="${locationSeqId}_2" />
- <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId" />
- <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId" />
+ <set field="locationSeqId" value="${locationSeqId}_2"/>
+ <set field="checkLocationSeqIdMap.locationSeqId" from-field="locationSeqId"/>
+ <set field="checkLocationSeqIdMap.facilityId" from-field="parameters.facilityId"/>
<find-by-primary-key entity-name="FacilityLocation" map="checkLocationSeqIdMap" value-field="checkLocationSeqIdValue"/>
<if-not-empty field="checkLocationSeqIdValue">
- <set field="locationSeqId" value="" />
+ <set field="locationSeqId" value=""/>
</if-not-empty>
</if-not-empty>
</if-not-empty>
@@ -84,21 +84,21 @@
<sequenced-id sequence-name="FacilityLocation" field="locationSeqId"/>
<to-string field="locationSeqId"/>
</if-empty>
- <set field="newEntity.locationSeqId" from-field="locationSeqId" />
+ <set field="newEntity.locationSeqId" from-field="locationSeqId"/>
<field-to-result field="locationSeqId" result-name="locationSeqId"/>

<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFacilityLocation" short-description="Update a Facility Location">
- <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
- <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
+ <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
+ <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId"/>
<find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
<set-nonpk-fields map="parameters" value-field="facilityLocation"/>
<store-value value-field="facilityLocation"/>
</simple-method>
<simple-method method-name="deleteFacilityLocation" short-description="Delete a Facility Location">
- <set field="lookupPKMap.facilityId" from-field="parameters.facilityId" />
- <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId" />
+ <set field="lookupPKMap.facilityId" from-field="parameters.facilityId"/>
+ <set field="lookupPKMap.locationSeqId" from-field="parameters.locationSeqId"/>
<find-by-primary-key entity-name="FacilityLocation" map="lookupPKMap" value-field="facilityLocation"/>
<remove-value value-field="facilityLocation"/>
</simple-method>
@@ -110,19 +110,19 @@

<sequenced-id sequence-name="FacilityGroup" field="facilityGroupId"/>
<to-string field="facilityGroupId"/>
- <set field="newEntity.facilityGroupId" from-field="facilityGroupId" />
+ <set field="newEntity.facilityGroupId" from-field="facilityGroupId"/>
<field-to-result field="facilityGroupId" result-name="facilityGroupId"/>

<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateFacilityGroup" short-description="Update an Facility Group">
- <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
+ <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId"/>
<find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
<set-nonpk-fields map="parameters" value-field="facilityGroup"/>
<store-value value-field="facilityGroup"/>
</simple-method>
<simple-method method-name="deleteFacilityGroup" short-description="Delete an Facility Group">
- <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId" />
+ <set field="lookupPKMap.facilityGroupId" from-field="parameters.facilityGroupId"/>
<find-by-primary-key entity-name="FacilityGroup" map="lookupPKMap" value-field="facilityGroup"/>
<remove-value value-field="facilityGroup"/>
</simple-method>
@@ -135,7 +135,7 @@

<if-empty field="newEntity.fromDate">
<now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>

<create-value value-field="newEntity"/>
@@ -162,7 +162,7 @@

<if-empty field="newEntity.fromDate">
<now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp" />
+ <set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>

<create-value value-field="newEntity"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Tue Apr 7 08:27:15 2009
@@ -37,7 +37,7 @@
<make-value value-field="newEntity" entity-name="ProductStore"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>

- <sequenced-id sequence-name="ProductStore" field="productStoreId" />
+ <sequenced-id sequence-name="ProductStore" field="productStoreId"/>
<set from-field="productStoreId" field="newEntity.productStoreId"/>

<field-to-result field="productStoreId" result-name="productStoreId"/>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Tue Apr 7 08:27:15 2009
@@ -391,7 +391,7 @@
<entity-one entity-name="ItemIssuance" value-field="itemIssuance"/>
<set field="oldQuantity" from-field="itemIssuance.quantity"/>

- <set value="0" field="itemIssuanceUpdate.quantity" type="BigDecimal" />
+ <set value="0" field="itemIssuanceUpdate.quantity" type="BigDecimal"/>
<set from-field="parameters.itemIssuanceId" field="itemIssuanceUpdate.itemIssuanceId"/>
<call-service service-name="updateItemIssuance" in-map-name="itemIssuanceUpdate"/>

@@ -537,7 +537,7 @@
<set field="itemIssuanceCreate.inventoryItemId" from-field="parameters.inventoryItemId"/>
<set field="itemIssuanceCreate.shipmentId" from-field="shipmentId"/>
<set field="itemIssuanceCreate.shipmentItemSeqId" from-field="shipmentItemSeqId"/>
- <set field="itemIssuanceCreate.issuedByUserLoginId" from-field="userLogin.userLoginId" />
+ <set field="itemIssuanceCreate.issuedByUserLoginId" from-field="userLogin.userLoginId"/>
<call-service service-name="createItemIssuance" in-map-name="itemIssuanceCreate">
<result-to-field result-name="itemIssuanceId"/>
</call-service>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Tue Apr 7 08:27:15 2009
@@ -280,7 +280,7 @@
<if-compare value="VENDOR_RETURN" field="returnHeader.returnHeaderTypeId" operator="equals"/>
</condition>
<then>
- <set field="shipmentCtx.shipmentTypeId" value="PURCHASE_RETURN" />
+ <set field="shipmentCtx.shipmentTypeId" value="PURCHASE_RETURN"/>
<set field="shipmentCtx.statusId" value="SHIPMENT_INPUT"/>
</then>
</else-if>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/test/TestServices.xml Tue Apr 7 08:27:15 2009
@@ -123,7 +123,7 @@

<log level="info" message="==========Shipment Id============${createShipmentOutMap.shipmentId}=========="/>

- <set field="updateShipmentInMap.shipmentId" from-field="createShipmentOutMap.shipmentId" />
+ <set field="updateShipmentInMap.shipmentId" from-field="createShipmentOutMap.shipmentId"/>
<set field="updateShipmentInMap.statusId" value="SHIPMENT_SHIPPED"/>
<set field="updateShipmentInMap.userLogin" from-field="userLogin"/>
<call-service service-name="updateShipment" in-map-name="updateShipmentInMap">

Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Tue Apr 7 08:27:15 2009
@@ -345,8 +345,8 @@
<auto-attributes include="pk" mode="INOUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/>
- <override name="fromDate" optional="true" />
- 
+ <override name="fromDate" optional="true"/>
+ 
</service>
<service name="updateProductContent" default-entity-name="ProductContent" engine="simple"
location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="updateProductContent" auth="true">
@@ -855,8 +855,8 @@
<permission-service service-name="productCategoryGenericPermission" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <override name="fromDate" optional="true" />
- <override name="linkSeqId" optional="true" />
+ <override name="fromDate" optional="true"/>
+ <override name="linkSeqId" optional="true"/>
</service>
<service name="updateProductCategoryLink" default-entity-name="ProductCategoryLink" engine="simple"
location="component://product/script/org/ofbiz/product/category/CategoryServices.xml"
@@ -891,8 +891,8 @@
<auto-attributes include="pk" mode="INOUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/>
- <override name="fromDate" optional="true" />
- 
+ <override name="fromDate" optional="true"/>
+ 
</service>
<service name="updateCategoryContent" default-entity-name="ProductCategoryContent" engine="simple"
location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="updateCategoryContent" auth="true">
@@ -1068,8 +1068,8 @@
<auto-attributes include="pk" mode="INOUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes entity-name="Content" include="nonpk" mode="IN" optional="true"/>
- <override name="fromDate" optional="true" />
- 
+ <override name="fromDate" optional="true"/>
+ 
</service>
<service name="updateProductConfigItemContent" default-entity-name="ProdConfItemContent" engine="simple"
location="component://product/script/org/ofbiz/product/config/ProductConfigItemContentServices.xml" invoke="updateProductConfigItemContent" auth="true">

Modified: ofbiz/trunk/applications/product/servicedef/services_maint.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_maint.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_maint.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_maint.xml Tue Apr 7 08:27:15 2009
@@ -112,7 +112,7 @@
location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="getRelatedCategories">
<description>Get all related categories of a category </description>
<attribute name="parentProductCategoryId" type="String" mode="IN" optional="false"/>
- <attribute name="categories" type="java.util.List" mode="INOUT" optional="true" />
+ <attribute name="categories" type="java.util.List" mode="INOUT" optional="true"/>
</service>

<service name="checkImageUrlForCategoryAndProduct" engine="simple"

Modified: ofbiz/trunk/applications/product/servicedef/services_subscription.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_subscription.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_subscription.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_subscription.xml Tue Apr 7 08:27:15 2009
@@ -120,7 +120,7 @@
<attribute name="orderId" type="String" mode="IN" optional="true"/>
<attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
<attribute name="inventoryItemId" type="String" mode="IN" optional="true"/>
- <attribute name="orderCreatedDate" type="Timestamp" mode="IN" optional="true" />
+ <attribute name="orderCreatedDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="quantity" type="Integer" mode="IN" optional="false"/>
</service>
<service name="processExtendSubscriptionByOrder" engine="java" auth="true"

Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml Tue Apr 7 08:27:15 2009
@@ -84,10 +84,10 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="removeProdCatalogFromParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="prodCatalogId" />
- <parameter param-name="partyId" />
- <parameter param-name="roleTypeId" />
- <parameter param-name="fromDate" />
+ <parameter param-name="prodCatalogId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -120,9 +120,9 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="deleteProdCatalogStore" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="prodCatalogId" />
- <parameter param-name="productStoreId" />
- <parameter param-name="fromDate" />
+ <parameter param-name="prodCatalogId"/>
+ <parameter param-name="productStoreId"/>
+ <parameter param-name="fromDate"/>
</hyperlink>
</field>
</form>
@@ -143,11 +143,11 @@
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="removeProductCategoryFromProdCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false">
- <parameter param-name="prodCatalogId" />
- <parameter param-name="productCategoryId" />
- <parameter param-name="partyId" />
- <parameter param-name="fromDate" />
- <parameter param-name="prodCatalogCategoryTypeId" />
+ <parameter param-name="prodCatalogId"/>
+ <parameter param-name="productCategoryId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="fromDate"/>
+ <parameter param-name="prodCatalogCategoryTypeId"/>
</hyperlink>
</field>
<field name="makeTopLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=762648&r1=762647&r2=762648&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Tue Apr 7 08:27:15 2009
@@ -216,7 +216,7 @@
<form name="ProductConfigOptionList" type="list" list-name="configOptionList"
default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems"
target="" header-row-style="header-row-2" paginate="true">
- <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display" />
+ <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display"/>
<field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}">
<hyperlink target="EditProductConfigOptions" description="${configOptionId} - ${configOptionName}">
<parameter param-name="configItemId"/>