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

More work on invoice

Browse Source
This commit is contained in:
Deon George 2013-02-09 23:40:18 +11:00
parent 96a13548f1
commit 97d894d472
4 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/config/config.php
View File

@ -34,10 +34,6 @@ return array(
'www.graytech.net.au'=>1, 'www.graytech.net.au'=>1,
), ),
'site_debug' => FALSE, 'site_debug' => FALSE,
'site_mode' => array(
'172.31.10.200'=>Kohana::DEVELOPMENT,
'www.graytech.net.au'=>Kohana::PRODUCTION,
),
'bsb' => '633-000', // @todo This should come from the DB 'bsb' => '633-000', // @todo This should come from the DB
'accnum' => '120 440 821', // @todo This should come from the DB 'accnum' => '120 440 821', // @todo This should come from the DB
'site_name' => 'Graytech Hosting Pty Ltd', // @todo This should come from the DB 'site_name' => 'Graytech Hosting Pty Ltd', // @todo This should come from the DB

10
modules/invoice/classes/Invoice/TCPDF/Default.php
View File

@ -135,7 +135,7 @@ class Invoice_TCPDF_Default extends Invoice_TCPDF {
// Draw a box. // Draw a box.
$this->SetFillColor(245); $this->SetFillColor(245);
$this->SetXY($x-1,$y-1); $this->Cell(0,35+($this->io->billed_amt ? 5 : 0)+($this->io->credit_amt ? 5 : 0),'',1,0,'',1); $this->SetXY($x-1,$y-1); $this->Cell(0,35+5+($this->io->credit_amt ? 5 : 0),'',1,0,'',1);
// Draw a box around the invoice due date and amount due. // Draw a box around the invoice due date and amount due.
$this->SetFont('helvetica','B',11); $this->SetFont('helvetica','B',11);
@ -166,13 +166,11 @@ class Invoice_TCPDF_Default extends Invoice_TCPDF {
$this->SetFont('helvetica','B',11); $this->SetFont('helvetica','B',11);
$this->SetXY($x+55,$y); $this->Cell(0,0,$this->io->total(TRUE),0,0,'R'); $this->SetXY($x+55,$y); $this->Cell(0,0,$this->io->total(TRUE),0,0,'R');
if ($this->io->billed_amt) {
$y += 5; $y += 5;
$this->SetFont('helvetica','',10); $this->SetFont('helvetica','',10);
$this->SetXY($x,$y); $this->Cell(0,0,'Payments Received'); $this->SetXY($x,$y); $this->Cell(0,0,'Payments Received');
$this->SetFont('helvetica','B',11); $this->SetFont('helvetica','B',11);
$this->SetXY($x+55,$y); $this->Cell(0,0,$this->io->display('billed_amt'),0,0,'R'); $this->SetXY($x+55,$y); $this->Cell(0,0,$this->io->payments_total('TRUE'),0,0,'R');
}
if ($this->io->credit_amt) { if ($this->io->credit_amt) {
$y += 5; $y += 5;
@ -321,7 +319,7 @@ class Invoice_TCPDF_Default extends Invoice_TCPDF {
$this->SetFillColor(245); $this->SetFillColor(245);
$this->SetXY($x-1,$y-1); $this->SetXY($x-1,$y-1);
$this->Cell(0,5*( $this->Cell(0,5*(
1+1+1+3+($this->io->discount_amt ? 1 : 0)+($this->io->billed_amt ? 1 : 0)+($this->io->credit_amt ? 1 : 0)+$box 1+1+1+3+($this->io->discount_amt ? 1 : 0)+1+($this->io->credit_amt ? 1 : 0)+$box
)+1+4,'',1,0,'',1); )+1+4,'',1,0,'',1);
$this->SetFont('helvetica','B',11); $this->SetFont('helvetica','B',11);
@ -409,7 +407,6 @@ class Invoice_TCPDF_Default extends Invoice_TCPDF {
$this->Cell(0,0,Currency::display($this->io->total()),0,0,'R'); $this->Cell(0,0,Currency::display($this->io->total()),0,0,'R');
// Show payments already received for this invoice // Show payments already received for this invoice
if ($this->io->billed_amt) {
$y += 5; $y += 5;
$this->SetY($y); $this->SetY($y);
@ -417,7 +414,6 @@ class Invoice_TCPDF_Default extends Invoice_TCPDF {
$this->Cell(0,0,'Payments Received'); $this->Cell(0,0,'Payments Received');
$this->SetX($x+135); $this->SetX($x+135);
$this->Cell(0,0,$this->io->payments_total(TRUE),0,0,'R'); $this->Cell(0,0,$this->io->payments_total(TRUE),0,0,'R');
}
if ($this->io->credit_amt) { if ($this->io->credit_amt) {
$y += 5; $y += 5;

9
modules/invoice/classes/Model/Invoice.php
View File

@ -33,18 +33,9 @@ class Model_Invoice extends ORM_OSB implements Cartable {
'due_date'=>array( 'due_date'=>array(
array('Config::date',array(':value')), array('Config::date',array(':value')),
), ),
'billed_amt'=>array(
array('Currency::display',array(':value')),
),
'credit_amt'=>array(
array('Currency::display',array(':value')),
),
'status'=>array( 'status'=>array(
array('StaticList_YesNo::display',array(':value')), array('StaticList_YesNo::display',array(':value')),
), ),
'total_amt'=>array(
array('Currency::display',array(':value')),
),
); );
// Items belonging to an invoice // Items belonging to an invoice

4
modules/invoice/classes/Model/Invoice/Item.php
View File

@ -11,8 +11,6 @@
* @license http://dev.osbill.net/license.html * @license http://dev.osbill.net/license.html
*/ */
class Model_Invoice_Item extends ORM_OSB { class Model_Invoice_Item extends ORM_OSB {
protected $_updated_column = FALSE; // @todo No update columns
// Relationships // Relationships
protected $_belongs_to = array( protected $_belongs_to = array(
'product'=>array(), 'product'=>array(),
@ -82,7 +80,7 @@ class Model_Invoice_Item extends ORM_OSB {
// @todo This shouldnt be required. // @todo This shouldnt be required.
if (! $result) if (! $result)
$result += round($this->subtotal() *.1,2); $result += round($this->price_base*$this->quantity*.1,2);
return Currency::round($result); return Currency::round($result);
} }