From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 12 Oct 2012 15:35:16 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~225
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/c42acfd52669057debdf6a3d4245492ef23384b7?hp=55036afce77af5cdd81713edd0f027b6a3bd76d2

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

diff --git a/SL/DN.pm b/SL/DN.pm
index 6d00f438a..94e5b7708 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -483,6 +483,7 @@ sub get_invoices {
     "ordnumber" => "a.ordnumber",
     "invnumber" => "a.invnumber",
     "notes"     => "a.notes",
+    "country"   => "ct.country",
     );
   foreach my $key (keys(%columns)) {
     next unless ($form->{$key});
diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 127eb3c56..5d6524bf8 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -94,7 +94,7 @@ parts_image_css = border:0;float:left;max-width:250px;margin-top:20px:margin-rig
 parts_listing_images = 0
 
 # Should payments be changeable after posting (0 = never; 1 = every time; 2 = on the same day)
-payments_changeable = 1
+payments_changeable = 0
 
 [paths]
 # path to temporary files (must be writeable by the web server)
@@ -216,15 +216,15 @@ email_template = templates/mail/self_test/status_mail.txt
 # you can enable this for each type of record independantly.
 
 # check when a sales invoice or a payment for a sales invoice is posted
-check_on_sales_invoice = 0
+check_on_sales_invoice = 1
 # check when a purchase invoice or a payment for a purchase invoice is posted
-check_on_purchase_invoice = 0
+check_on_purchase_invoice = 1
 # check when an ar transaction is posted
-check_on_ar_transaction = 0
+check_on_ar_transaction = 1
 # check when an ap transaction is posted
-check_on_ap_transaction = 0
+check_on_ap_transaction = 1
 # check when a gl transaction is posted
-check_on_gl_transaction = 0
+check_on_gl_transaction = 1
 
 # not implemented yet:
 #check_on_cash_and_receipt = 0
@@ -252,7 +252,7 @@ log_file = /tmp/kivitendo_console_debug.log
 [testing]
 
 # autologin to use if none is given
-login = demo
+login = myxplace_standard
 
 [debug]
 # Use DBIx::Log4perl for logging DBI calls. The string LXDEBUGFILE
diff --git a/templates/webpages/dunning/add.html b/templates/webpages/dunning/add.html
index 9b6d4e287..da8d94752 100644
--- a/templates/webpages/dunning/add.html
+++ b/templates/webpages/dunning/add.html
@@ -69,6 +69,10 @@
     <th align="right" nowrap>[% 'Notes' | $T8 %]</th>
     <td colspan="3"><input name="notes" size="40"></td>
    </tr>
+   <tr>
+    <th align="right" nowrap>[% 'Country' | $T8 %]</th>
+    <td colspan="3"><input name="country" size="40"></td>
+   </tr>
 
    <tr><td colspan="2"><hr size="3" noshade></td></tr>