X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=a1af7b19bbdbded87b2b159f7c70f8c753f0afdb;hb=ff0586637d90ef8f0b4b725e476ad7ccbeb32570;hp=a83e4bcc7e55682fa3208cd9a2cd7af001ce4995;hpb=15cfd696637c6734459068dc5ff8f97b8ebe9d25;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index a83e4bcc7..a1af7b19b 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -154,6 +154,7 @@ sub invoice_links {
                         taxincluded currency cp_id intnotes id shipto_id
                         delivery_term_id));
 
+  $form->{shipto} = 1 if $editing || $form->{convert_from_oe_ids} || $form->{convert_from_do_ids};
   IS->get_customer(\%myconfig, \%$form);
 
   #quote all_customer Bug 133
@@ -382,6 +383,8 @@ sub form_header {
   ), @custom_hiddens,
   map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
 
+  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase));
+
   $form->header();
 
   print $form->parse_html_template("is/form_header", \%TMPL_VAR);