You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/04/11 13:37:43 UTC

svn commit: r1672862 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml webapp/ordermgr/quote/quoteReportBody.fo.ftl

Author: deepak
Date: Sat Apr 11 11:37:42 2015
New Revision: 1672862

URL: http://svn.apache.org/r1672862
Log:
OFBIZ-6077: Fixed in correct hierarchy of fo:table, and if no items found then display message on quote item section.

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1672862&r1=1672861&r2=1672862&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Apr 11 11:37:42 2015
@@ -5678,6 +5678,9 @@
         <value xml:lang="zh">我的退货</value>
         <value xml:lang="zh-TW">我的退貨</value>
     </property>
+    <property key="OrderNoItemsQuote">
+       <value xml:lang="en">No Items in quote</value>
+    </property>
     <property key="OrderNOTEMultipleShipmentsExist">
         <value xml:lang="de">Anmerkung: Mehrere Lieferungen vorhanden, verwenden Sie Lieferung aufteilen.</value>
         <value xml:lang="en">NOTE: Multiple shipments exist, use Split Shipment.</value>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1672862&r1=1672861&r2=1672862&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sat Apr 11 11:37:42 2015
@@ -106,6 +106,12 @@ under the License.
                             <#assign rowColor = "white">
                         </#if>
                     </#list>
+                    <#else>
+                      <fo:table-row>
+                         <fo:table-cell number-columns-spanned="7" padding="2pt" background-color="${rowColor}">
+                             <fo:block>${uiLabelMap.OrderNoItemsQuote}</fo:block>
+                         </fo:table-cell>
+                      </fo:table-row>
                     </#if>
                 </fo:table-body>
             </fo:table>