Hello Jacques,
Actually I used mergefromtrunk.sh file to commit the code.
But somehow there were a small problem in that shell script file so my
message from trunk didn't come.
Please have a look on the JIRA issue OFBIZ-2404, as I have fixed that
problem and given explanation of problem.
If it looks good to you then you can commit the patch.
Thanks !
--
Ashish
On Sat, May 2, 2009 at 5:32 PM, Jacques Le Roux <
[hidden email]> wrote:
> Ashish,
>
> You may use the new mergefromtrunk ;o)
>
> Jacques
>
> From: <
[hidden email]>
>
> Author: ashish
>> Date: Sat May 2 11:29:56 2009
>> New Revision: 770932
>>
>> URL:
http://svn.apache.org/viewvc?rev=770932&view=rev>> Log:
>> Applied fix from trunk for revision: 770929
>>
>> Modified:
>>
>> ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnItems.ftl
>>
>> Modified:
>> ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnItems.ftl
>> URL:
>>
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=770932&r1=770931&r2=770932&view=diff>>
>> ==============================================================================
>> ---
>> ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnItems.ftl
>> (original)
>> +++
>> ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnItems.ftl
>> Sat May 2 11:29:56 2009
>> @@ -266,7 +266,7 @@
>> </td>
>> </#if>
>> <#if returnHeader.statusId == "RETURN_REQUESTED" ||
>> returnHeader.statusId == "SUP_RETURN_REQUESTED">
>> - <td align='right'><a
>> href="<@ofbizUrl>removeReturnItem?returnId=${item.returnId}&returnItemSeqId=${item.returnItemSeqId}</@ofbizUrl>"
>> class="buttontext">${uiLabelMap.CommonRemove}</a>
>> + <td align='right'><a
>> href='javascript:document.removeReturnItem_${item_index}.submit()'
>> class='buttontext'>${uiLabelMap.CommonRemove}</a>
>> <#else>
>> <td> </td>
>> </#if>
>> @@ -312,6 +312,14 @@
>> </form>
>>
>> </table>
>> + <#if returnItems?has_content>
>> + <#list returnItems as item>
>> + <form name="removeReturnItem_${item_index}" method="post"
>> action="<@ofbizUrl>removeReturnItem</@ofbizUrl>">
>> + <input type="hidden" name="returnId"
>> value="${item.returnId}"/>
>> + <input type="hidden" name="returnItemSeqId"
>> value="${item.returnItemSeqId}"/>
>> + </form>
>> + </#list>
>> + </#if>
>> <#if (returnHeader.statusId == "RETURN_REQUESTED" ||
>> returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)>
>> <br/>
>> <form name="acceptReturn" method="post"
>> action="<@ofbizUrl>/updateReturn</@ofbizUrl>">
>>
>>
>>
>
>
Locked
