X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FOrder.pm;h=48e2be6648544996e11819a57a2f3a0f41bf7d28;hb=a34c05f386bc2abb45a097dcb4d68e8ab2f5af94;hp=61a49d4ffa4864fa9afb1bc09460389d735f9c89;hpb=e055700faea1906bea6c03184ba4516b57cac887;p=kivitendo-erp.git diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm index 61a49d4ff..48e2be664 100644 --- a/SL/DB/Order.pm +++ b/SL/DB/Order.pm @@ -9,13 +9,14 @@ 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::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 +32,45 @@ __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__->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 items_sorted { + my ($self) = @_; + + return [ sort {$a->position <=> $b->position } @{ $self->items } ]; +} sub type { my $self = shift; @@ -84,6 +87,23 @@ sub is_type { return shift->type eq shift; } +sub displayable_type { + my $type = shift->type; + + return $::locale->text('Sales quotation') if $type eq 'sales_quotation'; + return $::locale->text('Request quotation') if $type eq 'request_quotation'; + return $::locale->text('Sales Order') if $type eq 'sales_order'; + return $::locale->text('Purchase Order') if $type eq 'purchase_order'; + + die 'invalid type'; +} + + +sub is_sales { + croak 'not an accessor' if @_ > 1; + return !!shift->customer_id; +} + sub invoices { my $self = shift; my %params = @_; @@ -91,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, @@ -100,6 +121,12 @@ sub invoices { } } +sub displayable_state { + my ($self) = @_; + + return $self->closed ? $::locale->text('closed') : $::locale->text('open'); +} + sub abschlag_invoices { return shift()->invoices(query => [ abschlag => 1 ]); } @@ -114,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; } @@ -126,6 +154,46 @@ sub convert_to_invoice { return $invoice; } +sub convert_to_delivery_order { + my ($self, @args) = @_; + + my ($delivery_order, $custom_shipto); + if (!$self->db->with_transaction(sub { + require SL::DB::DeliveryOrder; + ($delivery_order, $custom_shipto) = SL::DB::DeliveryOrder->new_from($self, @args); + $delivery_order->save; + $custom_shipto->save if $custom_shipto; + $self->link_to_record($delivery_order); + $self->update_attributes(delivered => 1); + 1; + })) { + return wantarray ? () : undef; + } + + return wantarray ? ($delivery_order, $custom_shipto) : $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; +} + 1; __END__ @@ -136,13 +204,13 @@ SL::DB::Order - Order Datenbank Objekt. =head1 FUNCTIONS -=head2 type +=head2 C Returns one of the following string types: =over 4 -=item saes_order +=item sales_order =item purchase_order @@ -152,11 +220,33 @@ Returns one of the following string types: =back -=head2 is_type TYPE +=head2 C + +Returns true if the order is of the given type. -Rreturns true if the order is of the given type. +=head2 C -=item 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 return value depends on the +context. In list context the new delivery order 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. + +=head2 C Creates a new invoice with C<$self> as the basis by calling L. That invoice is posted, and C<$self> is @@ -171,7 +261,7 @@ nothing is created or changed in the database. At the moment only sales quotations and sales orders can be converted. -=item C +=head2 C Creates and saves a new sales process. Can only be called for sales orders. @@ -181,8 +271,6 @@ C<$self> and to all sales quotations that are linked to C<$self>. Returns the newly created process instance. -=back - =head1 BUGS Nothing here yet.