From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 6 Jan 2014 15:53:21 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~53
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/e6de5d289ce87cf3a44511e1fc6313ea86d0f5e7?hp=-c

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

Conflicts:
	bin/mozilla/ir.pl
---

e6de5d289ce87cf3a44511e1fc6313ea86d0f5e7
diff --combined bin/mozilla/ir.pl
index a0693b716,46e32fabc..bad6e4fff
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@@ -116,43 -116,14 +116,14 @@@ sub invoice_links 
      }
    }
  
-   my ($payment_id, $language_id, $taxzone_id, $currency, $delivery_term_id);
-   if ($form->{payment_id}) {
-     $payment_id = $form->{payment_id};
-   }
-   if ($form->{language_id}) {
-     $language_id = $form->{language_id};
-   }
-   if ($form->{taxzone_id}) {
-     $taxzone_id = $form->{taxzone_id};
-   }
-   if ($form->{currency}) {
-     $currency = $form->{currency};
-   }
-   if ($form->{delivery_term_id}) {
-     $delivery_term_id = $form->{delivery_term_id};
-   }
+   $form->backup_vars(qw(payment_id language_id taxzone_id
+                         currency delivery_term_id intnotes cp_id));
  
-   my $cp_id = $form->{cp_id};
    IR->get_vendor(\%myconfig, \%$form);
    IR->retrieve_invoice(\%myconfig, \%$form);
-   $form->{cp_id} = $cp_id;
  
-   if ($payment_id) {
-     $form->{payment_id} = $payment_id;
-   }
-   if ($language_id) {
-     $form->{language_id} = $language_id;
-   }
-   if ($taxzone_id) {
-     $form->{taxzone_id} = $taxzone_id;
-   }
-   if ($currency) {
-     $form->{currency} = $currency;
-   }
-   if ($delivery_term_id) {
-     $form->{delivery_term_id} = $delivery_term_id;
-   }
+   $form->restore_vars(qw(payment_id language_id taxzone_id
+                          currency delivery_term_id intnotes cp_id));
  
    my @curr = $form->get_all_currencies();
    map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
@@@ -356,7 -327,7 +327,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 gldate
 -    convert_from_do_ids convert_from_oe_ids show_details
++    convert_from_do_ids convert_from_oe_ids show_details gldate
    ), @custom_hiddens,
    map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];