From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 9 Nov 2012 14:37:41 +0000 (+0100)
Subject: Bei Umwandlung Angebot -> Auftrag Feld "reqdate" löschen
X-Git-Tag: release-3.0.0beta1~10^2~5
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ba7276fa911871e2dcbb1fbc19e1ba4ce20ac658;p=kivitendo-erp.git

Bei Umwandlung Angebot -> Auftrag Feld "reqdate" löschen

Fixt #1969.
---

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 0bcb897bf..c7309dc86 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1736,13 +1736,14 @@ sub purchase_order {
 
   $form->{cp_id} *= 1;
 
+  my $source_type = $form->{type};
   $form->{title} = $locale->text('Add Purchase Order');
   $form->{vc}    = "vendor";
   $form->{type}  = "purchase_order";
 
   $form->get_employee();
 
-  &poso;
+  poso(source_type => $form->{type});
 
   delete $form->{sales_order_to_purchase_order};
 
@@ -1764,13 +1765,14 @@ sub sales_order {
 
   $form->{cp_id} *= 1;
 
+  my $source_type = $form->{type};
   $form->{title}  = $locale->text('Add Sales Order');
   $form->{vc}     = "customer";
   $form->{type}   = "sales_order";
 
   $form->get_employee();
 
-  &poso;
+  poso(source_type => $source_type);
 
   $main::lxdebug->leave_sub();
 }
@@ -1778,6 +1780,7 @@ sub sales_order {
 sub poso {
   $main::lxdebug->enter_sub();
 
+  my %param    = @_;
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
@@ -1787,6 +1790,11 @@ sub poso {
   $form->{transdate} = $form->current_date(\%myconfig);
   delete $form->{duedate};
 
+  # "reqdate" is the validity date for a quotation and the delivery
+  # date for an order. Therefore it makes no sense to keep the value
+  # when converting from one into the other.
+  delete $form->{reqdate} if ($param{source_type} =~ /_quotation$/) == ($form->{type} =~ /_quotation$/);
+
   $form->{convert_from_oe_ids} = $form->{id};
   $form->{closed}              = 0;