From 160fa2148ba486be7935732a731c475521d6c9cc Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 5 Jan 2017 13:57:59 +0100
Subject: [PATCH] ActionBar: Verkaufsrechnungen: Lieferadresse via Popup
 bearbeiten

---
 bin/mozilla/is.pl                      | 6 ++----
 templates/webpages/is/form_footer.html | 6 ++++++
 templates/webpages/is/form_header.html | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 21e35c0c8..208da110f 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -461,15 +461,12 @@ sub form_header {
   $TMPL_VAR{dateformat}          = $myconfig{dateformat};
   $TMPL_VAR{numberformat}        = $myconfig{numberformat};
 
-  push @custom_hiddens, map { "shiptocvar_" . $_->name } @{ SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'ShipTo' ]) };
-
   # hiddens
   $TMPL_VAR{HIDDENS} = [qw(
     id type media format queued printed emailed title vc discount
     title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
     max_dunning_level dunning_amount dunning_description
-    shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax
-    shiptoemail shiptodepartment_1 shiptodepartment_2  shiptocp_gender message email subject cc bcc taxaccounts cursor_fokus
+    message email subject cc bcc taxaccounts cursor_fokus
     convert_from_do_ids convert_from_oe_ids convert_from_ar_ids useasnew
     invoice_id
     show_details
@@ -611,6 +608,7 @@ sub form_footer {
                              ? ($form->current_date(\%myconfig) eq $form->{gldate})
                              : ($::instance_conf->get_is_changeable == 1),
     today               => DateTime->today,
+    vc_obj              => $form->{customer_id} ? SL::DB::Customer->load_cached($form->{customer_id}) : undef,
   });
 ##print $form->parse_html_template('is/_payments'); # parser
 ##print $form->parse_html_template('webdav/_list'); # parser
diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html
index f06cc2d31..56b39651b 100644
--- a/templates/webpages/is/form_footer.html
+++ b/templates/webpages/is/form_footer.html
@@ -155,7 +155,13 @@
 [% P.hidden_tag('draft_description', draft_description) %]
 <input type="hidden" name="customer_discount" value="[% customer_discount %]">
 <input type="hidden" name="gldate" value="[% gldate %]">
+
+<div id="shipto_inputs" class="hidden">
+ [%- PROCESS 'common/_ship_to_dialog.html' %]
+</div>
 </form>
 <script type='text/javascript'>
  $(kivi.SalesPurchase.init_on_submit_checks);
 </script>
+
+<div id="shipto_dialog" class="hidden"></div>
diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 18d6fb5d4..6eabc1acc 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -68,16 +68,16 @@
           </td>
         </tr>
 [%- END %]
-[%- IF ALL_SHIPTO.size %]
         <tr>
           <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
+           [%- IF ALL_SHIPTO.size %]
             [% 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') %]
-            <input class="submit" type="submit" name="action_ship_to" value="[% 'Ship to' | $T8 %]">
+           [%- END %]
+           [% L.button_tag("kivi.SalesPurchase.edit_custom_shipto()", LxERP.t8("Custom shipto")) %]
           </td>
         </tr>
-[%- END %]
         <tr>
           <td align="right">[% 'Credit Limit' | $T8 %]</td>
           <td>
-- 
2.20.1