deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

OSB enhancements to date

Browse Source
This commit is contained in:
Deon George
2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/invoice/PDF/pdf_invoice_itemised-fpdf.inc.php
View File

@@ -80,7 +80,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->SetFont('arial','',10);
$this->SetXY($x,$y); $this->Cell(0,0,$C_translate->translate('pdf_invoice_number','setup_invoice'));
$this->SetFont('arial','B',11);
$this->SetXY($x,$y); $this->Cell(0,0,sprintf('%06s',$inv->getInvoiceNum()),0,0,'R');
$this->SetXY($x,$y); $this->Cell(0,0,sprintf('%06s',$inv->getPrintInvoiceNum()),0,0,'R');
# Company Address
$y = 216;
@@ -93,7 +93,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$y = 215;
$this->SetFont('arial','',9);
$this->SetXY($x,$y); $this->Cell(0,0,'Previous Due');
$this->SetXY($x,$y); $this->Cell(0,0,$this->_currency($inv->getPreviousBalance()),0,0,'R');
$this->SetXY($x,$y); $this->Cell(0,0,$this->_currency($inv->sPreviousBalance()),0,0,'R');
$y = 219;
$this->SetFont('arial','',9);
@@ -104,7 +104,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$y = 224;
$this->SetFont('arial','B',10);
$this->SetXY($x,$y); $this->Cell(0,0,'Total Due');
$this->SetXY($x,$y); $this->Cell(0,0,$this->_currency($inv->getPreviousBalance()+$inv->print['invoice']['total_amt']-$inv->print['invoice']['billed_amt']),0,0,'R');
$this->SetXY($x,$y); $this->Cell(0,0,$this->_currency($inv->sPreviousBalance()+$inv->print['invoice']['total_amt']-$inv->print['invoice']['billed_amt']),0,0,'R');
# Draw the Customers Address
$x = 25; $y = 248;
@@ -134,7 +134,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->SetFont('arial','B',11);
$this->SetXY($x,$y); $this->Cell(0,0,'TAX INVOICE');
$this->SetFont('arial','B',11);
$this->SetXY($x,$y); $this->Cell(0,0,sprintf('%06s',$inv->getInvoiceNum()),0,0,'R');
$this->SetXY($x,$y); $this->Cell(0,0,sprintf('%06s',$inv->getPrintInvoiceNum()),0,0,'R');
# Invoice number at top of page.
$y += 7;
@@ -151,7 +151,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->SetFont('arial','',10);
$this->SetXY($x,$y); $this->Cell(0,0,'Previous Due');
$this->SetFont('arial','B',11);
$this->SetXY($x+55,$y); $this->Cell(0,0,$this->_currency($inv->getPreviousBalance()),0,0,'R');
$this->SetXY($x+55,$y); $this->Cell(0,0,$this->_currency($inv->sPreviousBalance()),0,0,'R');
$y += 5;
$this->SetFont('arial','',10);
@@ -171,7 +171,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->SetFont('arial','',10);
$this->SetXY($x,$y); $this->Cell(0,0,'Total Payable');
$this->SetFont('arial','B',11);
$this->SetXY($x+55,$y); $this->Cell(0,0,$this->_currency($inv->getPreviousBalance()+$inv->print['invoice']['total_amt']-$inv->print['invoice']['billed_amt']),0,0,'R');
$this->SetXY($x+55,$y); $this->Cell(0,0,$this->_currency($inv->sPreviousBalance()+$inv->print['invoice']['total_amt']-$inv->print['invoice']['billed_amt']),0,0,'R');
}
#@todo Limit the size of the news to 6 lines
@@ -216,7 +216,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->SetFont('arial','B',8);
$this->SetXY($x+30,$y); $this->Cell(0,0,'633-000'); $y += 3;
$this->SetXY($x+30,$y); $this->Cell(0,0,'120 440 821'); $y += 3;
$this->SetXY($x+30,$y); $this->Cell(0,0,$inv->getInvoiceID()); $y += 3;
$this->SetXY($x+30,$y); $this->Cell(0,0,$inv->getPrintInvoiceID()); $y += 3;
# Direct Debit
$y += 3;
@@ -307,7 +307,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
private function drawLineItems_0($db,$line,$invnum) {
global $C_translate;
if ($line['price_type'] == 0 && $line['item_type']==5)
if ($line['price_type'] == 0 && $line['item_type'] == 5)
return;
$x = 10; $y = 5;
@@ -519,7 +519,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
if (! $this->show_itemized)
return;
$items = $inv->summarizeLineItems($inv->print['invoiceitems']);
$items = $inv->sInvoiceItemsSummary();
# Calculate the box size
$box = count($items) < $this->itemsSummaryMax ? count($items) : $this->itemsSummaryMax;
@@ -547,7 +547,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->Cell(0,0,$q);
$this->SetX($x+8);
$this->Cell(0,0,sprintf('%s (%s)',$line['summaryname'],$this->_currency($line['price_base'])));
$this->Cell(0,0,sprintf('%s (%s)',$line['product_name'],$this->_currency($line['price_base'])));
$this->SetX($x+135);
$this->Cell(0,0,$this->_currency($line['price_base']*$line['quantity']),0,0,'R');
$y += 5;