From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 8 Nov 2012 11:00:41 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~25^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/10687edafbc052375683d65e36ce42b4586f7240?hp=30e67fae37b3738b33ddaadb05fbc5db14c569d2

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 aaed72fc5..41c19ee80 100644
--- 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/SL/IC.pm b/SL/IC.pm
index 0f4187094..ff80d76cb 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1565,6 +1565,11 @@ sub retrieve_accounts {
     } else {
       $transdate = $form->{deliverydate};
     }
+  } elsif (($form->{type} eq "credit_note") and $form->{deliverydate}) {
+    # if credit_note has a deliverydate, use this instead of invdate
+    # useful for credit_notes of invoices from an old period with different tax
+    # if there is no deliverydate then invdate is used, old default (see next elsif)
+    $transdate = $form->{deliverydate};
   } elsif (($form->{type} eq "credit_note") || ($form->{script} eq 'ir.pl')) {
     $transdate = $form->{invdate};
   } else {
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index f9d299ff5..500547597 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -940,7 +940,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 604ae2eb8..b378b34ee 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -101,7 +101,7 @@ $self->{texts} = {
   'Accounting Group deleted!'   => 'Buchungsgruppe gel&ouml;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 182d245c8..52d3ec595 100644
--- a/locale/de_DE/all
+++ b/locale/de_DE/all
@@ -101,7 +101,7 @@ $self->{texts} = {
   'Accounting Group deleted!'   => 'Buchungsgruppe gel&ouml;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/is/form_header.html b/templates/webpages/is/form_header.html
index bbe05f0a4..97561d154 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -197,12 +197,11 @@
         <th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="donumber" value="[% HTML.escape(donumber) %]"></td>
         </tr>
+[%- END %]
         <tr>
           <th align="right">[% 'Delivery Date' | $T8 %]</th>
           <td>[% L.date_tag('deliverydate', deliverydate, cal_align='BL') %]</td>
         </tr>
-[%- END %]
-
         <tr>
           <th align="right" nowrap>[% 'Order Number' | $T8 %]</th>
           <td colspan="3"><input size='11' name="ordnumber" value="[% HTML.escape(ordnumber) %]"></td>
diff --git a/templates/webpages/rp/report.html b/templates/webpages/rp/report.html
index cf755d6b7..158c0cceb 100644
--- 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 %]