From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 4 May 2010 08:29:13 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~342^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/92794037139489f14cd9f64ef591898f890d75d8?hp=1d04c0b59989cd87343dc45fe29c1924fabfacc1

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index e4185ab33..8aeabdce5 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -543,9 +543,9 @@ sub list_transactions {
     'description' => { 'text' => $locale->text('Description'), },
     'debit'       => { 'text' => $locale->text('Debit'), },
     'credit'      => { 'text' => $locale->text('Credit'), },
-    'gegenkonto'     => { 'text' => $locale->text('Gegenkonto'), },
-    'ustkonto'     => { 'text' => $locale->text('USt-Konto'), },
-    'balance'          => { 'text' => $locale->text('Balance'), },
+    'gegenkonto'  => { 'text' => $locale->text('Gegenkonto'), },
+    'ustkonto'    => { 'text' => $locale->text('USt-Konto'), },
+    'balance'     => { 'text' => $locale->text('Balance'), },
     'ustrate'     => { 'text' => $locale->text('Satz %'), },
  );
 
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 44ddc1675..46b7c28c0 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -675,7 +675,7 @@ sub item_selected {
   map {
     $form->{"${_}_$i"} =
       $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces)
-  } qw(sellprice listprice) if $form->{item} ne 'assembly';
+  } qw(sellprice listprice lastcost) if $form->{item} ne 'assembly';
 
   # get pricegroups for parts
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index f618c5b69..663a20ebc 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1660,8 +1660,8 @@ sub aging {
     'invnumber' => { 'text' => $locale->text('Invoice'), },
     'transdate' => { 'text' => $locale->text('Date'), },
     'duedate'   => { 'text' => $locale->text('Due'), },
-    'amount'        => { 'text' => $locale->text('Amount'), },
-    'open'       => { 'text' => $locale->text('Open'), },
+    'amount'    => { 'text' => $locale->text('Amount'), },
+    'open'      => { 'text' => $locale->text('Open'), },
   );
 
   my %column_alignment = ('statement' => 'center',