DeliveryOrder um convert_invoice erweitert

[mfinanz.git] / SL / DB / Invoice.pm

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 3e6c65a4987a9fda316d99591be0eb027923811e..239280b2a27db8e38338cb0074a3760af38d0bc9 100644 (file)
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -1,6 +1,3 @@
-# This file has been auto-generated only because it didn't exist.
-# Feel free to modify it at will; it will not be overwritten automatically.
-

 package SL::DB::Invoice;
 
 use strict;
 package SL::DB::Invoice;
 
 use strict;


@@ -9,16 +6,18 @@ use Carp;
 use List::Util qw(first);
 
 use Rose::DB::Object::Helpers ();
 use List::Util qw(first);
 
 use Rose::DB::Object::Helpers ();

-

 use SL::DB::MetaSetup::Invoice;
 use SL::DB::Manager::Invoice;
 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::AttrHTML;

+use SL::DB::Helper::AttrSorted;

 use SL::DB::Helper::FlattenToForm;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::PriceTaxCalculator;
 use SL::DB::Helper::PriceUpdater;
 use SL::DB::Helper::TransNumberGenerator;
 use SL::Locale::String qw(t8);
 use SL::DB::Helper::FlattenToForm;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::PriceTaxCalculator;
 use SL::DB::Helper::PriceUpdater;
 use SL::DB::Helper::TransNumberGenerator;
 use SL::Locale::String qw(t8);

+use SL::DB::CustomVariable;

 
 __PACKAGE__->meta->add_relationship(
   invoiceitems => {
 
 __PACKAGE__->meta->add_relationship(
   invoiceitems => {


@@ -60,6 +59,7 @@ __PACKAGE__->meta->add_relationship(
 __PACKAGE__->meta->initialize;
 
 __PACKAGE__->attr_html('notes');
 __PACKAGE__->meta->initialize;
 
 __PACKAGE__->attr_html('notes');

+__PACKAGE__->attr_sorted('items');

 
 __PACKAGE__->before_save('_before_save_set_invnumber');
 
 
 __PACKAGE__->before_save('_before_save_set_invnumber');
 


@@ -77,12 +77,7 @@ sub _before_save_set_invnumber {
 
 sub items { goto &invoiceitems; }
 sub add_items { goto &add_invoiceitems; }
 
 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
 
 sub is_sales {
   # For compatibility with Order, DeliveryOrder


@@ -144,14 +139,10 @@ sub new_from {
 
   require SL::DB::Employee;
 
 
   require SL::DB::Employee;
 

-  my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms
-            : $source->customer_id                              ? $source ->customer->payment_terms
-            :                                                     undef;
-

   my (@columns, @item_columns, $item_parent_id_column, $item_parent_column);
 
   if (ref($source) eq 'SL::DB::Order') {
   my (@columns, @item_columns, $item_parent_id_column, $item_parent_column);
 
   if (ref($source) eq 'SL::DB::Order') {

-    @columns      = qw(quonumber payment_id delivery_customer_id delivery_vendor_id);
+    @columns      = qw(quonumber delivery_customer_id delivery_vendor_id);

     @item_columns = qw(subtotal);
 
     $item_parent_id_column = 'trans_id';
     @item_columns = qw(subtotal);
 
     $item_parent_id_column = 'trans_id';


@@ -164,12 +155,13 @@ sub new_from {
     $item_parent_column    = 'delivery_order';
   }
 
     $item_parent_column    = 'delivery_order';
   }
 

+  my $terms = $source->can('payment_id') ? $source->payment_terms : undef;
+

   my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber department_id
   my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber department_id

-                                                cp_id language_id taxzone_id shipto_id globalproject_id transaction_description currency_id delivery_term_id), @columns),
+                                                cp_id language_id taxzone_id shipto_id globalproject_id transaction_description currency_id delivery_term_id payment_id), @columns),

                transdate   => DateTime->today_local,
                gldate      => DateTime->today_local,
                transdate   => DateTime->today_local,
                gldate      => DateTime->today_local,

-               duedate     => DateTime->today_local->add(days => ($terms ? $terms->terms_netto * 1 : 1)),
-               payment_id  => $terms ? $terms->id : undef,
+               duedate     => $terms ? $terms->calc_date(reference_date => DateTime->today_local) : DateTime->today_local,

                invoice     => 1,
                type        => 'invoice',
                storno      => 0,
                invoice     => 1,
                type        => 'invoice',
                storno      => 0,


@@ -212,6 +204,7 @@ sub new_from {
     $current_invoice_item;
   } @{ $items };
 
     $current_invoice_item;
   } @{ $items };
 

+  @items = grep { $params{item_filter}->($_) } @items if $params{item_filter};

   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
 
   @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty};
   @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty};
 


@@ -344,6 +337,10 @@ sub displayable_type {
   return t8('Invoice');
 }
 
   return t8('Invoice');
 }
 

+sub displayable_name {
+  join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number);
+};
+

 sub abbreviation {
   my ($self) = @_;
 
 sub abbreviation {
   my ($self) = @_;
 


@@ -366,6 +363,16 @@ sub customervendor {
   goto &customer;
 }
 
   goto &customer;
 }
 

+sub link {
+  my ($self) = @_;
+
+  my $html;
+  $html   = SL::Presenter->get->sales_invoice($self, display => 'inline') if $self->invoice;
+  $html   = SL::Presenter->get->ar_transaction($self, display => 'inline') if !$self->invoice;
+
+  return $html;
+}
+

 1;
 
 __END__
 1;
 
 __END__


@@ -410,6 +417,12 @@ a quantity of 0 are not affected by this option.
 
 If trueish then items with a quantity of 0 are skipped.
 
 
 If trueish then items with a quantity of 0 are skipped.
 

+=item C<item_filter>
+
+An optional code reference that is called for each item with the item
+as its sole parameter. Items for which the code reference returns a
+falsish value will be skipped.
+

 =item C<attributes>
 
 An optional hash reference. If it exists then it is passed to C<new>
 =item C<attributes>
 
 An optional hash reference. If it exists then it is passed to C<new>