From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 14:45:31 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~53^2~2^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/45f8b16a355e9b61bd8e0af2ba185009af8e9006?ds=inline;hp=-c

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

45f8b16a355e9b61bd8e0af2ba185009af8e9006
diff --combined bin/mozilla/ir.pl
index ddf5796b1,744e0c558..a91f8a4b0
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@@ -116,7 -116,7 +116,7 @@@ sub invoice_links 
      }
    }
  
 -  my ($payment_id, $language_id, $taxzone_id, $currency, $delivery_term_id);
 +  my ($payment_id, $language_id, $taxzone_id, $currency, $delivery_term_id, $intnotes);
    if ($form->{payment_id}) {
      $payment_id = $form->{payment_id};
    }
@@@ -132,9 -132,6 +132,9 @@@
    if ($form->{delivery_term_id}) {
      $delivery_term_id = $form->{delivery_term_id};
    }
 +  if (exists $form->{intnotes}) {
 +    $intnotes = $form->{intnotes};
 +  }
  
    my $cp_id = $form->{cp_id};
    IR->get_vendor(\%myconfig, \%$form);
@@@ -156,9 -153,6 +156,9 @@@
    if ($delivery_term_id) {
      $form->{delivery_term_id} = $delivery_term_id;
    }
 +  if (defined $intnotes) {
 +    $form->{intnotes} = $intnotes;
 +  }
  
    my @curr = $form->get_all_currencies();
    map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
@@@ -362,7 -356,7 +362,7 @@@ sub form_header 
      max_dunning_level dunning_amount
      shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
      shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
-     convert_from_do_ids convert_from_oe_ids
+     convert_from_do_ids convert_from_oe_ids show_details
    ), @custom_hiddens,
    map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];