Author: deepak
Date: Sun Jun 26 08:48:20 2016
New Revision: 1750237
URL: http://svn.apache.org/viewvc?rev=1750237&view=rev
Log:
(OFBIZ-7557) Manually merged r#1750234
=======================================================
Unable to set thru date for Product Promo Stores if promotion is associated
with multiple stores.
=======================================================
Thanks Pawan for your contribution.
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
Modified:
ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=1750237&r1=1750236&r2=1750237&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
(original)
+++
ofbiz/branches/release13.07/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
Sun Jun 26 08:48:20 2016
@@ -47,7 +47,7 @@ under the License.
<input type="hidden" name="productPromoId"
value="${productStorePromoAppl.productPromoId}" />
<input type="hidden" name="fromDate"
value="${productStorePromoAppl.fromDate}" />
<#if hasExpired><#assign class="alert"></#if>
- <@htmlTemplate.renderDateTimeField name="thruDate"
event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(productStorePromoAppl.thruDate)?if_exists}" size="25"
maxlength="30" id="thruDate1" dateType="date" shortDateInput=false
timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle=""
timeDropdown="" timeHourName="" classString="" hour1="" hour2=""
timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected=""
pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="thruDate"
event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="${(productStorePromoAppl.thruDate)!}" size="25"
maxlength="30" id="thruDate_${productStorePromoAppl_index}" dateType="date"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="text" size="5" name="sequenceNum"
value="${(productStorePromoAppl.sequenceNum)?if_exists}" />
<input type="submit"
value="${uiLabelMap.CommonUpdate}" />
</form>
