X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0abce1b8f3abc5d6b0980ded98c4706d8f94998c..54680b6c5aa25c6807d63fc0c4c04c1b71ab8666:/SL/DB/PurchaseInvoice.pm diff --git a/SL/DB/PurchaseInvoice.pm b/SL/DB/PurchaseInvoice.pm index 631816591..3eb320ee3 100644 --- a/SL/DB/PurchaseInvoice.pm +++ b/SL/DB/PurchaseInvoice.pm @@ -11,6 +11,7 @@ use SL::DB::Helper::AttrHTML; use SL::DB::Helper::AttrSorted; use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::Payment qw(:ALL); +use SL::DB::Helper::SalesPurchaseInvoice; use SL::Locale::String qw(t8); use Rose::DB::Object::Helpers qw(has_loaded_related forget_related); @@ -99,8 +100,8 @@ sub link { my ($self) = @_; my $html; - $html = SL::Presenter->get->purchase_invoice($self, display => 'inline') if $self->invoice; - $html = SL::Presenter->get->ap_transaction($self, display => 'inline') if !$self->invoice; + $html = $self->presenter->purchase_invoice(display => 'inline') if $self->invoice; + $html = $self->presenter->ap_transaction(display => 'inline') if !$self->invoice; return $html; } @@ -182,6 +183,7 @@ sub add_ap_amount_row { chart_id => $params{chart}->id, chart_link => $params{chart}->link, transdate => $self->transdate, + gldate => $self->gldate, taxkey => $tax->taxkey, tax_id => $tax->id, project_id => $params{project_id}, @@ -196,6 +198,7 @@ sub add_ap_amount_row { chart_id => $tax->chart_id, chart_link => $tax->chart->link, transdate => $self->transdate, + gldate => $self->gldate, taxkey => $tax->taxkey, tax_id => $tax->id, project_id => $params{project_id}, @@ -212,6 +215,12 @@ sub mark_as_paid { $self->update_attributes(paid => $self->amount); } +sub effective_tax_point { + my ($self) = @_; + + return $self->tax_point || $self->deliverydate || $self->transdate; +} + 1;