X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FPurchaseInvoice.pm;h=57eecabda52bc51044333555d89931a55f6cc339;hb=c7241bf7c547d63999898dee7b5dd486e4d122d3;hp=78034c7f85365de620967b5d2909bae41922599a;hpb=6a12a968761127af91e9da8db7579be2836bcaaa;p=kivitendo-erp.git

diff --git a/SL/DB/PurchaseInvoice.pm b/SL/DB/PurchaseInvoice.pm
index 78034c7f8..57eecabda 100644
--- a/SL/DB/PurchaseInvoice.pm
+++ b/SL/DB/PurchaseInvoice.pm
@@ -7,8 +7,11 @@ use Carp;
 use SL::DB::MetaSetup::PurchaseInvoice;
 use SL::DB::Manager::PurchaseInvoice;
 use SL::DB::Helper::AttrHTML;
+use SL::DB::Helper::AttrSorted;
 use SL::DB::Helper::LinkedRecords;
+use SL::DB::Helper::Payment qw(:ALL);
 use SL::Locale::String qw(t8);
+use Rose::DB::Object::Helpers qw(has_loaded_related forget_related);
 
 # The calculator hasn't been adjusted for purchase invoices yet.
 # use SL::DB::Helper::PriceTaxCalculator;
@@ -26,6 +29,12 @@ __PACKAGE__->meta->add_relationship(
     column_map      => { id => 'ap_id' },
     manager_args    => { with_objects => [ 'sepa_export' ] }
   },
+  sepa_exports      => {
+    type            => 'many to many',
+    map_class       => 'SL::DB::SepaExportItem',
+    map_from        => 'ap',
+    map_to          => 'sepa_export',
+  },
   custom_shipto     => {
     type            => 'one to one',
     class           => 'SL::DB::Shipto',
@@ -44,15 +53,11 @@ __PACKAGE__->meta->add_relationship(
 __PACKAGE__->meta->initialize;
 
 __PACKAGE__->attr_html('notes');
+__PACKAGE__->attr_sorted('items');
 
 sub items { goto &invoiceitems; }
 sub add_items { goto &add_invoiceitems; }
-
-sub items_sorted {
-  my ($self) = @_;
-
-  return [ sort {$a->position <=> $b->position } @{ $self->items } ];
-}
+sub record_number { goto &invnumber; };
 
 sub is_sales {
   # For compatibility with Order, DeliveryOrder
@@ -82,48 +87,6 @@ sub abbreviation {
 
 };
 
-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 => "%:AP" },
-                                                                   chart_link => { like => "AP:%" },
-                                                                   chart_link => "AP" ]);
-  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     => $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     => (-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;
-}
-
 sub link {
   my ($self) = @_;
 
@@ -134,4 +97,22 @@ sub link {
   return $html;
 }
 
+sub invoice_type {
+  my ($self) = @_;
+
+  return 'ap_transaction' if !$self->invoice;
+  return 'purchase_invoice';
+}
+
+sub displayable_type {
+  my ($self) = @_;
+
+  return t8('AP Transaction')    if $self->invoice_type eq 'ap_transaction';
+  return t8('Purchase Invoice');
+}
+
+sub displayable_name {
+  join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number);
+};
+
 1;