From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 23 Feb 2011 08:39:13 +0000 (+0100)
Subject: Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
X-Git-Tag: release-2.6.3~75
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f859a8a026f28d5eedfe6dbac60a4bbcd1dcbecf?hp=8c81ad1b9db9707705884a86dda5eb159e57d4c2

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

diff --git a/bin/mozilla/drafts.pl b/bin/mozilla/drafts.pl
index f6cc7b6d0..c471d009b 100644
--- a/bin/mozilla/drafts.pl
+++ b/bin/mozilla/drafts.pl
@@ -129,7 +129,10 @@ sub load_draft {
     $form->{draft_description}     = $description;
     $form->{remove_draft}          = 'checked';
   }
-
+  # Ich vergesse bei Rechnungsentwürfe das Rechnungsdatum zu ändern. Dadurch entstehen 
+  # ungültige Belege. Vielleicht geht es anderen ähnlich jan 19.2.2011
+  $form->{invdate} = $form->current_date(\%myconfig); # Aktuelles Rechnungsdatum  ...
+  $form->{duedate} = $form->current_date(\%myconfig); # Aktuelles Fälligkeitsdatum  ...
   update();
 
   $main::lxdebug->leave_sub();
diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl
index 5aee28b5d..fb065f254 100644
--- a/bin/mozilla/licenses.pl
+++ b/bin/mozilla/licenses.pl
@@ -325,7 +325,7 @@ sub add {
 
   $form->{title} = $locale->text('Add License');
 
-  if (!$::lx_office_conf{system}->{lizenzen}) {
+  if (!$::lx_office_conf{features}->{lizenzen}) {
     $form->error(
                  $locale->text(
                    'The licensing module has been deactivated in the configuration.')
@@ -518,7 +518,7 @@ sub search {
 
   $form->{title} = $locale->text('Licenses');
 
-  if (!$::lx_office_conf{system}->{lizenzen}) {
+  if (!$::lx_office_conf{features}->{lizenzen}) {
     $form->error(
                  $locale->text(
                    'The licensing module has been deactivated in the configuration.')
diff --git a/config/lx_office.conf.default b/config/lx_office.conf.default
index b4d4471f7..1972e9530 100644
--- a/config/lx_office.conf.default
+++ b/config/lx_office.conf.default
@@ -58,7 +58,7 @@ bind_password =
 
 [system]
 # EUR: Einnahmen-Überschussrechnung (net income method). Set this to 1
-# if your company uses the net income method and to 0 for balacing.
+# if your company uses the net income method and to 0 for balancing.
 eur = 1
 
 # Set language for login and admin forms. Currently "de" (German),
diff --git a/doc/changelog b/doc/changelog
index 0311afec7..520aa2774 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -2,6 +2,16 @@
 # Veränderungen von Lx-Office ERP #
 ###################################
 
+  ab Feb 2011 Release 2.7-unstable
+
+
+
+  Kleinere neue Features und Detailverbesserungen:
+
+  - Beim Laden von Rechnungsentwürfen, das Fälligkeits- und Rechnungsdatum duch
+    das Tagesdatum ersetzen
+
+
 2011-02-02 - Release 2.6.2
 
   Größere neue Features: