You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pr...@apache.org on 2016/06/01 13:32:24 UTC
svn commit: r1746460 -
/ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
Author: pranayp
Date: Wed Jun 1 13:32:24 2016
New Revision: 1746460
URL: http://svn.apache.org/viewvc?rev=1746460&view=rev
Log:
[OFBIZ-7146] Applied patch from the ticket to fix error in rendering Quote PDF which is not having terms associated to it.
Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
Modified:
ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
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=1746460&r1=1746459&r2=1746460&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl Wed Jun 1 13:32:24 2016
@@ -74,9 +74,9 @@ under the License.
<fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
+ <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
<#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>
Re: svn commit: r1746460 - /ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
Posted by Pranay Pandey <pr...@hotwaxsystems.com>.
Hi Deepak,
Thanks for your comment, surely this one could be the other way to fix the
issue. But Amardeep has tried to follow the structure which is being
followed by other fields on this pdf.
Amardeep, please feel free to add further details.
Best regards,
Pranay Pandey
HotWax Systems
http://www.hotwaxsystems.com/
On Fri, Jun 3, 2016 at 11:54 AM, Deepak Dixit <
deepak.dixit@hotwaxsystems.com> wrote:
> Hi Amardeep,
>
> I think Here instead of showing empty terms we can move condition before
> fo:table-row,
>
> Thanks & Regards
> --
> Deepak Dixit
> www.hotwaxsystems.com
>
> On Wed, Jun 1, 2016 at 7:02 PM, <pr...@apache.org> wrote:
>
> > Author: pranayp
> > Date: Wed Jun 1 13:32:24 2016
> > New Revision: 1746460
> >
> > URL: http://svn.apache.org/viewvc?rev=1746460&view=rev
> > Log:
> > [OFBIZ-7146] Applied patch from the ticket to fix error in rendering
> Quote
> > PDF which is not having terms associated to it.
> >
> > Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
> >
> > Modified:
> >
> >
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> >
> > 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=1746460&r1=1746459&r2=1746460&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> > (original)
> > +++
> >
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> > Wed Jun 1 13:32:24 2016
> > @@ -74,9 +74,9 @@ under the License.
> >
> >
> <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
> > </fo:table-row>
> > <fo:table-row>
> > +
> >
> <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
> > <#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>
> >
> >
> >
>
Re: svn commit: r1746460 - /ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
Posted by Amardeep Singh Jhajj <am...@hotwaxsystems.com>.
Thanks Deepak for suggestions.
I thought the same as you mentioned. But after looking the rendering of
other fields like Description, Valid Through Date, I worked to show the
empty terms.
I am also agreed on showing the empty terms because it simply says not
terms added till now and user can add it in future.
Thanks
--
Amardeep Singh Jhajj
www.hotwaxsystems.com
On Fri, Jun 3, 2016 at 11:54 AM, Deepak Dixit <
deepak.dixit@hotwaxsystems.com> wrote:
> Hi Amardeep,
>
> I think Here instead of showing empty terms we can move condition before
> fo:table-row,
>
> Thanks & Regards
> --
> Deepak Dixit
> www.hotwaxsystems.com
>
> On Wed, Jun 1, 2016 at 7:02 PM, <pr...@apache.org> wrote:
>
> > Author: pranayp
> > Date: Wed Jun 1 13:32:24 2016
> > New Revision: 1746460
> >
> > URL: http://svn.apache.org/viewvc?rev=1746460&view=rev
> > Log:
> > [OFBIZ-7146] Applied patch from the ticket to fix error in rendering
> Quote
> > PDF which is not having terms associated to it.
> >
> > Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
> >
> > Modified:
> >
> >
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> >
> > 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=1746460&r1=1746459&r2=1746460&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> > (original)
> > +++
> >
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> > Wed Jun 1 13:32:24 2016
> > @@ -74,9 +74,9 @@ under the License.
> >
> >
> <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
> > </fo:table-row>
> > <fo:table-row>
> > +
> >
> <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
> > <#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>
> >
> >
> >
>
Re: svn commit: r1746460 - /ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
Posted by Deepak Dixit <de...@hotwaxsystems.com>.
Hi Amardeep,
I think Here instead of showing empty terms we can move condition before
fo:table-row,
Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
On Wed, Jun 1, 2016 at 7:02 PM, <pr...@apache.org> wrote:
> Author: pranayp
> Date: Wed Jun 1 13:32:24 2016
> New Revision: 1746460
>
> URL: http://svn.apache.org/viewvc?rev=1746460&view=rev
> Log:
> [OFBIZ-7146] Applied patch from the ticket to fix error in rendering Quote
> PDF which is not having terms associated to it.
>
> Thanks Amardeep Singh Jhajj for reporting the issue and providing patch.
>
> Modified:
>
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
>
> 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=1746460&r1=1746459&r2=1746460&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> (original)
> +++
> ofbiz/trunk/applications/order/template/quote/QuoteReportContactMechs.fo.ftl
> Wed Jun 1 13:32:24 2016
> @@ -74,9 +74,9 @@ under the License.
>
> <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
> </fo:table-row>
> <fo:table-row>
> +
> <fo:table-cell><fo:block>${uiLabelMap.CommonQuoteTerms}:</fo:block></fo:table-cell>
> <#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>
>
>
>