Bei der Umwandlung eines Auftrags in eine Rechnung wurde die individuelle Lieferadres...

[kivitendo-erp.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index cc65716b43f7d864bbf39f01a384c7e757064ab5..e5203f737d780e1301b29d0d7afdfbaefc5c96a0 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1469,6 +1469,7 @@ sub add_shipto {
 
   my $shipto;
   my @values;
 
   my $shipto;
   my @values;

+

   foreach my $item (qw(name department_1 department_2 street zipcode city country
                        contact phone fax email)) {
     if ($self->{"shipto$item"}) {
   foreach my $item (qw(name department_1 department_2 street zipcode city country
                        contact phone fax email)) {
     if ($self->{"shipto$item"}) {


@@ -1476,6 +1477,7 @@ sub add_shipto {
     }
     push(@values, $self->{"shipto${item}"});
   }
     }
     push(@values, $self->{"shipto${item}"});
   }

+

   if ($shipto) {
     if ($self->{shipto_id}) {
       my $query = qq|UPDATE shipto set
   if ($shipto) {
     if ($self->{shipto_id}) {
       my $query = qq|UPDATE shipto set


@@ -1504,8 +1506,9 @@ sub add_shipto {
                        shiptocontact = ? AND
                        shiptophone = ? AND
                        shiptofax = ? AND
                        shiptocontact = ? AND
                        shiptophone = ? AND
                        shiptofax = ? AND

-                       shiptoemail = ?|;
-      my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values);
+                       shiptoemail = ? AND
+                       module = ?|;
+      my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values, $module);

       if(!$insert_check){
         $query =
           qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
       if(!$insert_check){
         $query =
           qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,