Author: ashish
Date: Sat May 21 11:38:36 2016
New Revision: 1744910
URL: http://svn.apache.org/viewvc?rev=1744910&view=rev
Log:
Applied patch from jira issue - Quote report doesn't show terms of the quote.
Thanks Pierre for creating the issue and Thanks Ravi for providing the patch.
Modified:
ofbiz/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl
ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
Modified: ofbiz/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl?rev=1744910&r1=1744909&r2=1744910&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl
(original)
+++ ofbiz/trunk/applications/order/template/quote/QuoteReportBody.fo.ftl Sat
May 21 11:38:36 2016
@@ -60,6 +60,17 @@ under the License.
</fo:table-cell>
<fo:table-cell padding="2pt"
background-color="${rowColor}">
<fo:block>${(product.internalName)!}
[${quoteItem.productId!}]</fo:block>
+ <#if quoteItem.quoteItemSeqId?has_content>
+ <#assign quoteItemLevelTerms =
Static["org.ofbiz.entity.util.EntityUtil"].filterByAnd(quoteTerms,
{"quoteItemSeqId": quoteItem.quoteItemSeqId})!>
+ <#if quoteItemLevelTerms?has_content>
+
<fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block>
+ <#list quoteItemLevelTerms as
quoteItemLevelTerm>
+ <fo:block text-indent="0.1in">
+
${quoteItemLevelTerm.getRelatedOne("TermType",
false).get("description",locale)} ${quoteItemLevelTerm.termValue?default("")}
${quoteItemLevelTerm.termDays?default("")}
${quoteItemLevelTerm.textValue?default("")}
+ </fo:block>
+ </#list>
+ </#if>
+ </#if>
</fo:table-cell>
<fo:table-cell padding="2pt"
background-color="${rowColor}">
<fo:block
text-align="right">${quoteItem.quantity!}</fo:block>
Modified:
ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl?rev=1744910&r1=1744909&r2=1744910&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
(original)
+++
ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
Sat May 21 11:38:36 2016
@@ -73,6 +73,19 @@ under the License.
<fo:table-cell><fo:block>${uiLabelMap.CommonValidThruDate}:</fo:block></fo:table-cell>
<fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
</fo:table-row>
+ <fo:table-row>
+ <#assign quoteLevelTerms =
Static["org.ofbiz.entity.util.EntityUtil"].filterByAnd(quoteTerms,
{"quoteItemSeqId": "_NA_"})!>
+ <#if quoteLevelTerms?has_content && quoteLevelTerms.size()
gt 0>
+
<fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
+ <fo:table-cell>
+ <#list quoteLevelTerms as quoteLevelTerm>
+ <fo:block>
+ ${quoteLevelTerm.getRelatedOne("TermType",
false).get("description",locale)} ${quoteLevelTerm.termValue?default("")}
${quoteLevelTerm.termDays?default("")} ${quoteLevelTerm.textValue?default("")}
+ </fo:block>
+ </#list>
+ </fo:table-cell>
+ </#if>
+ </fo:table-row>
</fo:table-body>
</fo:table>
</#escape>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1744910&r1=1744909&r2=1744910&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Sat May 21
11:38:36 2016
@@ -167,6 +167,7 @@ under the License.
<get-related-one value-field="quote" relation-name="Uom"
to-value-field="currency"/>
<get-related-one value-field="quote"
relation-name="ProductStore" to-value-field="store"/>
<get-related-one value-field="quote" relation-name="Party"
to-value-field="party"/>
+ <get-related value-field="quote" relation-name="QuoteTerm"
list="quoteTerms"/>
<set field="listOrderBy[]" value="quoteItemSeqId"/>
<get-related value-field="quote" relation-name="QuoteItem"
list="quoteItems" order-by-list="listOrderBy"/>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1744910&r1=1744909&r2=1744910&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sat May 21 11:38:36
2016
@@ -9272,6 +9272,9 @@
<value xml:lang="nl">Offerte</value>
<value xml:lang="zh">询价</value>
</property>
+ <property key="CommonQuoteTerms">
+ <value xml:lang="en">Quote Terms</value>
+ </property>
<property key="CommonRate">
<value xml:lang="ar">اÙÙسبة</value>
<value xml:lang="cs">Sazba</value>
