Author: jonesde
Date: Sun Jan 9 05:30:54 2011
New Revision: 1056885
URL: http://svn.apache.org/viewvc?rev=1056885&view=rev
Log:
Added necessary seed data for returns on orders with VAT_TAX adjustments;
changed return service to accept multiple types of customer returns by looking
for CUSTOMER_ prefix instead of matching CUSTOMER_RETURN completely; changed
return items screen to show order date along with ID for easier identification
of the order
Modified:
ofbiz/trunk/applications/order/data/OrderTypeData.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
Modified: ofbiz/trunk/applications/order/data/OrderTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/data/OrderTypeData.xml?rev=1056885&r1=1056884&r2=1056885&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/data/OrderTypeData.xml (original)
+++ ofbiz/trunk/applications/order/data/OrderTypeData.xml Sun Jan 9 05:30:54
2011
@@ -277,6 +277,7 @@ under the License.
<ReturnAdjustmentType description="Return Fee" hasTable="N"
returnAdjustmentTypeId="RET_FEE_ADJ" parentTypeId=""/>
<ReturnAdjustmentType description="Return Miscellaneous Charges"
hasTable="N" returnAdjustmentTypeId="RET_MISC_ADJ" parentTypeId=""/>
<ReturnAdjustmentType description="Return Sales Tax" hasTable="N"
returnAdjustmentTypeId="RET_SALES_TAX_ADJ" parentTypeId=""/>
+ <ReturnAdjustmentType description="Return VAT Tax" hasTable="N"
returnAdjustmentTypeId="RET_VAT_TAX_ADJ" parentTypeId=""/>
<ReturnAdjustmentType description="Return Shipping and Handling"
hasTable="N" returnAdjustmentTypeId="RET_SHIPPING_ADJ" parentTypeId=""/>
<ReturnAdjustmentType description="Return Surcharge" hasTable="N"
returnAdjustmentTypeId="RET_SURCHARGE_ADJ" parentTypeId=""/>
<ReturnAdjustmentType description="Return Additional Feature" hasTable="N"
returnAdjustmentTypeId="RET_ADD_FEATURE_ADJ" parentTypeId=""/>
@@ -314,6 +315,7 @@ under the License.
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="FEE" returnItemTypeId="RET_FEE_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="MISCELLANEOUS_CHARGE" returnItemTypeId="RET_MISC_CHARGE_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="SALES_TAX" returnItemTypeId="RET_SALES_TAX_ADJ"/>
+ <ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="VAT_TAX" returnItemTypeId="RET_VAT_TAX_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="SHIPPING_CHARGES" returnItemTypeId="RET_SHIPPING_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="SURCHARGE_ADJUSTMENT" returnItemTypeId="RET_SURCHARGE_ADJ"/>
<ReturnItemTypeMap returnHeaderTypeId="CUSTOMER_RETURN"
returnItemMapKey="ADDITIONAL_FEATURE" returnItemTypeId="RET_ADD_FEATURE_ADJ"/>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=1056885&r1=1056884&r2=1056885&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
Sun Jan 9 05:30:54 2011
@@ -47,7 +47,7 @@ under the License.
</if-compare>
<else>
<!-- make sure that the party to return to is an
INTERNAL_ORGANIZATIO for customer return and SUPPLIER for vendor return else
stop -->
- <if-compare field="returnHeaderTypeId" operator="equals"
value="CUSTOMER_RETURN">
+ <if-compare field="returnHeaderTypeId" operator="contains"
value="CUSTOMER_">
<entity-one entity-name="PartyRole" value-field="partyRole"
use-cache="true" auto-field-map="false">
<field-map field-name="partyId"
from-field="parameters.toPartyId"/>
<field-map field-name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
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=1056885&r1=1056884&r2=1056885&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Sun
Jan 9 05:30:54 2011
@@ -360,7 +360,7 @@ under the License.
<td width='25%'>
<select name="orderId">
<#list partyOrders as order>
- <option>${order.orderId}</option>
+ <option value="${order.orderId}">${order.orderId} -
${order.orderDate}</option>
</#list>
</select>
</td>
