Entwürfe: beim Buchen dazugehörigen Entwurf löschen

[mfinanz.git] / SL / DB / Order.pm

diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index f037ed16a86032593a266a30b292afc68de95f25..cc4f0a3f8b17cbd409bb5964754988251e533f29 100644 (file)
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -9,12 +9,15 @@ use List::Util qw(max);
 
 use SL::DB::MetaSetup::Order;
 use SL::DB::Manager::Order;
 
 use SL::DB::MetaSetup::Order;
 use SL::DB::Manager::Order;

+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 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 => {
 
 __PACKAGE__->meta->add_relationship(
   orderitems => {


@@ -40,6 +43,9 @@ __PACKAGE__->meta->add_relationship(
 
 __PACKAGE__->meta->initialize;
 
 
 __PACKAGE__->meta->initialize;
 

+__PACKAGE__->attr_html('notes');
+__PACKAGE__->attr_sorted('items');
+

 __PACKAGE__->before_save('_before_save_set_ord_quo_number');
 
 # hooks
 __PACKAGE__->before_save('_before_save_set_ord_quo_number');
 
 # hooks


@@ -60,12 +66,8 @@ sub _before_save_set_ord_quo_number {
 # methods
 
 sub items { goto &orderitems; }
 # 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 record_number { goto &number; }

 
 sub type {
   my $self = shift;
 
 sub type {
   my $self = shift;


@@ -93,6 +95,9 @@ sub displayable_type {
   die 'invalid 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;
 
 sub is_sales {
   croak 'not an accessor' if @_ > 1;


@@ -150,22 +155,38 @@ sub convert_to_invoice {
 }
 
 sub convert_to_delivery_order {
 }
 
 sub convert_to_delivery_order {

-  my ($self, %params) = @_;
+  my ($self, @args) = @_;

 
 

-  my ($delivery_order, $custom_shipto);
+  my $delivery_order;

   if (!$self->db->with_transaction(sub {
     require SL::DB::DeliveryOrder;
   if (!$self->db->with_transaction(sub {
     require SL::DB::DeliveryOrder;

-    ($delivery_order, $custom_shipto) = SL::DB::DeliveryOrder->new_from($self, %params);
+    $delivery_order = SL::DB::DeliveryOrder->new_from($self, @args);

     $delivery_order->save;
     $delivery_order->save;

-    $custom_shipto->save if $custom_shipto;

     $self->link_to_record($delivery_order);
     $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;
   })) {
     $self->update_attributes(delivered => 1);
     1;
   })) {

-    return wantarray ? () : undef;
+    return undef;

   }
 
   }
 

-  return wantarray ? ($delivery_order, $custom_shipto) : $delivery_order;
+  return $delivery_order;

 }
 
 sub number {
 }
 
 sub number {


@@ -181,10 +202,24 @@ sub number {
   return $self->${ \ $number_method{$self->type} }(@_);
 }
 
   return $self->${ \ $number_method{$self->type} }(@_);
 }
 

+sub customervendor {
+  $_[0]->is_sales ? $_[0]->customer : $_[0]->vendor;
+}
+

 sub date {
   goto &transdate;
 }
 
 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__
 1;
 
 __END__


@@ -226,16 +261,8 @@ C<true>, and C<$self> is saved.
 The arguments in C<%params> are passed to
 L<SL::DB::DeliveryOrder::new_from>.
 
 The arguments in C<%params> are passed to
 L<SL::DB::DeliveryOrder::new_from>.
 

-Returns C<undef> 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<shipto>
-to C<delivery_orders>. Meaning C<delivery_orders.shipto_id> will not
-be filled in that case. That's why a separate shipto object is created
-and returned.
+Returns C<undef> on failure. Otherwise the new delivery order will be
+returned.

 
 =head2 C<convert_to_invoice %params>
 
 
 =head2 C<convert_to_invoice %params>