From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Thu, 11 Feb 2016 21:57:46 +0000 (+0100)
Subject: GLN: Speichern und Anzeigen in den Stammdaten (Rechnungs- u. Lieferadressen).
X-Git-Tag: release-3.4.1~423
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f7bab9572ec83c3f6c0ab8070925ed8df1eb47dd;p=kivitendo-erp.git

GLN: Speichern und Anzeigen in den Stammdaten (Rechnungs- u. Lieferadressen).
---

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index a624ba27b..1eea8a289 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -535,7 +535,7 @@ sub action_ajaj_get_shipto {
         my $name = 'shipto'. $_;
         $name => $self->{shipto}->$name;
       }
-      qw(_id name department_1 department_2 street zipcode city country contact phone fax email)
+      qw(_id name department_1 department_2 street zipcode city gln country contact phone fax email)
     )
   };
 
diff --git a/sql/Pg-upgrade2/customer_vendor_shipto_add_gln.sql b/sql/Pg-upgrade2/customer_vendor_shipto_add_gln.sql
new file mode 100644
index 000000000..2f591c6e4
--- /dev/null
+++ b/sql/Pg-upgrade2/customer_vendor_shipto_add_gln.sql
@@ -0,0 +1,8 @@
+-- @tag: customer_vendor_shipto_add_gln
+-- @description: Spalte für GLN bei Kunde/Lieferant und Lieferadresse
+-- @depends: release_3_3_0
+-- @encoding: utf-8
+
+ALTER TABLE customer ADD COLUMN       gln TEXT;
+ALTER TABLE vendor   ADD COLUMN       gln TEXT;
+ALTER TABLE shipto   ADD COLUMN shiptogln TEXT;
diff --git a/templates/webpages/customer_vendor/tabs/billing.html b/templates/webpages/customer_vendor/tabs/billing.html
index 82ff5f2b4..c39287841 100644
--- a/templates/webpages/customer_vendor/tabs/billing.html
+++ b/templates/webpages/customer_vendor/tabs/billing.html
@@ -114,6 +114,14 @@
       </td>
     </tr>
 
+    <tr>
+      <th align="right" nowrap>[% 'GLN' | $T8 %]</th>
+
+      <td>
+        [% L.input_tag('cv.gln', SELF.cv.gln, size = 30) %]
+      </td>
+    </tr>
+
     <tr>
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>
 
diff --git a/templates/webpages/customer_vendor/tabs/shipto.html b/templates/webpages/customer_vendor/tabs/shipto.html
index 97cfa9d1f..fa5d5d387 100644
--- a/templates/webpages/customer_vendor/tabs/shipto.html
+++ b/templates/webpages/customer_vendor/tabs/shipto.html
@@ -72,6 +72,14 @@
       </td>
     </tr>
 
+    <tr>
+      <th align="right" nowrap>[% 'GLN' | $T8 %]</th>
+
+      <td>
+        [% L.input_tag('shipto.shiptogln', SELF.shipto.shiptogln,  size = 35) %]
+      </td>
+    </tr>
+
     <tr>
       <th align="right" nowrap>[% 'Contact' | $T8 %]</th>