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

diff --git a/locale/de/all b/locale/de/all
index cf33ee3..ab51f57 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2129,6 +2129,7 @@ $self->{texts} = {
   'as at'                       => 'zum Stand',
   'assembly_list'               => 'erzeugnisliste',
   'back'                        => 'zurück',
+  'balance'                     => 'Betriebsvermögensvergleich/Bilanzierung',
   'bank_collection_payment_list_#1' => 'bankeinzugszahlungsliste_#1',
   'bank_transfer_payment_list_#1' => 'ueberweisungszahlungsliste_#1',
   'bankaccounts'                => 'Bankkonten',
@@ -2178,6 +2179,7 @@ $self->{texts} = {
   'history'                     => 'Historie',
   'history search engine'       => 'Historien Suchmaschine',
   'inactive'                    => 'inaktiv',
+  'income'                      => 'Einnahmen-Überschuss-Rechnung',
   'invoice'                     => 'Rechnung',
   'invoice_list'                => 'debitorenbuchungsliste',
   'lead deleted!'               => 'Kundenquelle gelöscht',
@@ -2207,8 +2209,10 @@ $self->{texts} = {
   'open'                        => 'Offen',
   'order'                       => 'Reihenfolge',
   'our vendor number at customer' => 'Unsere Lieferanten-Nr. beim Kunden',
-  'part_list'                   => 'warenliste',
+  'part_list'                   => 'Warenliste',
   'percental'                   => 'prozentual',
+  'periodic'                    => 'Aufwandsmethode',
+  'perpetual'                   => 'Bestandsmethode',
   'pick_list'                   => 'Sammelliste',
   'plural first char'           => 'P',
   'pos_bilanz'                  => 'Bilanz',

diff --git a/locale/en/all b/locale/en/all
index 9b2cdd0..7627741 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -1223,7 +1223,6 @@ $self->{texts} = {
   'Periodic invoices active'    => '',
   'Periodic invoices inactive'  => '',
   'Periodicity'                 => '',
-  'perpetual:'                  => '',
   'Personal settings'           => '',
   'Pg Database Administration'  => '',
   'Phone'                       => '',
@@ -2034,6 +2033,7 @@ $self->{texts} = {
   'history'                     => '',
   'history search engine'       => '',
   'inactive'                    => '',
+  'income'                      => '',
   'invoice'                     => '',
   'invoice_list'                => '',
   'lead deleted!'               => '',
@@ -2064,6 +2064,8 @@ $self->{texts} = {
   'order'                       => '',
   'our vendor number at customer' => '',
   'part_list'                   => '',
+  'periodic'                    => '',
+  'perpetual'                   => '',
   'pick_list'                   => '',
   'plural first char'           => '',
   'pos_bilanz'                  => '',