Author: jacopoc
Date: Wed May 21 01:56:08 2008
New Revision: 658607
URL: http://svn.apache.org/viewvc?rev=658607&view=rev
Log:
Misc fixes and cleanups to let the returns work properly even with order items
with null itemDescriptions
Modified:
ofbiz/trunk/applications/order/servicedef/services_return.xml
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
Modified: ofbiz/trunk/applications/order/servicedef/services_return.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_return.xml?rev=658607&r1=658606&r2=658607&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services_return.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services_return.xml Wed May 21
01:56:08 2008
@@ -56,29 +56,22 @@
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="returnItemInterface" engine="interface" location=""
invoke="">
- <description>Return Item Interface</description>
- <auto-attributes entity-name="ReturnItem" include="all" mode="IN"
optional="false">
- <exclude field-name="returnItemSeqId"/>
- </auto-attributes>
- <override name="returnItemResponseId" optional="true"/>
- <override name="orderItemSeqId" optional="true"/>
- <override name="expectedItemStatus" optional="true"/>
- <override name="receivedQuantity" optional="true"/>
- <override name="statusId" optional="true"/>
- <override name="returnPrice" optional="true"/>
- <override name="productId" optional="true"/>
- </service>
<service name="createReturnItem" engine="simple"
location="org/ofbiz/order/order/OrderReturnServices.xml"
invoke="createReturnItem">
<description>Create a new ReturnItem in the RETURN_REQUESTED status,
based on returnableQuantity and returnablePrice from the
getReturnableQuantity service. This can be called by the
customer to request a return for himself or by a user with
ORDERMGR_CREATE, but, if the former, the returnPrice will
be overriden by the returnablePrice from getReturnableQuantity.</description>
- <implements service="returnItemInterface"/>
+ <auto-attributes entity-name="ReturnItem" include="all" mode="IN"
optional="true">
+ <exclude field-name="returnItemSeqId"/>
+ </auto-attributes>
+ <override name="returnId" optional="false"/>
+ <override name="returnTypeId" optional="false"/>
+ <override name="returnItemTypeId" optional="false"/>
+ <override name="orderId" optional="false"/>
+ <override name="returnQuantity" optional="false"/>
<attribute name="returnItemMapKey" type="String" mode="IN"
optional="true"/>
<attribute name="includeAdjustments" type="String" mode="IN"
optional="true"/> <!-- The default is "Y": the adjustments associated with the
item are included in the return -->
<attribute name="returnItemSeqId" type="String" mode="OUT"
optional="false"/>
- <override name="returnReasonId" optional="true"/>
</service>
<service name="updateReturnItem" engine="simple"
default-entity-name="ReturnItem"
location="org/ofbiz/order/order/OrderReturnServices.xml"
invoke="updateReturnItem">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=658607&r1=658606&r2=658607&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Wed
May 21 01:56:08 2008
@@ -166,7 +166,7 @@
<#if readOnly>
${item.description?default("N/A")}
<#else>
- <input name="description_o_${rowCount}"
value="${item.description}" type="text" size="15">
+ <input name="description_o_${rowCount}"
value="${item.description?if_exists}" type="text" size="15">
</#if>
</div></td>
<td><div>
