projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7e8922
)
kein use SL::DB::Object aus SL::DB::Object
author
Sven Schöling
<s.schoeling@linet-services.de>
Fri, 21 Jun 2013 08:32:23 +0000
(10:32 +0200)
committer
Sven Schöling
<s.schoeling@linet-services.de>
Tue, 25 Jun 2013 12:22:33 +0000
(14:22 +0200)
SL/DB/Invoice.pm
patch
|
blob
|
history
diff --git
a/SL/DB/Invoice.pm
b/SL/DB/Invoice.pm
index
302179c
..
526c791
100644
(file)
--- a/
SL/DB/Invoice.pm
+++ b/
SL/DB/Invoice.pm
@@
-15,9
+15,6
@@
use SL::DB::Helper::LinkedRecords;
use SL::DB::Helper::PriceTaxCalculator;
use SL::DB::Helper::PriceUpdater;
use SL::DB::Helper::TransNumberGenerator;
use SL::DB::Helper::PriceTaxCalculator;
use SL::DB::Helper::PriceUpdater;
use SL::DB::Helper::TransNumberGenerator;
-use SL::DB::AccTransaction;
-use SL::DB::Chart;
-use SL::DB::Employee;
__PACKAGE__->meta->add_relationship(
invoiceitems => {
__PACKAGE__->meta->add_relationship(
invoiceitems => {
@@
-102,6
+99,8
@@
sub new_from {
croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) =~ m/^ SL::DB:: (?: Order | DeliveryOrder ) $/x;
croak("Cannot create invoices for purchase records") unless $source->customer_id;
croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) =~ m/^ SL::DB:: (?: Order | DeliveryOrder ) $/x;
croak("Cannot create invoices for purchase records") unless $source->customer_id;
+ require SL::DB::Employee;
+
my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0;
my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber quonumber
my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0;
my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber quonumber
@@
-144,6
+143,7
@@
sub new_from {
sub post {
my ($self, %params) = @_;
sub post {
my ($self, %params) = @_;
+ require SL::DB::Chart;
if (!$params{ar_id}) {
my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ],
sort_by => 'id ASC',
if (!$params{ar_id}) {
my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ],
sort_by => 'id ASC',
@@
-184,6
+184,8
@@
sub _post_add_acctrans {
my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id;
my $chart_link;
my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id;
my $chart_link;
+ require SL::DB::AccTransaction;
+ require SL::DB::Chart;
while (my ($chart_id, $spec) = each %{ $entries }) {
$spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec;
$chart_link = SL::DB::Manager::Chart->find_by(id => $chart_id)->{'link'};
while (my ($chart_id, $spec) = each %{ $entries }) {
$spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec;
$chart_link = SL::DB::Manager::Chart->find_by(id => $chart_id)->{'link'};