From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 29 Dec 2010 11:43:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~48^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/commitdiff_plain/0672f4afe29c2ba6537d90f4a0ff7eeff78ccae6?hp=8f7f43705051992b65a30630412e1ab46523caba

Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b50fe4e14..6377fa6d9 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1040,9 +1040,9 @@ sub edit_e_mail {
 
   $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
 
-  if ($form->{"cp_id"} && !$form->{"email"}) {
+  if ($form->{"cp_id"}) {
     CT->get_contact(\%myconfig, $form);
-    $form->{"email"} = $form->{"cp_email"};
+    $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"};
   }
 
   my $title = $locale->text('E-mail') . " " . $form->get_formname_translation();