From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Tue, 25 Aug 2020 13:12:07 +0000 (+0200)
Subject: Individuelle Lieferadresse hinzufügen: falsche Reihenfolge der Werte korrigiert
X-Git-Tag: release-3.5.6.1~64
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=15e3714a4402c3771d539cdf7703fd374d2b77e1;p=kivitendo-erp.git

Individuelle Lieferadresse hinzufügen: falsche Reihenfolge der Werte korrigiert

kam mit "Individuelle Lieferadresse hinzufügen: cp_gender nicht vergessen"
(commit bca91008eddc6a1734a75fcd555f10d1c8ac65f6),
bzw. "Individuelle Lieferadresse hinzufügen: cp_gender nicht auf leer prüfen …"
(commit b8fa93b5d2cfff453fd8a82206d1a288407a8be6) rein.

Bezieht sich auch auf #410 (redmine)
Refs #410
Behebt #438 (redmine).
---

diff --git a/SL/Form.pm b/SL/Form.pm
index c758659d4..63e072a1b 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1898,10 +1898,10 @@ sub add_shipto {
                      shiptocountry = ?,
                      shiptogln = ?,
                      shiptocontact = ?,
-                     shiptocp_gender = ?,
                      shiptophone = ?,
                      shiptofax = ?,
                      shiptoemail = ?
+                     shiptocp_gender = ?,
                    WHERE shipto_id = ?|;
     do_query($self, $dbh, $query, @values, $self->{shipto_id});
   } else {
@@ -1915,10 +1915,10 @@ sub add_shipto {
                      shiptocountry = ? AND
                      shiptogln = ? AND
                      shiptocontact = ? AND
-                     shiptocp_gender = ? AND
                      shiptophone = ? AND
                      shiptofax = ? AND
                      shiptoemail = ? AND
+                     shiptocp_gender = ? AND
                      module = ? AND
                      trans_id = ?|;
     my $insert_check = selectfirst_hashref_query($self, $dbh, $query, @values, $module, $id);
@@ -1926,7 +1926,7 @@ sub add_shipto {
       my $insert_query =
         qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
                                shiptostreet, shiptozipcode, shiptocity, shiptocountry, shiptogln,
-                               shiptocontact, shiptocp_gender, shiptophone, shiptofax, shiptoemail, module)
+                               shiptocontact, shiptophone, shiptofax, shiptoemail, shiptocp_gender, module)
            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
       do_query($self, $dbh, $insert_query, $id, @values, $module);