X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FDeliveryOrder.pm;h=94725a8d02c54f42bde1393e1f5f2349cb6b4928;hb=0e75a632271124a628dd600cb7eac739b595144d;hp=0a8f34851024062768e0e4a753e48197fb325b93;hpb=a60c6759b61a4e596ad234eaf938466563efe36c;p=kivitendo-erp.git diff --git a/SL/DB/DeliveryOrder.pm b/SL/DB/DeliveryOrder.pm index 0a8f34851..94725a8d0 100644 --- a/SL/DB/DeliveryOrder.pm +++ b/SL/DB/DeliveryOrder.pm @@ -4,8 +4,12 @@ use strict; use Carp; +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; @@ -17,10 +21,19 @@ __PACKAGE__->meta->add_relationship(orderitems => { type => 'one to many column_map => { id => 'delivery_order_id' }, manager_args => { with_objects => [ 'part' ] } }, + custom_shipto => { + type => 'one to one', + class => 'SL::DB::Shipto', + column_map => { id => 'trans_id' }, + query_args => [ module => 'DO' ], + }, ); __PACKAGE__->meta->initialize; +__PACKAGE__->attr_html('notes'); +__PACKAGE__->attr_sorted('items'); + __PACKAGE__->before_save('_before_save_set_donumber'); # hooks @@ -36,12 +49,8 @@ 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 sales_order { my $self = shift; @@ -75,20 +84,33 @@ sub date { goto &transdate; } +sub _clone_orderitem_cvar { + my ($cvar) = @_; + + my $cloned = Rose::DB::Object::Helpers::clone_and_reset($_); + $cloned->sub_module('delivery_order_items'); + + return $cloned; +} + sub new_from { my ($class, $source, %params) = @_; croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) eq 'SL::DB::Order'; - my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0; + my ($item_parent_id_column, $item_parent_column); + + if (ref($source) eq 'SL::DB::Order') { + $item_parent_id_column = 'trans_id'; + $item_parent_column = 'order'; + } 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 + 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, ); @@ -100,9 +122,7 @@ sub new_from { # save it, too. my $custom_shipto; if (!$source->shipto_id && $source->id) { - require SL::DB::Shipto; - - my $old = SL::DB::Manager::Shipto->find_by(trans_id => $source->id); + my $old = $source->custom_shipto; if ($old) { $custom_shipto = SL::DB::Shipto->new( map { +($_ => $old->$_) } @@ -110,27 +130,49 @@ sub new_from { map { $_->name } @{ $old->meta->columns } ); + $custom_shipto->module('DO'); } } else { $args{shipto_id} = $source->shipto_id; } - my $delivery_order = $class->new(%args, %params); + 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; my @items = map { - my $source_item = $_; + my $source_item = $_; + my $source_item_id = $_->$item_parent_id_column; + my @custom_variables = map { _clone_orderitem_cvar($_) } @{ $source_item->custom_variables }; + + $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->$_ ) } - qw(base_qty cusordnumber description discount lastcost longdescription marge_price_factor ordnumber parts_id price_factor price_factor_id - project_id qty reqdate sellprice serialnumber transdate unit - ))); - } @{ $source->items_sorted }; + 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 active_discount_source active_price_source + )), + custom_variables => \@custom_variables, + ordnumber => ref($item_parent) eq 'SL::DB::Order' ? $item_parent->ordnumber : $source_item->ordnumber, + ); + + } @{ $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); } +sub customervendor { + $_[0]->is_sales ? $_[0]->customer : $_[0]->vendor; +} + 1; __END__ @@ -149,7 +191,7 @@ SL::DB::DeliveryOrder - Rose model for delivery orders (table =item C -An alias for L for compatibility with other sales/purchase models. +An alias for C for compatibility with other sales/purchase models. =item C @@ -158,15 +200,10 @@ closed and delivered. =item C -An alias for L 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 +=item C Creates a new C instance and copies as much information from C<$source> as possible. At the moment only instances @@ -189,6 +226,40 @@ and returned. The objects returned are not saved. +C<%params> can include the following options: + +=over 2 + +=item C + +An optional array reference of RDBO instances for the items to use. If +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 +allowing the caller to set certain attributes for the new delivery +order. + +=back + =item C TODO: Describe sales_order