X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FDB%2FInvoice.pm;h=239280b2a27db8e38338cb0074a3760af38d0bc9;hb=f05112c2697a434803c8e223facda20b50f64a56;hp=3ecc9575e704500cadb5d2ab13b286331d6f8a37;hpb=6a12a968761127af91e9da8db7579be2836bcaaa;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 3ecc9575e..239280b2a 100644 --- 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; @@ -9,10 +6,11 @@ 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::AttrSorted; use SL::DB::Helper::FlattenToForm; use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::PriceTaxCalculator; @@ -20,7 +18,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 => { @@ -62,6 +59,7 @@ __PACKAGE__->meta->add_relationship( __PACKAGE__->meta->initialize; __PACKAGE__->attr_html('notes'); +__PACKAGE__->attr_sorted('items'); __PACKAGE__->before_save('_before_save_set_invnumber'); @@ -79,12 +77,7 @@ sub _before_save_set_invnumber { 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 @@ -146,14 +139,10 @@ sub new_from { 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') { - @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'; @@ -166,12 +155,13 @@ sub new_from { $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 - 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, - 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, @@ -214,6 +204,7 @@ sub new_from { $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}; @@ -346,6 +337,10 @@ sub displayable_type { return t8('Invoice'); } +sub displayable_name { + join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number); +}; + sub abbreviation { my ($self) = @_; @@ -368,48 +363,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 +373,6 @@ sub link { return $html; } ->>>>>>> Test: Bank-Commit zusammengefasst 1; __END__ @@ -465,6 +417,12 @@ a quantity of 0 are not affected by this option. If trueish then items with a quantity of 0 are skipped. +=item C + +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 An optional hash reference. If it exists then it is passed to C