From 8e53eafd1ab02a8d310691c245279c732031df3b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stephan=20K=C3=B6hler?= <s.koehler@linet-services.de>
Date: Thu, 12 Jan 2006 13:28:08 +0000
Subject: [PATCH] Merge von 765,768 aus unstable: Bugfix 242 Punkt 3/4 -765
 Korrektur Checkbox in Debitorenrechnungsdialog wurde nicht ueber ein Erneuern
 uebernommen. Siehe Bug 242, 4. -768 Fix fuer Bug 242, tax_$i Werte wurden
 nicht geparst.

---
 SL/AR.pm          | 3 +++
 bin/mozilla/ar.pl | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/SL/AR.pm b/SL/AR.pm
index c2c81e630..e3e363191 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -74,6 +74,9 @@ sub post_transaction {
                           2);
 
     $form->{netamount} += $form->{"amount_$i"};
+
+    # parse tax_$i for later
+    $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"});
   }
 
   # this is for ar
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index bcfd7a3a7..ffb4b1fb3 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -569,13 +569,14 @@ $jsscript
     $tax =~ s/value=\"$tax_selected\"/value=\"$tax_selected\" selected/;
     $tax =
       qq|<td><select id="taxchart_$i" name="taxchart_$i" style="width:200px">$tax</select></td>|;
+    $korrektur_checked = ($form->{"korrektur_$i"}?'checked':'');
 
     print qq|
 	<tr>
           <td width=50%><select name="AR_amount_$i" onChange="setTaxkey(this, $i)" style="width:100%">$selectAR_amount</select></td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
           <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
-          <td><input type="checkbox" name="korrektur_$i" value="1"></td>
+          <td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td>
           $tax
 	  <td><input name="projectnumber_$i" size=20 value="$form->{"projectnumber_$i"}">
 	      <input type=hidden name="project_id_$i" value=$form->{"project_id_$i"}>
-- 
2.20.1