From: Bernd Blessmann <bibi@online.de>
Date: Wed, 17 Aug 2011 05:32:50 +0000 (+0200)
Subject: Listenpreis wird beim Laden von Verkaufsformularen gesetzt.
X-Git-Tag: release-2.7.0beta1~331
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=64515aa9139169c53f02565f3fb492393d179c45;p=kivitendo-erp.git

Listenpreis wird beim Laden von Verkaufsformularen gesetzt.

Vorher war der immer 0. Jetzt wird aus parts gesetzt. In den
Tabellen der Verkaufsdokumente ist er nicht drin, wird dort
also nicht gespeichert.
---

diff --git a/SL/DO.pm b/SL/DO.pm
index 841f454db..f6c56b6f8 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -663,7 +663,7 @@ sub retrieve {
   # stuff different from the whole will not be overwritten, but saved with a suffix.
   $query =
     qq|SELECT doi.id AS delivery_order_items_id,
-         p.partnumber, p.assembly, doi.description, doi.qty,
+         p.partnumber, p.assembly, p.listprice, doi.description, doi.qty,
          doi.sellprice, doi.parts_id AS id, doi.unit, doi.discount, p.bin, p.notes AS partnotes,
          doi.reqdate, doi.project_id, doi.serialnumber, doi.lastcost,
          doi.ordnumber, doi.transdate, doi.cusordnumber, doi.longdescription,
@@ -860,7 +860,6 @@ sub order_details {
           $sameitem = ($ref->{partsgroup}) ? $ref->{partsgroup} : "--";
           push(@{ $form->{description} }, $sameitem);
         }
-
         push(@{ $form->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq|, $ref->{partnumber}, $ref->{description}|);
 
         map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
diff --git a/SL/IS.pm b/SL/IS.pm
index f324ee48d..35a902e8b 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -1514,7 +1514,7 @@ sub retrieve_invoice {
            i.description, i.longdescription, i.qty, i.fxsellprice AS sellprice, i.discount, i.parts_id AS id, i.unit, i.deliverydate AS reqdate,
            i.project_id, i.serialnumber, i.id AS invoice_pos, i.pricegroup_id, i.ordnumber, i.transdate, i.cusordnumber, i.subtotal, i.lastcost,
            i.price_factor_id, i.price_factor, i.marge_price_factor,
-           p.partnumber, p.assembly, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, p.formel,
+           p.partnumber, p.assembly, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id, p.formel, p.listprice,
            pr.projectnumber, pg.partsgroup, prg.pricegroup
 
          FROM invoice i
diff --git a/SL/OE.pm b/SL/OE.pm
index 2ff682bde..61360996b 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -869,7 +869,7 @@ sub retrieve {
            c2.accno AS income_accno,    c2.new_chart_id AS income_new_chart,    date($transdate) - c2.valid_from as income_valid,
            c3.accno AS expense_accno,   c3.new_chart_id AS expense_new_chart,   date($transdate) - c3.valid_from as expense_valid,
            oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe,
-           p.partnumber, p.assembly, o.description, o.qty,
+           p.partnumber, p.assembly, p.listprice, o.description, o.qty,
            o.sellprice, o.parts_id AS id, o.unit, o.discount, p.bin, p.notes AS partnotes, p.inventory_accno_id AS part_inventory_accno_id,
            o.reqdate, o.project_id, o.serialnumber, o.ship, o.lastcost,
            o.ordnumber, o.transdate, o.cusordnumber, o.subtotal, o.longdescription,