projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
epic-s6g
[kivitendo-erp.git]
/
SL
/
DB
/
PurchaseInvoice.pm
diff --git
a/SL/DB/PurchaseInvoice.pm
b/SL/DB/PurchaseInvoice.pm
index
93fc1fe
..
3eb320e
100644
(file)
--- 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::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);
use SL::Locale::String qw(t8);
use Rose::DB::Object::Helpers qw(has_loaded_related forget_related);
@@
-182,6
+183,7
@@
sub add_ap_amount_row {
chart_id => $params{chart}->id,
chart_link => $params{chart}->link,
transdate => $self->transdate,
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},
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,
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},
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);
}
$self->update_attributes(paid => $self->amount);
}
+sub effective_tax_point {
+ my ($self) = @_;
+
+ return $self->tax_point || $self->deliverydate || $self->transdate;
+}
+
1;
1;