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

diff --git a/SL/Controller/ClientConfig.pm b/SL/Controller/ClientConfig.pm
index aaed72fc5ce256234135fb7a779fdc7b8c7734eb..41c19ee80f53b01cc6db147fa6765ece45ec785d 100644 (file)
--- a/SL/Controller/ClientConfig.pm
+++ b/SL/Controller/ClientConfig.pm
@@ -18,7 +18,7 @@ sub action_edit {
   $self->{payment_options} = [ { title => $::locale->text("never"), value => 0 },
                                { title => $::locale->text("every time"), value => 1 },
                                { title => $::locale->text("on the same day"), value => 2 }, ];
-  $self->{accounting_options} = [ { title => $::locale->text("accrual"), value => "accrual" },
+  $self->{accounting_options} = [ { title => $::locale->text("Accrual"), value => "accrual" },
                                   { title => $::locale->text("cash"), value => "cash" }, ];
   $self->{inventory_options} = [ { title => $::locale->text("perpetual"), value => "perpetual" },
                                  { title => $::locale->text("periodic"), value => "periodic" }, ];

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 4e4f0532181893fa0164e307a2306a97c17967cb..c114c7eae02d8d1f7571d83efc0543665770db6a 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -944,7 +944,7 @@ sub edit_defaults {
   # default language
   my $all_languages = SL::DB::Manager::Language->get_all;
 
-# EÜR = cash, Bilanzierung = accrual
+# cash = IST-Versteuerung, accrual = SOLL-Versteuerung
 
   foreach my $key (keys %{ $form->{IC} }) {
     foreach my $accno (sort keys %{ $form->{IC}->{$key} }) {

diff --git a/locale/de/all b/locale/de/all
index a9d468811f77809e1e95ae47afbc8d43d2133ac0..f118a533fba315951545526b660fae12e99bd3c9 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -102,7 +102,7 @@ $self->{texts} = {
   'Accounting Group deleted!'   => 'Buchungsgruppe gelöscht!',
   'Accounting Group saved!'     => 'Buchungsgruppe gespeichert!',
   'Accounting method'           => 'Versteuerungsart',
-  'Accrual'                     => 'Bilanzierung',
+  'Accrual'                     => 'Soll-Versteuerung',
   'Active'                      => 'Aktiv',
   'Active?'                     => 'Aktiviert?',
   'Add'                         => 'Erfassen',

diff --git a/locale/de_DE/all b/locale/de_DE/all
index e07e39aca956409dd94e448c8ec376bbcd194da8..7eb8d8d837282c85c7803133516911d33d9c5d42 100644 (file)
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -101,7 +101,7 @@ $self->{texts} = {
   'Accounting Group deleted!'   => 'Buchungsgruppe gelöscht!',
   'Accounting Group saved!'     => 'Buchungsgruppe gespeichert!',
   'Accounting method'           => 'Versteuerungsart',
-  'Accrual'                     => 'Bilanzierung',
+  'Accrual'                     => 'Soll-Versteuerung',
   'Active'                      => 'Aktiv',
   'Active?'                     => 'Aktiviert?',
   'Add'                         => 'Erfassen',
@@ -2212,7 +2212,7 @@ $self->{texts} = {
   '[email]'                     => '[email]',
   'absolute'                    => 'absolut',
   'account_description'         => 'Beschreibung',
-  'accrual'                     => 'Bilanzierung (Soll-Versteuerung)',
+  'accrual'                     => 'Soll-Versteuerung',
   'action= not defined!'        => 'action= nicht definiert!',
   'active'                      => 'aktiv',
   'all entries'                 => 'alle Einträge',

diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index cf755d6b7fbbd138841c212ad95d638525deea46..158c0cceb8dbe3ebcf87ccd30a64dac1632a2bfe 100644 (file)
--- a/templates/webpages/rp/report.html
+++ b/templates/webpages/rp/report.html
@@ -63,7 +63,7 @@
     <th align=left>[% 'Method' | $T8 %]</th>
     <td colspan=3>
       [% L.radio_button_tag('method', value='accrual', checked=accrual, label=LxERP.t8('Accrual')) %]
-      [% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('EUR')) %]
+      [% L.radio_button_tag('method', value='cash', checked=cash, label=LxERP.t8('cash')) %]
     </td>
   </tr>
 [%- END %]