From: G. Richardson <information@lx-office-hosting.de>
Date: Wed, 3 Mar 2010 12:22:26 +0000 (+0100)
Subject: Merge branch 'gutschriftbuchung'
X-Git-Tag: release-2.6.1beta1~48^2~2^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f536ffb111b455f830b26add666faaeda56f101f?hp=7d304ef4f91749dc02b29bb9bdfa1b0285dedb1f

Merge branch 'gutschriftbuchung'
---

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index b90209f94..8e2046897 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -860,6 +860,9 @@ sub credit_note {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
+  open(FH, ">/tmp/lx.dump"); 
+  print FH Dumper($form);
+  close FH;
   $main::auth->assert('invoice_edit');
 
   $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
@@ -898,6 +901,16 @@ sub credit_note {
 
   $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
 
+  # bei Gutschriften werden Zahlungseingänge aus Rechnung nicht übernommen
+  for my $i (1 .. $form->{paidaccounts}) {
+    delete $form->{"paid_$i"};
+    delete $form->{"source_$i"};
+    delete $form->{"memo_$i"};
+    delete $form->{"datepaid_$i"};
+    delete $form->{"AR_paid_$i"};
+  };
+  $form->{paidaccounts} = 1;
+
   &prepare_invoice;