svn commit: r890282 - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r890282 - in /ofbiz/trunk: applications/accounting/script
 
|
Author: ashish
Date: Mon Dec 14 11:51:36 2009 New Revision: 890282 URL: http://svn.apache.org/viewvc?rev=890282&view=rev Log: Removed warning message coming on couple of PDF. Patch from Parimal Gain. Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml?rev=890282&r1=890281&r2=890282&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml (original) +++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceEvents.xml Mon Dec 14 11:51:36 2009 @@ -762,6 +762,7 @@ <fail-message message="productId don't have value, cannot call calcTax service."/> </add-error> <log level="error" message="Cannot call calcTax service, when don't have productId"/> + <check-errors/> </else> </if> </simple-method> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=890282&r1=890281&r2=890282&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Mon Dec 14 11:51:36 2009 @@ -1,44 +1,44 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<#escape x as x?xml> -<fo:table space-after="0.3in"> - <fo:table-column column-width="3.5in"/> - <fo:table-body> - <fo:table-row > - <fo:table-cell> - <fo:block>${uiLabelMap.CommonTo}: </fo:block> - <#if billingAddress?has_content> - <#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> - <fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> - <#if billingAddress.attnName?exists> - <fo:block>${billingAddress.attnName}</fo:block> - </#if> - <fo:block>${billingAddress.address1?if_exists}</fo:block> - <#if billingAddress.address2?exists> - <fo:block>${billingAddress.address2}</fo:block> - </#if> - <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> - <#else> - <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId}</fo:block> - </#if> - </fo:table-cell> - </fo:table-row> - </fo:table-body> -</fo:table> -</#escape> +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#escape x as x?xml> +<fo:table table-layout="fixed" width="100%" space-after="0.3in"> + <fo:table-column column-width="3.5in"/> + <fo:table-body> + <fo:table-row > + <fo:table-cell> + <fo:block>${uiLabelMap.CommonTo}: </fo:block> + <#if billingAddress?has_content> + <#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> + <fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> + <#if billingAddress.attnName?exists> + <fo:block>${billingAddress.attnName}</fo:block> + </#if> + <fo:block>${billingAddress.address1?if_exists}</fo:block> + <#if billingAddress.address2?exists> + <fo:block>${billingAddress.address2}</fo:block> + </#if> + <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> + <#else> + <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId}</fo:block> + </#if> + </fo:table-cell> + </fo:table-row> + </fo:table-body> +</fo:table> +</#escape> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=890282&r1=890281&r2=890282&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Mon Dec 14 11:51:36 2009 @@ -1,64 +1,64 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<#escape x as x?xml> -<fo:table> -<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)}</fo:block> - </fo:table-cell> -</fo:table-row> - -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${invoiceDate?if_exists}</fo:block></fo:table-cell> -</fo:table-row> - -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block><#if billingParty?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell> -</fo:table-row> - -<#if billingPartyTaxId?has_content> - <fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block> ${billingPartyTaxId}</fo:block></fo:table-cell> - </fo:table-row> -</#if> - -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell> -</fo:table-row> -<#if invoice?has_content && invoice.description?has_content> - <fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${invoice.description}</fo:block></fo:table-cell> - </fo:table-row> -</#if> - -<!--fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${invoiceStatus.get("description",locale)}</fo:block></fo:table-cell> -</fo:table-row--> -</fo:table-body> -</fo:table> -</#escape> +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<#escape x as x?xml> +<fo:table table-layout="fixed" width="100%"> +<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">${invoice.getRelatedOne("InvoiceType").get("description",locale)}</fo:block> + </fo:table-cell> +</fo:table-row> + +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${invoiceDate?if_exists}</fo:block></fo:table-cell> +</fo:table-row> + +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if billingParty?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell> +</fo:table-row> + +<#if billingPartyTaxId?has_content> + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block> ${billingPartyTaxId}</fo:block></fo:table-cell> + </fo:table-row> +</#if> + +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell> +</fo:table-row> +<#if invoice?has_content && invoice.description?has_content> + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${invoice.description}</fo:block></fo:table-cell> + </fo:table-row> +</#if> + +<!--fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${invoiceStatus.get("description",locale)}</fo:block></fo:table-cell> +</fo:table-row--> +</fo:table-body> +</fo:table> +</#escape> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl?rev=890282&r1=890281&r2=890282&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl Mon Dec 14 11:51:36 2009 @@ -19,7 +19,7 @@ <#escape x as x?xml> <#-- list of orders --> <#if orders?has_content> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="1in"/> <fo:table-column column-width="5.5in"/> @@ -38,7 +38,7 @@ <#-- list of terms --> <#if terms?has_content> - <fo:table space-before="0.1in"> + <fo:table table-layout="fixed" width="100%" space-before="0.1in"> <fo:table-column column-width="6.5in"/> <fo:table-header height="14px"> @@ -62,7 +62,7 @@ </fo:table> </#if> - <fo:table space-before="0.2in"> + <fo:table table-layout="fixed" width="100%" space-before="0.2in"> <fo:table-column column-width="20mm"/> <fo:table-column column-width="85mm"/> <fo:table-column column-width="15mm"/> @@ -252,5 +252,4 @@ <#-- a block with the invoice message--> <#if invoice.invoiceMessage?has_content><fo:block>${invoice.invoiceMessage}</fo:block></#if> <fo:block></fo:block> - <fo:block id="theEnd"/> <#-- marks the end of the pages and used to identify page-number at the end --> </#escape> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl?rev=890282&r1=890281&r2=890282&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl Mon Dec 14 11:51:36 2009 @@ -52,15 +52,15 @@ <#-- the check: note that the format is fairly precise --> <#-- this seems to be the only way to force a fixed height in fop --> - <fo:table table-layout="fixed"> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="100%"/> <fo:table-body> <fo:table-row height="8.85cm"> <fo:table-cell> - <fo:table table-layout="fixed"> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="17.7cm"/> - <fo:table-column/> + <fo:table-column column-width="3cm"/> <fo:table-body> <fo:table-row> <fo:table-cell/> @@ -96,20 +96,20 @@ <#-- payment applications (twice: both blocks are exactly the same) --> <#-- this seems to be the only way to force a fixed height in fop --> - <fo:table table-layout="fixed"> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="100%"/> <fo:table-body> <fo:table-row height="9.3cm"> <fo:table-cell> - <fo:table height="9.3cm" table-layout="fixed" margin-left="5pt" margin-right="5pt"> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> + <fo:table table-layout="fixed" margin-left="5pt" margin-right="5pt" width="100%"> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> <fo:table-header> <fo:table-row> <fo:table-cell padding="3pt" number-columns-spanned="3" text-align="center"> @@ -295,20 +295,20 @@ <#-- copy of above --> <#-- this seems to be the only way to force a fixed height in fop --> - <fo:table table-layout="fixed"> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-width="100%"/> <fo:table-body> <fo:table-row height="9.3cm"> <fo:table-cell> - <fo:table height="9.3cm" table-layout="fixed" margin-left="5pt" margin-right="5pt"> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> - <fo:table-column/> + <fo:table table-layout="fixed" margin-left="5pt" margin-right="5pt" width="100%"> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> + <fo:table-column column-width="3cm"/> <fo:table-header> <fo:table-row> <fo:table-cell padding="3pt" number-columns-spanned="3" text-align="center"> Modified: ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl?rev=890282&r1=890281&r2=890282&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/reportTemplate.fo.ftl Mon Dec 14 11:51:36 2009 @@ -55,7 +55,7 @@ in the right side cell the "topRight" template is included --> <fo:static-content flow-name="xsl-region-before"> - <fo:table> + <fo:table table-layout="fixed" width="100%"> <fo:table-column column-number="1" column-width="proportional-column-width(50)"/> <fo:table-column column-number="2" column-width="proportional-column-width(50)"/> <fo:table-body> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |