You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2011/07/23 11:00:02 UTC
svn commit: r1150071 - in
/ofbiz/branches/release10.04/applications/product/webapp/facility:
facility/FindFacilityLocation.ftl inventory/receiveInventory.ftl
returns/receiveReturn.ftl
Author: ashish
Date: Sat Jul 23 09:00:01 2011
New Revision: 1150071
URL: http://svn.apache.org/viewvc?rev=1150071&view=rev
Log:
Back porting following bug fixes in Release Branch 10.04. This changes were committed in trunk but some how it was not back ported to release branch.
1) From r1022091 - Must prepare the field before passing it to freemarker macro, else it is just a string and the lookup is not displayed.
2) From r1087037 - fixed error on page when receiving single product w/ no ProductFacilityLocations.
Thanks Deepak for the patch!
Modified:
ofbiz/branches/release10.04/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl
Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1150071&r1=1150070&r2=1150071&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Sat Jul 23 09:00:01 2011
@@ -36,7 +36,12 @@ under the License.
<tr>
<td class="label">${uiLabelMap.ProductLocationSeqId}</td>
<td>
- <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if (facilityId?exists)>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="findFacilityLocation" name="locationSeqId" id="locationSeqId" fieldFormName="${LookupFacilityLocationView}"/>
</td>
</tr>
<tr>
Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1150071&r1=1150070&r2=1150071&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/facility/inventory/receiveInventory.ftl Sat Jul 23 09:00:01 2011
@@ -185,7 +185,12 @@ under the License.
<option value="">${uiLabelMap.ProductNoLocation}</option>
</select>
<#else>
- <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId" id="locationSeqId" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId" id="locationSeqId" fieldFormName="${LookupFacilityLocationView}"/>
</#if>
</td>
</tr>
Modified: ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1150071&r1=1150070&r2=1150071&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/branches/release10.04/applications/product/webapp/facility/returns/receiveReturn.ftl Sat Jul 23 09:00:01 2011
@@ -150,7 +150,12 @@ under the License.
</select>
<#else>
<span>
- <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="LookupFacilityLocation<#if parameters.facilityId?exists>?facilityId=${facilityId}</#if>"/>
+ <#if parameters.facilityId?exists>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation?facilityId=${facilityId}">
+ <#else>
+ <#assign LookupFacilityLocationView="LookupFacilityLocation">
+ </#if>
+ <@htmlTemplate.lookupField formName="selectAllForm" name="locationSeqId_o_${rowCount}" id="locationSeqId_o_${rowCount}" fieldFormName="${LookupFacilityLocationView}"/>
</span>
</#if>
</td>