You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/06/24 23:10:57 UTC
svn commit: r1687371 - in /ofbiz/trunk/applications:
order/config/OrderUiLabels.xml
order/webapp/ordermgr/order/ordershippinginfo.ftl
product/config/ProductUiLabels.xml
Author: nmalin
Date: Wed Jun 24 21:10:56 2015
New Revision: 1687371
URL: http://svn.apache.org/r1687371
Log:
show estimatedShipDate and estimatedDeliveryDate on OISG if they are present. Related issue OFBIZ-6198. Thanks Christian Carlow for this. Correct also two french labels that not corresponding
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1687371&r1=1687370&r2=1687371&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Jun 24 21:10:56 2015
@@ -8380,7 +8380,7 @@
<value xml:lang="de">Geschätztes Lieferdatum</value>
<value xml:lang="en">Estimated Delivery Date</value>
<value xml:lang="es">Fecha de entrega estimada</value>
- <value xml:lang="fr">Date d'expédition estimée</value>
+ <value xml:lang="fr">Date de livraison estimée</value>
<value xml:lang="it">Data Consegna Stimata</value>
<value xml:lang="ja">äºå®é
éæ¥</value>
<value xml:lang="nl">Verwachte leverdatum</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1687371&r1=1687370&r2=1687371&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Jun 24 21:10:56 2015
@@ -707,9 +707,9 @@ under the License.
</#if>
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
- <span class="label"> ${uiLabelMap.OrderShipAfterDate}</span><br/>
- <span class="label"> ${uiLabelMap.OrderShipBeforeDate}</span>
+ <td align="right" width="15%">
+ <span class="label"> ${uiLabelMap.OrderShipAfterDate}</span><br/><br/>
+ <span class="label"> ${uiLabelMap.OrderShipBeforeDate}</span><br/>
</td>
<td width="5"> </td>
<td valign="top" width="80%">
@@ -722,7 +722,26 @@ under the License.
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
- </tr>
+ <tr>
+ <td align="right" width="15%">
+ <span class="label"> ${uiLabelMap.ProductEstimatedShipDate}</span>
+ </td>
+ <td width="5"> </td>
+ <td width="80%">
+ <#if shipGroup.estimatedShipDate?has_content><#assign estimatedShipDate=shipGroup.estimatedShipDate?date><#else><#assign estimatedShipDate="-"/></#if>
+ <@htmlTemplate.renderDisplayField type="date" imageLocation="" idName="" description="${estimatedShipDate}" title="" class="" alert=""/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right" width="15%">
+ <span class="label"> ${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span>
+ </td>
+ <td width="5"> </td>
+ <td valign="top" width="80%">
+ <#if shipGroup.estimatedDeliveryDate?has_content><#assign estimatedDeliveryDate=shipGroup.estimatedDeliveryDate?date><#else><#assign estimatedDeliveryDate="-"/></#if>
+ <@htmlTemplate.renderDisplayField type="date" imageLocation="" idName="" description="${estimatedDeliveryDate}" title="" class="" alert=""/>
+ </td>
+ </tr>
<#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment", null, null, false)>
<#if shipGroupShipments?has_content>
<tr><td colspan="3"><hr /></td></tr>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1687371&r1=1687370&r2=1687371&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Jun 24 21:10:56 2015
@@ -17080,7 +17080,7 @@
<value xml:lang="de">Voraussichtlicher Liefertermin</value>
<value xml:lang="en">Estimated Ship Date</value>
<value xml:lang="es">Fecha estimada de envÃo</value>
- <value xml:lang="fr">Date d'expédtion estimée</value>
+ <value xml:lang="fr">Date d'expédition estimée</value>
<value xml:lang="it">Data Spedizione Stimata</value>
<value xml:lang="ja">è¦ç©çºéæ¥</value>
<value xml:lang="ro">Data Expediere Stimata</value>