Author: ashish
Date: Mon Dec 14 11:52:22 2009
New Revision: 890283
URL: http://svn.apache.org/viewvc?rev=890283&view=rev
Log:
Removed warning message coming on couple of PDF.
Patch from Surya Kusumakar.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl?rev=890283&r1=890282&r2=890283&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
Mon Dec 14 11:52:22 2009
@@ -37,25 +37,25 @@
<fo:page-sequence master-reference="main">
<fo:flow flow-name="xsl-region-body" font-family="Helvetica">
<fo:block>
- <fo:table>
- <fo:table-column/>
- <fo:table-column/>
+ <fo:table width="100%" table-layout="fixed">
+ <fo:table-column column-width="4in"/>
+ <fo:table-column column-width="1in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <fo:block align="left">
+ <fo:block>
${screens.render("component://order/widget/ordermgr/OrderPrintScreens.xml#CompanyLogo")}
</fo:block>
</fo:table-cell>
<fo:table-cell>
- <fo:block align="right">
- <fo:table>
+ <fo:block>
+ <fo:table width="100%" table-layout="fixed">
<fo:table-column column-width="1in"/>
<fo:table-column column-width="2.5in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <fo:block number-columns-spanned="2"
font-weight="bold"
wrap-option="no-wrap">${invoice.getRelatedOne("InvoiceType").get("description",locale)?if_exists}</fo:block>
+ <fo:block number-columns-spanned="2"
font-weight="bold">${invoice.getRelatedOne("InvoiceType").get("description",locale)?if_exists}</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
@@ -97,7 +97,7 @@
<#if billingParty?has_content>
<fo:block>
- <fo:table space-after="0.3in">
+ <fo:table width="100%" table-layout="fixed"
space-after="0.3in">
<fo:table-column column-width="3.5in"/>
<fo:table-body>
<fo:table-row >
@@ -131,7 +131,7 @@
<fo:block>
<#if invoiceDetail.orders?has_content>
<#assign orders = invoiceDetail.orders?if_exists />
- <fo:table space-after="0.3in">
+ <fo:table width="100%" table-layout="fixed"
space-after="0.3in">
<fo:table-column column-width="1in"/>
<fo:table-column column-width="5.5in"/>
<fo:table-body>
@@ -149,7 +149,7 @@
<#if invoiceDetail.invoiceItems?has_content>
<#assign invoiceItems = invoiceDetail.invoiceItems?if_exists />
- <fo:table>
+ <fo:table width="100%" table-layout="fixed">
<fo:table-column column-width="20mm"/>
<fo:table-column column-width="20mm"/>
<fo:table-column column-width="65mm"/>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl?rev=890283&r1=890282&r2=890283&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
Mon Dec 14 11:52:22 2009
@@ -33,7 +33,7 @@
</fo:block>
<fo:block><fo:leader/></fo:block>
<fo:block space-after.optimum="10pt" font-size="10pt">
- <fo:table>
+ <fo:table table-layout="fixed" width="100%">
<fo:table-column column-width="75pt"/>
<fo:table-column column-width="100pt"/>
<fo:table-column column-width="135pt"/>
