Author: diveshdutta
Date: Sat May 21 09:55:35 2016
New Revision: 1744884
URL: http://svn.apache.org/viewvc?rev=1744884&view=rev
Log:
[OFBIZ-7049] 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/trunk/applications/order/template/return/ReturnItems.ftl
Modified: ofbiz/trunk/applications/order/template/return/ReturnItems.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/return/ReturnItems.ftl?rev=1744884&r1=1744883&r2=1744884&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/return/ReturnItems.ftl (original)
+++ ofbiz/trunk/applications/order/template/return/ReturnItems.ftl Sat May 21
09:55:35 2016
@@ -146,7 +146,7 @@ under the License.
<#assign orderHeader = item.getRelatedOne("OrderHeader", false)!>
<#assign returnReason = item.getRelatedOne("ReturnReason",
false)!>
<#assign returnType = item.getRelatedOne("ReturnType", false)!>
- <#assign status = item.getRelatedOne("InventoryStatusItem",
false)!>
+ <#assign status = item.getRelatedOne("StatusItem", false)!>
<#assign shipmentReceipts = item.getRelated("ShipmentReceipt",
null, null, false)!>
<#if (item.get("returnQuantity")?? && item.get("returnPrice")??)>
<#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)!}</option>
- <option value="${status.statusId}">--</option>
- </#if>
- <#list itemStatus as returnItemStatus>
- <option
value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)!}</option>
- </#list>
- </select>
- </#if>
</div></td>
<td><div>
<#if (readOnly)>
