From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 19 Oct 2016 12:09:18 +0000 (+0200)
Subject: oe: lieferadresse in body verschoben
X-Git-Tag: release-3.5.4~1399
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=075607c6877a1c42413803d3d8c3e07881523ad0;p=kivitendo-erp.git

oe: lieferadresse in body verschoben
---

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 840ef7d1a..5c1a1fda2 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -519,9 +519,6 @@ sub form_header {
       submit => [ '#form', { action_print          => 1 } ],
       checks => [ @req_trans_desc ],
     ]);
-    $bar->add_actions([ t8('Ship to'),
-      submit => [ '#form', { action_ship_to        => 1 } ],
-    ]);
     $bar->add_actions('combobox');
     $bar->actions->[-1]->add_actions([ t8('more'),
       disabled => 1,
diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index 833ea36d1..3e636dfaa 100644
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -76,6 +76,7 @@
                     <td>
                       [% shiptos = [ [ "", LxERP.t8("No/individual shipping address") ] ] ;
                          L.select_tag('shipto_id', shiptos.import(ALL_SHIPTO), default=shipto_id, value_key='shipto_id', title_key='displayable_id', style='width: 250px') %]
+                      [% L.submit_tag('action_ship_to', LxERP.t8('Ship to')) %]
                     </td>
                   </tr>
 [%- END %]