X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FDeliveryOrder.pm;h=15eeee0c5d1c61e4303dd70cb6594e5a8937cc51;hb=524bc23eb0c179bfa2acbf6c6f00dce3788fccc7;hp=75eab64b0f6ff392aca394311a38a03f937ba163;hpb=e42233910a57d39f3ccef150db1212f7ecb7fb30;p=kivitendo-erp.git diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm index 75eab64b0..15eeee0c5 100644 --- a/SL/DB/DeliveryOrder.pm +++ b/SL/DB/DeliveryOrder.pm @@ -8,6 +8,8 @@ use Rose::DB::Object::Helpers (); use SL::DB::MetaSetup::DeliveryOrder; use SL::DB::Manager::DeliveryOrder; +use SL::DB::Helper::AttrHTML; +use SL::DB::Helper::AttrSorted; use SL::DB::Helper::FlattenToForm; use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::TransNumberGenerator; @@ -29,6 +31,9 @@ __PACKAGE__->meta->add_relationship(orderitems => { type => 'one to many __PACKAGE__->meta->initialize; +__PACKAGE__->attr_html('notes'); +__PACKAGE__->attr_sorted('items'); + __PACKAGE__->before_save('_before_save_set_donumber'); # hooks @@ -44,12 +49,9 @@ sub _before_save_set_donumber { # methods sub items { goto &orderitems; } - -sub items_sorted { - my ($self) = @_; - - return [ sort {$a->id <=> $b->id } @{ $self->items } ]; -} +sub add_items { goto &add_orderitems; } +sub payment_terms { goto &payment; } +sub record_number { goto &donumber; } sub sales_order { my $self = shift; @@ -71,6 +73,19 @@ sub type { return shift->customer_id ? 'sales_delivery_order' : 'purchase_delivery_order'; } +sub displayable_type { + my $type = shift->type; + + return $::locale->text('Sales Delivery Order') if $type eq 'sales_delivery_order'; + return $::locale->text('Purchase Delivery Order') if $type eq 'purchase_delivery_order'; + + die 'invalid type'; +} + +sub displayable_name { + join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number); +}; + sub displayable_state { my ($self) = @_; @@ -86,7 +101,7 @@ sub date { sub _clone_orderitem_cvar { my ($cvar) = @_; - my $cloned = Rose::DB::Object::Helpers::clone_and_reset($_); + my $cloned = $_->clone_and_reset; $cloned->sub_module('delivery_order_items'); return $cloned; @@ -104,42 +119,28 @@ sub new_from { $item_parent_column = 'order'; } - my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0; - - my %args = ( map({ ( $_ => $source->$_ ) } qw(cp_id currency_id customer_id cusordnumber department_id employee_id globalproject_id intnotes language_id notes - ordnumber reqdate salesman_id shippingpoint shipvia taxincluded taxzone_id transaction_description vendor_id + my %args = ( map({ ( $_ => $source->$_ ) } qw(cp_id currency_id customer_id cusordnumber delivery_term_id department_id employee_id globalproject_id intnotes language_id notes + ordnumber payment_id reqdate salesman_id shippingpoint shipvia taxincluded taxzone_id transaction_description vendor_id )), closed => 0, is_sales => !!$source->customer_id, delivered => 0, - terms => $terms, transdate => DateTime->today_local, ); # Custom shipto addresses (the ones specific to the sales/purchase # record and not to the customer/vendor) are only linked from - # shipto -> delivery_orders. Meaning delivery_orders.shipto_id - # will not be filled in that case. Therefore we have to return the - # new shipto object as a separate object so that the caller can - # save it, too. - my $custom_shipto; + # shipto → delivery_orders. Meaning delivery_orders.shipto_id + # will not be filled in that case. if (!$source->shipto_id && $source->id) { - my $old = $source->custom_shipto; - if ($old) { - $custom_shipto = SL::DB::Shipto->new( - map { +($_ => $old->$_) } - grep { !m{^ (?: itime | mtime | shipto_id | trans_id ) $}x } - map { $_->name } - @{ $old->meta->columns } - ); - $custom_shipto->module('DO'); - } + $args{custom_shipto} = $source->custom_shipto->clone($class) if $source->can('custom_shipto') && $source->custom_shipto; } else { $args{shipto_id} = $source->shipto_id; } - my $delivery_order = $class->new(%args, %{ $params{attributes} || {} }); + my $delivery_order = $class->new(%args); + $delivery_order->assign_attributes(%{ $params{attributes} }) if $params{attributes}; my $items = delete($params{items}) || $source->items_sorted; my %item_parents; @@ -151,21 +152,71 @@ sub new_from { $item_parents{$source_item_id} ||= $source_item->$item_parent_column; my $item_parent = $item_parents{$source_item_id}; - SL::DB::DeliveryOrderItem->new(map({ ( $_ => $source_item->$_ ) } + my $current_do_item = SL::DB::DeliveryOrderItem->new(map({ ( $_ => $source_item->$_ ) } qw(base_qty cusordnumber description discount lastcost longdescription marge_price_factor parts_id price_factor price_factor_id - project_id qty reqdate sellprice serialnumber transdate unit + project_id qty reqdate sellprice serialnumber transdate unit active_discount_source active_price_source )), custom_variables => \@custom_variables, ordnumber => ref($item_parent) eq 'SL::DB::Order' ? $item_parent->ordnumber : $source_item->ordnumber, ); - + $current_do_item->{"converted_from_orderitems_id"} = $_->{id} if ref($item_parent) eq 'SL::DB::Order'; + $current_do_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}; $delivery_order->items(\@items); - return ($delivery_order, $custom_shipto); + return $delivery_order; +} + +sub customervendor { + $_[0]->is_sales ? $_[0]->customer : $_[0]->vendor; +} + +sub convert_to_invoice { + my ($self, %params) = @_; + + croak("Conversion to invoices is only supported for sales records") unless $self->customer_id; + + my $invoice; + if (!$self->db->with_transaction(sub { + require SL::DB::Invoice; + $invoice = SL::DB::Invoice->new_from($self, %params)->post || die; + $self->link_to_record($invoice); + # TODO extend link_to_record for items, otherwise long-term no d.r.y. + foreach my $item (@{ $invoice->items }) { + foreach (qw(delivery_order_items)) { # expand if needed (orderitems) + if ($item->{"converted_from_${_}_id"}) { + die unless $item->{id}; + RecordLinks->create_links('mode' => 'ids', + 'from_table' => $_, + 'from_ids' => $item->{"converted_from_${_}_id"}, + 'to_table' => 'invoice', + 'to_id' => $item->{id}, + ) || die; + delete $item->{"converted_from_${_}_id"}; + } + } + } + $self->update_attributes(closed => 1); + 1; + })) { + return undef; + } + + return $invoice; +} + +sub digest { + my ($self) = @_; + + sprintf "%s %s (%s)", + $self->donumber, + $self->customervendor->name, + $self->date->to_kivitendo; } 1; @@ -188,6 +239,11 @@ SL::DB::DeliveryOrder - Rose model for delivery orders (table An alias for C for compatibility with other sales/purchase models. +=item C + +Returns a human-readable and translated description of the delivery order, consisting of +record type and number, e.g. "Verkaufslieferschein 123". + =item C Returns a human-readable description of the state regarding being @@ -195,14 +251,9 @@ closed and delivered. =item C -An alias for C for compatibility with other +An alias for C for compatibility with other sales/purchase models. -=item C - -Returns the delivery order items sorted by their ID (same order they -appear in the frontend delivery order masks). - =item C Creates a new C instance and copies as much @@ -213,18 +264,8 @@ quotations and purchase orders) are supported as sources. The conversion copies order items into delivery order items. Dates are copied as appropriate, e.g. the C field will be set to the current date. -Returns one or two objects depending on the context. In list context -the new delivery order instance and a shipto instance will be -returned. In scalar instance only the delivery order instance is -returned. - -Custom shipto addresses (the ones specific to the sales/purchase -record and not to the customer/vendor) are only linked from C -to C. Meaning C will not -be filled in that case. That's why a separate shipto object is created -and returned. - -The objects returned are not saved. +Returns the new delivery order instance. The object returned is not +saved. C<%params> can include the following options: @@ -237,10 +278,21 @@ missing then the method C will be called on C<$source>. This option can be used to override the sorting, to exclude certain positions or to add additional ones. +=item C + +If trueish then items with a negative quantity are skipped. Items with +a quantity of 0 are not affected by this option. + =item C 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 @@ -255,9 +307,24 @@ TODO: Describe sales_order =item C -Returns a stringdescribing this record's type: either +Returns a string describing this record's type: either C or C. +=item C + +Creates a new invoice with C<$self> as the basis by calling +L. That invoice is posted, and C<$self> is +linked to the new invoice via L. C<$self>'s +C attribute is set to C, and C<$self> is saved. + +The arguments in C<%params> are passed to L. + +Returns the new invoice instance on success and C on +failure. The whole process is run inside a transaction. On failure +nothing is created or changed in the database. + +At the moment only sales delivery orders can be converted. + =back =head1 BUGS