Sammelcommit Bankerweiterung und Skonto

[kivitendo-erp.git] / SL / DB / Invoice.pm

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 3ecc957..3ed6cd3 100644 (file)
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -9,9 +9,9 @@ use Carp;
 use List::Util qw(first);
 
 use Rose::DB::Object::Helpers ();
-
 use SL::DB::MetaSetup::Invoice;
 use SL::DB::Manager::Invoice;
+use SL::DB::Helper::Payment qw(:ALL);
 use SL::DB::Helper::AttrHTML;
 use SL::DB::Helper::FlattenToForm;
 use SL::DB::Helper::LinkedRecords;
@@ -20,7 +20,6 @@ use SL::DB::Helper::PriceUpdater;
 use SL::DB::Helper::TransNumberGenerator;
 use SL::Locale::String qw(t8);
 use SL::DB::CustomVariable;
-use SL::DB::AccTransaction;
 
 __PACKAGE__->meta->add_relationship(
   invoiceitems => {
@@ -368,48 +367,6 @@ sub customervendor {
   goto &customer;
 }
 
-sub pay_invoice {
-  my ($self, %params) = @_;
-
-  #Mark invoice as paid
-  $self->paid($self->paid+$params{amount});
-  $self->save;
-
-  Common::check_params(\%params, qw(chart_id trans_id amount transdate));
-
-  #account of bank account or cash
-  my $account_bank = SL::DB::Manager::Chart->find_by(id => $params{chart_id});
-
-  #Search the contra account
-  my $acc_trans = SL::DB::Manager::AccTransaction->find_by(trans_id   => $params{trans_id},
-                                                           or => [ chart_link => { like => "%:AR" },
-                                                                   chart_link => { like => "AR:%" },
-                                                                   chart_link => "AR" ]);
-  my $contra_account = SL::DB::Manager::Chart->find_by(id => $acc_trans->chart_id);
-
-  #Two new transfers in acc_trans (for bank account and for contra account)
-  my $new_acc_trans = SL::DB::AccTransaction->new(trans_id   => $params{trans_id},
-                                                  chart_id   => $account_bank->id,
-                                                  chart_link => $account_bank->link,
-                                                  amount     => (-1 * $params{amount}),
-                                                  transdate  => $params{transdate},
-                                                  source     => $params{source},
-                                                  memo       => '',
-                                                  taxkey     => 0,
-                                                  tax_id     => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
-  $new_acc_trans->save;
-  $new_acc_trans = SL::DB::AccTransaction->new(trans_id   => $params{trans_id},
-                                               chart_id   => $contra_account->id,
-                                               chart_link => $contra_account->link,
-                                               amount     => $params{amount},
-                                               transdate  => $params{transdate},
-                                               source     => $params{source},
-                                               memo       => '',
-                                               taxkey     => 0,
-                                               tax_id     => SL::DB::Manager::Tax->find_by(taxkey => 0)->id);
-  $new_acc_trans->save;
-}
-
 sub link {
   my ($self) = @_;
 
@@ -420,7 +377,6 @@ sub link {
   return $html;
 }
 
->>>>>>> Test: Bank-Commit zusammengefasst
 1;
 
 __END__