X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FDB%2FOrder.pm;h=d996d13b659175bea4bbce6114b388c0d260ac8e;hb=ec4cffa8a9fe604ecaab2a0af734b5e28c040935;hp=657252f8ab28a7dbdef85cda0b76f3df017c47a6;hpb=1b18f0aa0914699d5ef4372243ebb8872d1bdc20;p=kivitendo-erp.git

diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index 657252f8a..d996d13b6 100644
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -58,6 +58,8 @@ __PACKAGE__->attr_sorted('items');
 
 __PACKAGE__->before_save('_before_save_set_ord_quo_number');
 __PACKAGE__->before_save('_before_save_create_new_project');
+__PACKAGE__->before_save('_before_save_remove_empty_custom_shipto');
+__PACKAGE__->before_save('_before_save_set_custom_shipto_module');
 
 # hooks
 
@@ -98,6 +100,23 @@ sub _before_save_create_new_project {
   return 1;
 }
 
+
+sub _before_save_remove_empty_custom_shipto {
+  my ($self) = @_;
+
+  $self->custom_shipto(undef) if $self->custom_shipto && $self->custom_shipto->is_empty;
+
+  return 1;
+}
+
+sub _before_save_set_custom_shipto_module {
+  my ($self) = @_;
+
+  $self->custom_shipto->module('OE') if $self->custom_shipto;
+
+  return 1;
+}
+
 # methods
 
 sub items { goto &orderitems; }
@@ -314,6 +333,7 @@ sub new_from {
 
   if ( $is_abbr_any->(qw(sopo poso)) ) {
     $args{ordnumber} = undef;
+    $args{quonumber} = undef;
     $args{reqdate}   = DateTime->today_local->next_workday();
     $args{employee}  = SL::DB::Manager::Employee->current;
   }