Fix Overlapping logo with company information in PDF Invoice and Quote
This commit is contained in:
@@ -284,14 +284,11 @@ if (isset($_GET['export_quote_pdf'])) {
|
|||||||
$pdf->SetFont('helvetica', '', 10);
|
$pdf->SetFont('helvetica', '', 10);
|
||||||
|
|
||||||
// Logo + Right Columns
|
// Logo + Right Columns
|
||||||
$html = '<table width="100%" cellspacing="0" cellpadding="5">
|
$html = '<table width="100%" cellspacing="0" cellpadding="3">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="40%">';
|
<td width="40%">';
|
||||||
if (!empty($company_logo)) {
|
if (!empty($company_logo) && file_exists("../uploads/settings/$company_logo")) {
|
||||||
$logo_path = "../uploads/settings/$company_logo";
|
$html .= '<img src="/uploads/settings/' . $company_logo . '" width="120">';
|
||||||
if (file_exists($logo_path)) {
|
|
||||||
$pdf->Image($logo_path, $pdf->GetX(), $pdf->GetY(), 40);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
<td width="60%" align="right">
|
<td width="60%" align="right">
|
||||||
@@ -305,7 +302,7 @@ if (isset($_GET['export_quote_pdf'])) {
|
|||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table><br><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Billing titles
|
// Billing titles
|
||||||
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
||||||
@@ -320,7 +317,7 @@ if (isset($_GET['export_quote_pdf'])) {
|
|||||||
</table><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Date table
|
// Date table
|
||||||
$html .= '<table border="0" cellpadding="3" cellspacing="0" width="100%">
|
$html .= '<table border="0" cellpadding="2" cellspacing="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="60%"></td>
|
<td width="60%"></td>
|
||||||
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
||||||
@@ -510,14 +507,11 @@ if (isset($_GET['export_invoice_pdf'])) {
|
|||||||
$pdf->SetFont('helvetica', '', 10);
|
$pdf->SetFont('helvetica', '', 10);
|
||||||
|
|
||||||
// Logo + Right Columns
|
// Logo + Right Columns
|
||||||
$html = '<table width="100%" cellspacing="0" cellpadding="5">
|
$html = '<table width="100%" cellspacing="0" cellpadding="3">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="40%">';
|
<td width="40%">';
|
||||||
if (!empty($company_logo)) {
|
if (!empty($company_logo) && file_exists("../uploads/settings/$company_logo")) {
|
||||||
$logo_path = "../uploads/settings/$company_logo";
|
$html .= '<img src="/uploads/settings/' . $company_logo . '" width="120">';
|
||||||
if (file_exists($logo_path)) {
|
|
||||||
$pdf->Image($logo_path, $pdf->GetX(), $pdf->GetY(), 40);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
<td width="60%" align="right">
|
<td width="60%" align="right">
|
||||||
@@ -528,7 +522,7 @@ if (isset($_GET['export_invoice_pdf'])) {
|
|||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table><br><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Billing titles
|
// Billing titles
|
||||||
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
||||||
@@ -543,7 +537,7 @@ if (isset($_GET['export_invoice_pdf'])) {
|
|||||||
</table><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Date table
|
// Date table
|
||||||
$html .= '<table border="0" cellpadding="3" cellspacing="0" width="100%">
|
$html .= '<table border="0" cellpadding="2" cellspacing="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="60%"></td>
|
<td width="60%"></td>
|
||||||
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
||||||
|
|||||||
@@ -1914,14 +1914,11 @@ if (isset($_GET['export_invoice_pdf'])) {
|
|||||||
$pdf->SetFont('helvetica', '', 10);
|
$pdf->SetFont('helvetica', '', 10);
|
||||||
|
|
||||||
// Logo + Right Columns
|
// Logo + Right Columns
|
||||||
$html = '<table width="100%" cellspacing="0" cellpadding="5">
|
$html = '<table width="100%" cellspacing="0" cellpadding="3">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="40%">';
|
<td width="40%">';
|
||||||
if (!empty($company_logo)) {
|
if (!empty($company_logo) && file_exists("uploads/settings/$company_logo")) {
|
||||||
$logo_path = "uploads/settings/$company_logo";
|
$html .= '<img src="uploads/settings/' . $company_logo . '" width="120">';
|
||||||
if (file_exists($logo_path)) {
|
|
||||||
$pdf->Image($logo_path, $pdf->GetX(), $pdf->GetY(), 40);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
<td width="60%" align="right">
|
<td width="60%" align="right">
|
||||||
@@ -1932,7 +1929,7 @@ if (isset($_GET['export_invoice_pdf'])) {
|
|||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table><br><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Billing titles
|
// Billing titles
|
||||||
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
||||||
@@ -1947,7 +1944,7 @@ if (isset($_GET['export_invoice_pdf'])) {
|
|||||||
</table><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Date table
|
// Date table
|
||||||
$html .= '<table border="0" cellpadding="3" cellspacing="0" width="100%">
|
$html .= '<table border="0" cellpadding="2" cellspacing="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="60%"></td>
|
<td width="60%"></td>
|
||||||
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
||||||
|
|||||||
@@ -694,14 +694,11 @@ if (isset($_GET['export_quote_pdf'])) {
|
|||||||
$pdf->SetFont('helvetica', '', 10);
|
$pdf->SetFont('helvetica', '', 10);
|
||||||
|
|
||||||
// Logo + Right Columns
|
// Logo + Right Columns
|
||||||
$html = '<table width="100%" cellspacing="0" cellpadding="5">
|
$html = '<table width="100%" cellspacing="0" cellpadding="3">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="40%">';
|
<td width="40%">';
|
||||||
if (!empty($company_logo)) {
|
if (!empty($company_logo) && file_exists("uploads/settings/$company_logo")) {
|
||||||
$logo_path = "uploads/settings/$company_logo";
|
$html .= '<img src="uploads/settings/' . $company_logo . '" width="120">';
|
||||||
if (file_exists($logo_path)) {
|
|
||||||
$pdf->Image($logo_path, $pdf->GetX(), $pdf->GetY(), 40);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
<td width="60%" align="right">
|
<td width="60%" align="right">
|
||||||
@@ -715,7 +712,7 @@ if (isset($_GET['export_quote_pdf'])) {
|
|||||||
}
|
}
|
||||||
$html .= '</td>
|
$html .= '</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table><br><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Billing titles
|
// Billing titles
|
||||||
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
$html .= '<table width="100%" cellspacing="0" cellpadding="2">
|
||||||
@@ -730,7 +727,7 @@ if (isset($_GET['export_quote_pdf'])) {
|
|||||||
</table><br>';
|
</table><br>';
|
||||||
|
|
||||||
// Date table
|
// Date table
|
||||||
$html .= '<table border="0" cellpadding="3" cellspacing="0" width="100%">
|
$html .= '<table border="0" cellpadding="2" cellspacing="0" width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="60%"></td>
|
<td width="60%"></td>
|
||||||
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
<td width="20%" style="font-size:10pt;"><strong>Date:</strong></td>
|
||||||
|
|||||||
Reference in New Issue
Block a user