Author: deepak
Date: Sat May 21 13:49:42 2016
New Revision: 1744944
URL: http://svn.apache.org/viewvc?rev=1744944&view=rev
Log:
(OFBIZ-7049) Manually merge r#1744884.
=======================================================
[Fixed: Sales Return Item Status is misleading. expectedStatusId field of
ReturnItem is shown in UI in Return overview screen, statusId should be shown
instead of expectedStatusId. expectedStatusId is status of inventoryItem, when
product is received in inventory. It should not be shown for return item
itself. Thanks Swapnil for reporting the ticket and thansk Anuj for providing
the patch.
=======================================================
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl
Modified:
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=1744944&r1=1744943&r2=1744944&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl
(original)
+++
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/return/returnItems.ftl
Sat May 21 13:49:42 2016
@@ -146,7 +146,7 @@ under the License.
<#assign orderHeader = item.getRelatedOne("OrderHeader",
false)?if_exists>
<#assign returnReason = item.getRelatedOne("ReturnReason",
false)?if_exists>
<#assign returnType = item.getRelatedOne("ReturnType",
false)?if_exists>
- <#assign status = item.getRelatedOne("InventoryStatusItem",
false)?if_exists>
+ <#assign status = item.getRelatedOne("StatusItem", false)!>
<#assign shipmentReceipts = item.getRelated("ShipmentReceipt",
null, null, false)?if_exists>
<#if (item.get("returnQuantity")?exists &&
item.get("returnPrice")?exists)>
<#assign returnTotal = returnTotal +
item.get("returnQuantity") * item.get("returnPrice") >
@@ -212,23 +212,11 @@ under the License.
</#if>
</div></td>
<td><div>
- <#if readOnly>
<#if status?has_content>
- ${status.get("description",locale)}
+ ${status.get("description",locale)}
<#else>
- N/A
+ N/A
</#if>
- <#else>
- <select name="expectedItemStatus_o_${rowCount}">
- <#if (status?has_content)>
- <option
value="${status.statusId}">${status.get("description",locale)?if_exists}</option>
- <option value="${status.statusId}">--</option>
- </#if>
- <#list itemStatus as returnItemStatus>
- <option
value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)?if_exists}</option>
- </#list>
- </select>
- </#if>
</div></td>
<td><div>
<#if (readOnly)>
