From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Fri, 9 Nov 2012 12:00:59 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta2~10^2~6
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/25c3ca0d2e6360fcb3cc56f3c26c2dd4bcce3af9?hp=bf9a0eab96511f9db2ebe2c8791cd19f6db2177f

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 0654d860b..dcca628b3 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -569,7 +569,7 @@ $jsscript
       NTI($cgi->popup_menu('-name' => "project_id_$i",
                            '-values' => \@project_values,
                            '-labels' => \%project_labels,
-                           '-default' => $form->{"project_id_$i"} ));
+                           '-default' => ($i==$form->{rowcount})? $form->{globalproject_id} : $form->{"project_id_$i"} ));
 
     print qq|
         <tr>
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 80c87f966..655f35a9f 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -333,7 +333,7 @@ sub form_header {
     my $transaction = {
       amount     => $form->{"amount_$i"},
       tax        => $form->{"tax_$i"},
-      project_id => $form->{"project_id_$i"},
+      project_id => ($i==$form->{rowcount}) ? $form->{globalproject_id} : $form->{"project_id_$i"},
     };
 
     my $selected_accno_full;