X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FOrder.pm;h=0c46f567373703caa85f634c35c24bd5cf9acd68;hb=dd6282f6e20d531511ae35cadc491a8c7ab8bad5;hp=daab5dd7d4d95cd523e5164f87f135caa67b1c19;hpb=c692dae18a650bc62c89ca658603d0e0ab2f9a86;p=kivitendo-erp.git

diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index daab5dd7d..0c46f5673 100644
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -27,27 +27,18 @@ __PACKAGE__->meta->add_relationship(
     }
   },
   periodic_invoices_config => {
-    type                   => 'one to one',
-    class                  => 'SL::DB::PeriodicInvoicesConfig',
-    column_map             => { id => 'oe_id' },
-  },
-  periodic_invoices        => {
     type                   => 'one to many',
-    class                  => 'SL::DB::PeriodicInvoice',
+    class                  => 'SL::DB::PeriodicInvoicesConfig',
     column_map             => { id => 'oe_id' },
   },
-  payment_term => {
-    type       => 'one to one',
-    class      => 'SL::DB::PaymentTerm',
-    column_map => { payment_id => 'id' },
-  },
 );
 
 __PACKAGE__->meta->initialize;
 
 # methods
 
-sub items { goto &orderitems; }
+sub items         { goto &orderitems; }
+sub payment_terms { goto &payment;    }
 
 sub type {
   my $self = shift;
@@ -64,6 +55,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 = @_;
@@ -80,6 +88,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 ]);
 }
@@ -106,6 +120,19 @@ sub convert_to_invoice {
   return $invoice;
 }
 
+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} }(@_);
+}
+
 1;
 
 __END__
@@ -116,13 +143,13 @@ SL::DB::Order - Order Datenbank Objekt.
 
 =head1 FUNCTIONS
 
-=head2 type
+=head2 C<type>
 
 Returns one of the following string types:
 
 =over 4
 
-=item saes_order
+=item sales_order
 
 =item purchase_order
 
@@ -132,11 +159,11 @@ Returns one of the following string types:
 
 =back
 
-=head2 is_type TYPE
+=head2 C<is_type TYPE>
 
-Rreturns true if the order is of the given type.
+Returns true if the order is of the given type.
 
-=item C<convert_to_invoice %params>
+=head2 C<convert_to_invoice %params>
 
 Creates a new invoice with C<$self> as the basis by calling
 L<SL::DB::Invoice::new_from>. That invoice is posted, and C<$self> is
@@ -151,7 +178,7 @@ nothing is created or changed in the database.
 
 At the moment only sales quotations and sales orders can be converted.
 
-=item C<create_sales_process>
+=head2 C<create_sales_process>
 
 Creates and saves a new sales process. Can only be called for sales
 orders.
@@ -161,8 +188,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.