X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FOrder.pm;h=cc4f0a3f8b17cbd409bb5964754988251e533f29;hb=17f43ff5eed41ff4fe630fd874905cacf4f763d8;hp=e28a87c7d22870ae40f6f4b5d970e6daf310fe16;hpb=c707edd523dc852f3bd11008d64ab3cb1daca545;p=kivitendo-erp.git diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm index e28a87c7d..cc4f0a3f8 100644 --- a/SL/DB/Order.pm +++ b/SL/DB/Order.pm @@ -9,13 +9,15 @@ use List::Util qw(max); use SL::DB::MetaSetup::Order; use SL::DB::Manager::Order; -use SL::DB::Invoice; +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::RecordLinks; +use Rose::DB::Object::Helpers qw(as_tree); __PACKAGE__->meta->add_relationship( orderitems => { @@ -31,43 +33,41 @@ __PACKAGE__->meta->add_relationship( class => 'SL::DB::PeriodicInvoicesConfig', column_map => { id => 'oe_id' }, }, - periodic_invoices => { - type => 'one to many', - class => 'SL::DB::PeriodicInvoice', - column_map => { id => 'oe_id' }, - }, - payment_term => { - type => 'one to one', - class => 'SL::DB::PaymentTerm', - column_map => { payment_id => 'id' }, - }, - contact => { - type => 'one to one', - class => 'SL::DB::Contact', - column_map => { cp_id => 'cp_id' }, - }, - shipto => { - type => 'one to one', - class => 'SL::DB::Shipto', - column_map => { shipto_id => 'shipto_id' }, - }, - department => { - type => 'one to one', - class => 'SL::DB::Department', - column_map => { department_id => 'id' }, - }, - language => { - type => 'one to one', - class => 'SL::DB::Language', - column_map => { language_id => 'id' }, + custom_shipto => { + type => 'one to one', + class => 'SL::DB::Shipto', + column_map => { id => 'trans_id' }, + query_args => [ module => 'OE' ], }, ); __PACKAGE__->meta->initialize; +__PACKAGE__->attr_html('notes'); +__PACKAGE__->attr_sorted('items'); + +__PACKAGE__->before_save('_before_save_set_ord_quo_number'); + +# hooks + +sub _before_save_set_ord_quo_number { + my ($self) = @_; + + # ordnumber is 'NOT NULL'. Therefore make sure it's always set to at + # least an empty string, even if we're saving a quotation. + $self->ordnumber('') if !$self->ordnumber; + + my $field = $self->quotation ? 'quonumber' : 'ordnumber'; + $self->create_trans_number if !$self->$field; + + return 1; +} + # methods sub items { goto &orderitems; } +sub add_items { goto &add_orderitems; } +sub record_number { goto &number; } sub type { my $self = shift; @@ -95,10 +95,13 @@ sub displayable_type { die 'invalid type'; } +sub displayable_name { + join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number); +}; sub is_sales { croak 'not an accessor' if @_ > 1; - return shift->customer_id; + return !!shift->customer_id; } sub invoices { @@ -108,6 +111,7 @@ sub invoices { if ($self->quotation) { return []; } else { + require SL::DB::Invoice; return SL::DB::Manager::Invoice->get_all( query => [ ordnumber => $self->ordnumber, @@ -137,11 +141,12 @@ sub convert_to_invoice { croak("Conversion to invoices is only supported for sales records") unless $self->customer_id; my $invoice; - if (!$self->db->do_transaction(sub { + if (!$self->db->with_transaction(sub { + require SL::DB::Invoice; $invoice = SL::DB::Invoice->new_from($self)->post(%params) || die; $self->link_to_record($invoice); $self->update_attributes(closed => 1); - # die; + 1; })) { return undef; } @@ -149,6 +154,72 @@ sub convert_to_invoice { return $invoice; } +sub convert_to_delivery_order { + my ($self, @args) = @_; + + my $delivery_order; + if (!$self->db->with_transaction(sub { + require SL::DB::DeliveryOrder; + $delivery_order = SL::DB::DeliveryOrder->new_from($self, @args); + $delivery_order->save; + $self->link_to_record($delivery_order); + # TODO extend link_to_record for items, otherwise long-term no d.r.y. + foreach my $item (@{ $delivery_order->items }) { + foreach (qw(orderitems)) { # expand if needed (delivery_order_items) + if ($item->{"converted_from_${_}_id"}) { + die unless $item->{id}; + RecordLinks->create_links('dbh' => $self->db->dbh, + 'mode' => 'ids', + 'from_table' => $_, + 'from_ids' => $item->{"converted_from_${_}_id"}, + 'to_table' => 'delivery_order_items', + 'to_id' => $item->{id}, + ) || die; + delete $item->{"converted_from_${_}_id"}; + } + } + } + + $self->update_attributes(delivered => 1); + 1; + })) { + return undef; + } + + return $delivery_order; +} + +sub number { + my $self = shift; + + my %number_method = ( + sales_order => 'ordnumber', + sales_quotation => 'quonumber', + purchase_order => 'ordnumber', + request_quotation => 'quonumber', + ); + + return $self->${ \ $number_method{$self->type} }(@_); +} + +sub customervendor { + $_[0]->is_sales ? $_[0]->customer : $_[0]->vendor; +} + +sub date { + goto &transdate; +} + +sub digest { + my ($self) = @_; + + sprintf "%s %s %s (%s)", + $self->number, + $self->customervendor->name, + $self->amount_as_number, + $self->date->to_kivitendo; +} + 1; __END__ @@ -179,6 +250,20 @@ Returns one of the following string types: Returns true if the order is of the given type. +=head2 C + +Creates a new delivery order with C<$self> as the basis by calling +L. That delivery order is saved, 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 C on failure. Otherwise the new delivery order will be +returned. + =head2 C Creates a new invoice with C<$self> as the basis by calling