OFBiz › OFBiz - Commits

svn commit: r480724 - in /incubator/ofbiz/trunk: applications/accounting/webapp/accounting/invoice/ applications/manufacturing/webapp/manufacturing/jobshopmgt/ applications/order/webapp/ordermgr/order/ applications/product/webapp/facility/facility/ fra...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jacopoc

svn commit: r480724 - in /incubator/ofbiz/trunk: applications/accounting/webapp/accounting/invoice/ applications/manufacturing/webapp/manufacturing/jobshopmgt/ applications/order/webapp/ordermgr/order/ applications/product/webapp/facility/facility/ fra...

Author: jacopoc
Date: Wed Nov 29 13:44:14 2006
New Revision: 480724

URL: http://svn.apache.org/viewvc?view=rev&rev=480724
Log:
""

Modified:
incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl?view=diff&rev=480724&r1=480723&r2=480724
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl Wed Nov 29 13:44:14 2006
@@ -22,8 +22,8 @@
margin-top="1in" margin-bottom="1in"
margin-left="20mm" margin-right="20mm">
<fo:region-body margin-top="3in" margin-bottom="1in"/> <#-- main body -->
- <fo:region-after extent="1in"/> <#-- a footer -->
<fo:region-before extent="4in"/> <#-- a header -->
+ <fo:region-after extent="1in"/> <#-- a footer -->
</fo:simple-page-master>
</fo:layout-master-set>

@@ -32,8 +32,10 @@
<#-- the region-before and -after must be declared as fo:static-content and before the fo:flow. only 1 fo:flow per
fo:page-sequence -->
<fo:static-content flow-name="xsl-region-before">
- ${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
- <fo:block white-space-collapse="false">
+ <fo:block space-after=".10in">
+ ${screens.render("component://order/widget/ordermgr/OrderPrintForms.xml#CompanyLogo")}
+ </fo:block>
+ <fo:block white-space-collapse="false" >
</fo:block>

<fo:table>
@@ -61,7 +63,8 @@
<fo:block>Tax ID: ${billingPartyTaxId}</fo:block>
</#if>
</fo:table-cell>
- <fo:table-cell>
+ <fo:table-cell><fo:block>
+
<fo:table>
<fo:table-column column-width="1in"/>
<fo:table-column column-width="1.5in"/>
@@ -96,7 +99,7 @@
</fo:table-row-->
</fo:table-body>
</fo:table>
- </fo:table-cell>
+ </fo:block></fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
@@ -170,6 +173,7 @@
</fo:table-cell>
</fo:table-row>
</fo:table-header>
+

<fo:table-body font-size="10pt">
<#assign currentShipmentId = "">
@@ -201,6 +205,9 @@
group of invoice items created for the same shipment
-->
<fo:table-row height="14px">
+ <fo:table-cell number-columns-spanned="6">
+ <fo:block><#-- blank line --></fo:block>
+ </fo:table-cell>
</fo:table-row>
<fo:table-row height="14px">
<fo:table-cell number-columns-spanned="6">
@@ -210,8 +217,11 @@
<#assign currentShipmentId = newShipmentId>
</#if>
<fo:table-row height="7px">
+ <fo:table-cell number-columns-spanned="6">
+ <fo:block><#-- blank line --></fo:block>
+ </fo:table-cell>
</fo:table-row>
- <fo:table-row height="14px">
+ <fo:table-row height="14px" space-start=".15in">
<fo:table-cell>
<fo:block> ${invoiceItem.invoiceItemSeqId} </fo:block>
</fo:table-cell>
@@ -232,16 +242,17 @@
</fo:table-cell>
</fo:table-row>
</#list>
-
+
<#-- blank line -->
<fo:table-row height="7px">
+ <fo:table-cell number-columns-spanned="4"><fo:block><#-- blank line --></fo:block></fo:table-cell>
</fo:table-row>
-
+
<#-- the grand total -->
- <fo:table-row height="14px">
+ <fo:table-row>
<fo:table-cell number-columns-spanned="4">
</fo:table-cell>
- <fo:table-cell background-color="#EEEEEE">
+ <fo:table-cell>
<fo:block font-weight="bold">${uiLabelMap.AccountingTotalCapital}</fo:block>
</fo:table-cell>
<fo:table-cell text-align="right">
@@ -250,7 +261,7 @@
</fo:table-row>
</fo:table-body>
</fo:table>
-
+

<#if invoice.invoiceMessage?has_content><fo:block>${invoice.invoiceMessage}</fo:block></#if>
<fo:block></fo:block>

Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl?view=diff&rev=480724&r1=480723&r2=480724
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRun.fo.ftl Wed Nov 29 13:44:14 2006
@@ -20,8 +20,8 @@
<fo:simple-page-master master-name="main"
margin-top="1.0cm" margin-bottom="1in" margin-left="0.5cm" margin-right="0.5cm">
<fo:region-body margin-top="1.0cm" margin-bottom="1.0cm"/> <#-- main body -->
- <fo:region-after extent="1.0cm"/> <#-- a footer -->
<fo:region-before extent="1.0cm"/> <#-- a header -->
+ <fo:region-after extent="1.0cm"/> <#-- a footer -->
</fo:simple-page-master>
</fo:layout-master-set>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?view=diff&rev=480724&r1=480723&r2=480724
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Wed Nov 29 13:44:14 2006
@@ -17,7 +17,7 @@
<#escape x as x?xml>

<fo:block text-align="left">
- <#if logoImageUrl?has_content><fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/></#if>
+ <#if logoImageUrl?has_content><fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
</fo:block>

<fo:block font-size="8pt">
@@ -32,7 +32,8 @@
<fo:block>${uiLabelMap.CommonNoPostalAddress}</fo:block>
<fo:block>${uiLabelMap.CommonFor}: ${companyName}</fo:block>
</#if>
-
+
+ <#if sendingPartyTaxId?exists || phone?exists || email?exists || website?exists || eftAccount?exists>
<fo:list-block provisional-distance-between-starts="1in">
<#if sendingPartyTaxId?exists>
<fo:list-item>
@@ -101,5 +102,6 @@
</fo:list-item>
</#if>
</fo:list-block>
+ </#if>
</fo:block>
</#escape>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?view=diff&rev=480724&r1=480723&r2=480724
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Wed Nov 29 13:44:14 2006
@@ -259,25 +259,25 @@
</fo:table-body>
</fo:table>
</fo:block>
- <fo:block space-after.optimum="10pt" font-size="10pt">
- <fo:table>
- <fo:table-column column-width="450pt"/>
- <fo:table-body>
- <#if picklistBinInfo.primaryOrderItemShipGroup.giftMessage?has_content>
- <fo:table-row font-weight="bold">
- <fo:table-cell>
- <fo:block>${uiLabelMap.OrderGiftMessage}</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row >
- <fo:table-cell>
- <fo:block>${picklistBinInfo.primaryOrderItemShipGroup.giftMessage}</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </#if>
- </fo:table-body>
- </fo:table>
- </fo:block>
+ <#if picklistBinInfo.primaryOrderItemShipGroup.giftMessage?has_content>
+ <fo:block space-after.optimum="10pt" font-size="10pt">
+ <fo:table>
+ <fo:table-column column-width="450pt"/>
+ <fo:table-body>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell>
+ <fo:block>${uiLabelMap.OrderGiftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
+ <fo:table-cell>
+ <fo:block>${picklistBinInfo.primaryOrderItemShipGroup.giftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </#if>
</fo:flow>
</fo:page-sequence>
</#list>

Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl?view=diff&rev=480724&r1=480723&r2=480724
==============================================================================
--- incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl (original)
+++ incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl Wed Nov 29 13:44:14 2006
@@ -24,16 +24,16 @@
margin-top="0.3in" margin-bottom="0.3in"
margin-left="0.4in" margin-right="0.3in">
<fo:region-body margin-top="1in" margin-bottom="0.5in"/>
- <fo:region-after extent="0.5in" />
<fo:region-before extent="1in"/>
+ <fo:region-after extent="0.5in" />
</fo:simple-page-master>
<fo:simple-page-master master-name="simple-landscape"
page-width="11in" page-height="8.5in"
margin-top="0.3in" margin-bottom="0.3in"
margin-left="0.4in" margin-right="0.3in">
<fo:region-body margin-top="1in" margin-bottom="0.5in"/>
- <fo:region-after extent="0.5in" />
<fo:region-before extent="1in"/>
+ <fo:region-after extent="0.5in" />
</fo:simple-page-master>
</fo:layout-master-set>

@@ -52,7 +52,9 @@
<fo:table-row>
<fo:table-cell>
<#if logoImageUrl?exists>
- <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/>
+ <fo:block>
+ <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"/>
+ </fo:block>
</#if>
</fo:table-cell>
<fo:table-cell>