From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 13 Jan 2015 16:05:57 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.2.0beta~91
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/0059d08aaede2d031f840f56f1ede523033060b9?hp=349f328708860f2b8402f50d4813f12c90808f9b

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/OE.pm b/SL/OE.pm
index b45449863..a179b2d7e 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -546,10 +546,9 @@ SQL
            $form->{"ordnumber_$i"}, conv_date($form->{"transdate_$i"}),
            $form->{"cusordnumber_$i"}, $form->{"subtotal_$i"} ? 't' : 'f',
            $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
-           $form->{"lastcost_$i"},
+           $form->{"lastcost_$i"}, conv_i($form->{"price_factor_id_$i"}),
            $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
-           conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
-           conv_i($form->{"marge_price_factor_$i"}),
+           conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}),
            conv_i($orderitems_id),
       );