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

[mfinanz.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 33a65ba46be04cd623e8c4f6a1887b5999cdb5ab..6c3b297dbbddf59070dbd899709ccf4d5f7b5981 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1251,19 +1251,19 @@ sub get_formname_translation {
   local $::locale = Locale->new($self->{recipient_locale});
 
   my %formname_translations = (
-    bin_list                => $::locale->text('Bin List'),
-    credit_note             => $::locale->text('Credit Note'),
-    invoice                 => $::locale->text('Invoice'),
-    pick_list               => $::locale->text('Pick List'),
-    proforma                => $::locale->text('Proforma Invoice'),
-    purchase_order          => $::locale->text('Purchase Order'),
-    request_quotation       => $::locale->text('RFQ'),
-    sales_order             => $::locale->text('Confirmation'),
-    sales_quotation         => $::locale->text('Quotation'),
-    storno_invoice          => $::locale->text('Storno Invoice'),
-    sales_delivery_order    => $::locale->text('Delivery Order'),
-    purchase_delivery_order => $::locale->text('Delivery Order'),
-    dunning                 => $::locale->text('Dunning'),
+    bin_list                => $main::locale->text('Bin List'),
+    credit_note             => $main::locale->text('Credit Note'),
+    invoice                 => $main::locale->text('Invoice'),
+    pick_list               => $main::locale->text('Pick List'),
+    proforma                => $main::locale->text('Proforma Invoice'),
+    purchase_order          => $main::locale->text('Purchase Order'),
+    request_quotation       => $main::locale->text('RFQ'),
+    sales_order             => $main::locale->text('Confirmation'),
+    sales_quotation         => $main::locale->text('Quotation'),
+    storno_invoice          => $main::locale->text('Storno Invoice'),
+    sales_delivery_order    => $main::locale->text('Delivery Order'),
+    purchase_delivery_order => $main::locale->text('Delivery Order'),
+    dunning                 => $main::locale->text('Dunning'),
   );
 
   $main::lxdebug->leave_sub();
@@ -1964,7 +1964,7 @@ sub get_employee_data {
   my ($login)  = selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|, conv_i($params{id}));
 
   if ($login) {
-    my $user = User->new($login);
+    my $user = User->new(login => $login);
     map { $self->{$params{prefix} . "_${_}"} = $user->{$_}; } qw(address businessnumber co_ustid company duns email fax name signature taxnumber tel);
 
     $self->{$params{prefix} . '_login'}   = $login;