From: Jan Büren <jan@kivitendo-premium.de>
Date: Tue, 13 Jan 2015 12:19:47 +0000 (+0100)
Subject: Falsche Reihenfolge der orderitems-value in OE.pm
X-Git-Tag: release-3.2.0beta~91^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7e64504f67374e38f98535bf7cd5d6358e061fa2;p=kivitendo-erp.git

Falsche Reihenfolge der orderitems-value in OE.pm

Kleiner Projekt-Merge Fehler.
Falsch:  (lastcost, active_price_source, price_factor_id)
Richtig: (lastcost, price_factor_id, active_price_source)
---

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),
       );