From 1936914faa606aa5114592851c0d94913f6a005d Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 11 Jan 2007 14:56:50 +0000
Subject: [PATCH] =?utf8?q?OE->save()=20parst=20verschiedene=20Zahlen.=20Da?=
 =?utf8?q?s=20ist=20beim=20Umwandeln=20in=20anderen=20Formulartypen=20sehr?=
 =?utf8?q?=20ung=C3=BCnstig.=20Beim=20Umwandeln=20von=20Angebot=20in=20Auf?=
 =?utf8?q?trag=20soll=20aber=20nur=20das=20Angebot=20geschlossen=20werden.?=
 =?utf8?q?=20Ausserdem:=20Umwandeln=20in=20Rechnung=20erfordert=20ebenfall?=
 =?utf8?q?s=20ein=20Parsen=20der=20Zahlen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/oe.pl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index e281da720..2537eaf22 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -2165,8 +2165,7 @@ sub invoice {
   # if not it's most likely a collective order, which can't be saved back
   # so they just have to be closed
   if (($form->{ordnumber} ne '') || ($form->{quonumber} ne '')) {
-    relink_accounts();
-    OE->save(\%myconfig, \%$form);
+    OE->close_order(\%myconfig, \%$form);
   } else {
     OE->close_orders(\%myconfig, \%$form);
   }
@@ -2231,6 +2230,13 @@ sub invoice {
 
   $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});
 
+  for $i (1 .. $form->{rowcount}) {
+    map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig,
+                                                     $form->{"${_}_${i}"})
+            if ($form->{"${_}_${i}"}) }
+        qw(ship qty sellprice listprice basefactor));
+  }
+
   &prepare_invoice;
 
   # format amounts
-- 
2.20.1