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 2014/09/20 18:19:40 UTC
svn commit: r1626470 - in /ofbiz/trunk/applications/order:
config/OrderUiLabels.xml webapp/ordermgr/entry/order/orderheaderinfo.ftl
webapp/ordermgr/entry/orderterms.ftl webapp/ordermgr/order/orderterms.ftl
Author: ashish
Date: Sat Sep 20 16:19:39 2014
New Revision: 1626470
URL: http://svn.apache.org/r1626470
Log:
Apply patch from jira issue - OFBIZ-4372 - Order terms not displayed correctly.
Thanks Divesh for the contribution.
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1626470&r1=1626469&r2=1626470&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Sep 20 16:19:39 2014
@@ -8609,6 +8609,18 @@
<value xml:lang="zh_CN">åè®®å¼</value>
<value xml:lang="zh_TW">æ¢ä»¶å¼</value>
</property>
+ <property key="OrderOrderTextValue">
+ <value xml:lang="en">Text Value</value>
+ <value xml:lang="fr">Valeur du texte</value>
+ <value xml:lang="hi_IN">पाठà¥à¤¯ मान</value>
+ <value xml:lang="it">Testo Valore</value>
+ <value xml:lang="nl">Text Value</value>
+ <value xml:lang="pt">Valor do Texto</value>
+ <value xml:lang="ru">ТекÑÑовое знаÑение</value>
+ <value xml:lang="th">à¸à¹à¸²à¸à¸±à¸§à¸à¸±à¸à¸©à¸£</value>
+ <value xml:lang="zh">ææ¬å¼</value>
+ <value xml:lang="zh_TW">ææ¬å¼</value>
+ </property>
<property key="OrderOrderTerms">
<value xml:lang="de">Auftragskonditionen</value>
<value xml:lang="en">Order Terms</value>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=1626470&r1=1626469&r2=1626470&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Sat Sep 20 16:19:39 2014
@@ -70,7 +70,8 @@ under the License.
<td width="35%"><div><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
<td width="10%"><div><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
<td width="10%"><div><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
- <td width="45%"><div><b>${uiLabelMap.CommonDescription}</b></div></td>
+ <td width="10%"><div><b>${uiLabelMap.OrderOrderTextValue}</b></div></td>
+ <td width="35%"><div><b>${uiLabelMap.CommonDescription}</b></div></td>
</tr>
<tr><td colspan="4"><hr /></td></tr>
<#assign index=0/>
@@ -79,10 +80,11 @@ under the License.
<td width="35%"><div>${orderTerm.getRelatedOne("TermType", false).get("description",locale)}</div></td>
<td width="10%"><div>${orderTerm.termValue?default("")}</div></td>
<td width="10%"><div>${orderTerm.termDays?default("")}</div></td>
- <td width="45%"><div>${orderTerm.textValue?default("")}</div></td>
+ <td width="10%"><div>${orderTerm.textValue?default("")}</div></td>
+ <td width="35%"><div>${orderTerm.description?default("")}</div></td>
</tr>
<#if orderTerms.size()<index>
- <tr><td colspan="4"><hr /></td></tr>
+ <tr><td colspan="5"><hr /></td></tr>
</#if>
<#assign index=index+1/>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=1626470&r1=1626469&r2=1626470&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Sat Sep 20 16:19:39 2014
@@ -33,6 +33,7 @@ under the License.
<td>${uiLabelMap.OrderOrderTermType}</td>
<td align="center">${uiLabelMap.OrderOrderTermValue}</td>
<td align="center">${uiLabelMap.OrderOrderTermDays}</td>
+ <td align="center">${uiLabelMap.OrderOrderTextValue}</td>
<td>${uiLabelMap.CommonDescription}</td>
<td> </td>
</tr>
@@ -42,6 +43,7 @@ under the License.
<td align="center">${orderTerm.termValue!}</td>
<td align="center">${orderTerm.termDays!}</td>
<td nowrap="nowrap">${orderTerm.textValue!}</td>
+ <td nowrap="nowrap">${orderTerm.description?if_exists}</td>
<td align="right">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
@@ -94,11 +96,20 @@ under the License.
</tr>
<tr>
<td width="26%" align="right" valign="top">
+ ${uiLabelMap.OrderOrderTextValue}
+ </td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="30" maxlength="60" name="textValue" value="${textValue?if_exists}" />
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top">
${uiLabelMap.CommonDescription}
</td>
<td width="5"> </td>
<td width="74%">
- <input type="text" size="30" maxlength="255" name="textValue" value="${textValue!}" />
+ <input type="text" size="30" maxlength="255" name="description" value="${description?if_exists}" />
</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl?rev=1626470&r1=1626469&r2=1626470&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderterms.ftl Sat Sep 20 16:19:39 2014
@@ -29,16 +29,18 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
<td width="35%">${uiLabelMap.OrderOrderTermType}</td>
- <td width="15%" align="center">${uiLabelMap.OrderOrderTermValue}</td>
- <td width="15%" align="center">${uiLabelMap.OrderOrderTermDays}</td>
+ <td width="10%" align="center">${uiLabelMap.OrderOrderTermValue}</td>
+ <td width="10%" align="center">${uiLabelMap.OrderOrderTermDays}</td>
+ <td width="10%" align="center">${uiLabelMap.OrderOrderTextValue}</td>
<td width="35%" align="center">${uiLabelMap.CommonDescription}</td>
</tr>
<#list orderTerms as orderTerm>
<tr>
<td width="35%">${orderTerm.getRelatedOne("TermType", false).get("description", locale)}</td>
- <td width="15%" align="center">${orderTerm.termValue?default("")}</td>
- <td width="15%" align="center">${orderTerm.termDays?default("")}</td>
- <td width="35%" align="center">${orderTerm.textValue?default("")}</td>
+ <td width="10%" align="center">${orderTerm.termValue?default("")}</td>
+ <td width="10%" align="center">${orderTerm.termDays?default("")}</td>
+ <td width="10%" align="center">${orderTerm.textValue?default("")}</td>
+ <td width="35%" align="center">${orderTerm.description?default("")}</td>
</tr>
</#list>
</table>