[Vtigercrm-commits] [vtiger-commits] r10218 - /vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Feb 21 04:27:59 EST 2007
Author: saraj
Date: Wed Feb 21 02:27:53 2007
New Revision: 10218
Log:
PDF alignment fixed
Modified:
vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Wed Feb 21 02:27:53 2007
@@ -18,7 +18,9 @@
// total of columns needs to be 190 in order to fit the table
// correctly
$prodTable=array("10","60");
-
+//added for value field allignment
+//contains the x angle starting point of the value field
+$space=array("4"=>"191","5"=>"189","6"=>"187","7"=>"186","8"=>"184","9"=>"182","10"=>"180","11"=>"179","12"=>"177","13"=>"175");
//if taxtype is individual
if($focus->column_fields["hdnTaxType"] == "individual")
{
@@ -92,22 +94,33 @@
{
$lineData=array("105",$bottom+37,"94");
$pdf->drawLine($lineData);
- $data= $app_strings['LBL_NET_TOTAL'].": ".$price_subtotal."";
+ $data= $app_strings['LBL_NET_TOTAL'].":";// ".$price_subtotal."";
$pdf->SetXY( 105 , ($nettotal_y+(0*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+
+//Added for value field alignment
+ $pdf->SetXY( $space[strlen($price_subtotal)] , ($nettotal_y+(0*$next_y)) );
+ $pdf->SetFont( "Helvetica", "", 10);
+ $pdf->MultiCell(110, 4, $price_subtotal);
+
$lineData=array("105",$bottom+43,"94");
$pdf->drawLine($lineData);
//For alignment
if($final_price_discount_percent != '')
- $data= $app_strings['LBL_DISCOUNT'].": $final_price_discount_percent ".$price_discount."";
+ $data= $app_strings['LBL_DISCOUNT'].": $final_price_discount_percent";// ".$price_discount."";
else
- $data= $app_strings['LBL_DISCOUNT'].": ".$price_discount."";
+ $data= $app_strings['LBL_DISCOUNT'].":";// ".$price_discount."";
$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+
+//Added for value field alignment
+ $pdf->SetXY( $space[strlen($price_discount)] , ($nettotal_y+(1*$next_y)) );
+ $pdf->SetFont( "Helvetica", "", 10);
+ $pdf->MultiCell(110, 4, $price_discount);
$lineData=array("105",$bottom+49,"94");
$pdf->drawLine($lineData);
@@ -118,21 +131,32 @@
$lineData=array("105",$bottom+55,"94");
$pdf->drawLine($lineData);
- $data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].": ".$price_shipping;
+ $data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":";// ".$price_shipping;
$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+//Added for value field alignment
+ $pdf->SetXY( $space[strlen($price_shipping)] , ($nettotal_y+(3*$next_y)) );
+ $pdf->SetFont( "Helvetica", "", 10);
+ $pdf->MultiCell(110, 4, $price_shipping);
}
else
{
//if taxtype is individual
$lineData=array("105",$bottom+43,"94");
$pdf->drawLine($lineData);
- $data= $app_strings['LBL_NET_TOTAL'].": ".$price_subtotal."";
+ $data= $app_strings['LBL_NET_TOTAL'].":";// ".$price_subtotal."";
$pdf->SetXY( 105 , ($nettotal_y+(1*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+
+// added for value field allignment
+
+ $pdf->SetXY( $space[strlen($price_subtotal)] , ($nettotal_y+(1*$next_y)) );
+ $pdf->SetFont( "Helvetica", "", 10);
+ $pdf->MultiCell(110, 4,$price_subtotal);
+
$lineData=array("105",$bottom+49,"94");
$pdf->drawLine($lineData);
@@ -141,42 +165,70 @@
if($final_price_discount_percent != '')
$data= $app_strings['LBL_DISCOUNT'].": $final_price_discount_percent ".$price_discount."";
else
- $data= $app_strings['LBL_DISCOUNT'].": ".$price_discount."";
+ $data= $app_strings['LBL_DISCOUNT'].":";// ".$price_discount."";
$pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+//Added for value field alignment
+ $pdf->SetXY( $space[strlen($price_discount)] , ($nettotal_y+(2*$next_y)) );
+ $pdf->SetFont( "Helvetica", "", 10);
+ $pdf->MultiCell(110, 4, $price_discount);
+
$lineData=array("105",$bottom+55,"94");
$pdf->drawLine($lineData);
- $data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].": ".$price_shipping;
+ $data = $app_strings['LBL_SHIPPING_AND_HANDLING_CHARGES'].":";// ".$price_shipping;
$pdf->SetXY( 105 , ($nettotal_y+(3*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+
+//Added for value field alignment
+
+ $pdf->SetXY( $space[strlen($price_shipping)] , ($nettotal_y+(3*$next_y)) );
+ $pdf->SetFont( "Helvetica", "", 10);
+ $pdf->MultiCell(110, 4, $price_shipping);
+
}
//Set the x and y positions to place the S&H Tax, Adjustment and Grand Total
$lineData=array("105",$bottom+61,"94");
$pdf->drawLine($lineData);
-$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].": ($sh_tax_percent %) ".$price_shipping_tax;
+$data = $app_strings['LBL_TAX_FOR_SHIPPING_AND_HANDLING'].": ($sh_tax_percent %)";// ".$price_shipping_tax;
$pdf->SetXY( 105 , ($nettotal_y+(4*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+
+//Added for value field alignment
+$pdf->SetXY( $space[strlen($price_shipping_tax)] , ($nettotal_y+(4*$next_y)) );
+$pdf->SetFont( "Helvetica", "", 10);
+$pdf->MultiCell(110, 4, $price_shipping_tax);
$lineData=array("105",$bottom+67,"94");
$pdf->drawLine($lineData);
-$data = $app_strings['LBL_ADJUSTMENT'].": ".$price_adjustment;
+$data = $app_strings['LBL_ADJUSTMENT'].":";// ".$price_adjustment;
$pdf->SetXY( 105 , ($nettotal_y+(5*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+
+//Added for value field alignment
+$pdf->SetXY( $space[strlen($price_adjustment)] , ($nettotal_y+(5*$next_y)) );
+$pdf->SetFont( "Helvetica", "", 10);
+$pdf->MultiCell(110, 4, $price_adjustment);
+
$lineData=array("105",$bottom+73,"94");
$pdf->drawLine($lineData);
-$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol) ".$price_total;
+$data = $app_strings['LBL_GRAND_TOTAL'].":(in $currency_symbol)";// ".$price_total;
$pdf->SetXY( 105 , ($nettotal_y+(6*$next_y)) );
$pdf->SetFont( "Helvetica", "", 10);
$pdf->MultiCell(110, 4, $data);
+//Added for value field alignment
+$pdf->SetXY( $space[strlen($price_total)] , ($nettotal_y+(6*$next_y)) );
+$pdf->SetFont( "Helvetica", "", 10);
+$pdf->MultiCell(110, 4, $price_total);
+
/* ************** End Totals *********************** */
More information about the vtigercrm-commits
mailing list