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

diff --git a/SL/DB/AuditTrail.pm b/SL/DB/AuditTrail.pm
deleted file mode 100644 (file)
index 891d6f2..0000000
--- a/SL/DB/AuditTrail.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file has been auto-generated only because it didn't exist.
-# Feel free to modify it at will; it will not be overwritten automatically.
-
-package SL::DB::AuditTrail;
-
-use strict;
-
-use SL::DB::MetaSetup::AuditTrail;
-
-__PACKAGE__->meta->initialize;
-
-# Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
-__PACKAGE__->meta->make_manager_class;
-
-1;

diff --git a/SL/DB/Helper/ALL.pm b/SL/DB/Helper/ALL.pm
index 498583f..6bdc368 100644 (file)
--- a/SL/DB/Helper/ALL.pm
+++ b/SL/DB/Helper/ALL.pm
@@ -4,7 +4,6 @@ use strict;
 
 use SL::DB::AccTransaction;
 use SL::DB::Assembly;
-use SL::DB::AuditTrail;
 use SL::DB::AuthClient;
 use SL::DB::AuthClientUser;
 use SL::DB::AuthClientGroup;

diff --git a/SL/DB/MetaSetup/GLTransaction.pm b/SL/DB/MetaSetup/GLTransaction.pm
index 14f386a..db03441 100644 (file)
--- a/SL/DB/MetaSetup/GLTransaction.pm
+++ b/SL/DB/MetaSetup/GLTransaction.pm
@@ -42,6 +42,11 @@ __PACKAGE__->meta->foreign_keys(
     key_columns => { employee_id => 'id' },
   },
 
+  employee_obj => {
+    class       => 'SL::DB::Employee',
+    key_columns => { employee_id => 'id' },
+  },
+
   storno_obj => {
     class       => 'SL::DB::GLTransaction',
     key_columns => { storno_id => 'id' },

diff --git a/locale/de/all b/locale/de/all
index 14151a6..4568b02 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -256,8 +256,8 @@ $self->{texts} = {
   'Authentification database creation' => 'Anlegen der Datenbank zur Benutzerauthentifizierung',
   'Authentification tables creation' => 'Anlegen der Tabellen zur Benutzerauthentifizierung',
   'Auto Send?'                  => 'Auto. Versand?',
-  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names' => 'Automatisches Löschen von voran-, mehrfach wiederholenten oder nachgestellten Leerzeichen im Kunden- oder Lieferantennamen (Bspw.: " Schmidt    & Söhne GmbH" -> "Schmidt & Söhne GmbH"',
-  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects also the CSV-Import.' => '',
+  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in customer or vendor names' => 'Automatisches Löschen von voran-/nachgestellten und aufeinanderfolgenden Leerzeichen im Kunden- oder Lieferantennamen',
+  'Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.' => 'Automatisches Löschen von voran-/nachgestellten und aufeinanderfolgenden Leerzeichen in Artikelbeschreibungen und -bemerkungen. Betrifft auch den CSV-Import.',
   'Automatically created invoice for fee and interest for dunning %s' => 'Automatisch erzeugte Rechnung für Gebühren und Zinsen zu Mahnung %s',
   'Available'                   => 'Verfügbar',
   'Available qty'               => 'Lagerbestand',

diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html
index 28a00ec..c0ba2f0 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -47,7 +47,7 @@
  <tr>
    <td align="right">[% LxERP.t8('Normalize part description and part notes') %]</td>
    <td>   [% L.yes_no_tag('defaults.normalize_part_descriptions', SELF.defaults.normalize_part_descriptions) %]</td>
-   <td>[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects also the CSV-Import.') %]</td>
+   <td>[% LxERP.t8('Automatic deletion of leading, trailing and excessive (repetitive) spaces in part description and part notes. Affects the CSV import as well.') %]</td>
   </tr>
 </tr>
  </table>

diff --git a/templates/webpages/rp/income_statement.html b/templates/webpages/rp/income_statement.html
index af0f19b..c587223 100644 (file)
--- a/templates/webpages/rp/income_statement.html
+++ b/templates/webpages/rp/income_statement.html
@@ -102,7 +102,7 @@
 </tr>
 <tr>
   <td>
-    L&ouml;hne und Geh&auml;ter
+    L&ouml;hne und Geh&auml;lter
   </td>
   <td>
     [% eur9 %]