From: Jan Büren <information@richardson-bueren.de>
Date: Mon, 11 May 2009 18:31:09 +0000 (+0000)
Subject: Bei Erzeugnissen wurde bisher nur der VK addiert und ferner dann noch der VK-Preis... 
X-Git-Tag: release-2.6.0rc1~90
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b3eb24ef367a8702a5535558cfaa8ebc5d297f2e;p=kivitendo-erp.git

Bei Erzeugnissen wurde bisher nur der VK addiert und ferner dann noch der VK-Preis obendrauf für die Gesamtsumme. Interessant ist aber 'laut Kundenmeinung' und 1h Diskussion, ob sich um einen Produktfehler handelt und was EDV-Dienstleistung gewährleistet und was nicht, der EK und der VK ist demnach ein Fehler. ;-). Gut. Erweitert wurde die Maske Erzeugnis um die Anzeige des EKs der Einzelwaren und die Summierung, analog zu dem 'alten' VK
---

diff --git a/SL/IC.pm b/SL/IC.pm
index 6fa45dc10..f025663da 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -79,7 +79,7 @@ sub get_part {
     # retrieve assembly items
     $query =
       qq|SELECT p.id, p.partnumber, p.description,
-           p.sellprice, p.weight, a.qty, a.bom, p.unit,
+           p.sellprice, p.lastcost, p.weight, a.qty, a.bom, p.unit,
            pg.partsgroup
          FROM parts p
          JOIN assembly a ON (a.parts_id = p.id)
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 5f16184e8..547acf7df 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1515,7 +1515,7 @@ sub assembly_row {
   our ($deliverydate); # ToDO: cjeck if this indeed comes from global context
 
   @column_index =
-    qw(runningnumber qty unit bom partnumber description partsgroup total);
+    qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
 
   if ($form->{previousform}) {
     $nochange     = 1;
@@ -1544,6 +1544,7 @@ sub assembly_row {
     $form->{callback} = $callback;
 
     $form->{assemblytotal} = 0;
+    $form->{assembly_purchase_price_total} = 0;
     $form->{weight}        = 0;
 
   }
@@ -1559,6 +1560,8 @@ sub assembly_row {
     . qq|</th>|;
   $column_header{description} =
     qq|<th nowrap width=50%>| . $locale->text('Part Description') . qq|</th>|;
+  $column_header{lastcost} =
+    qq|<th nowrap width=50%>| . $locale->text('Purchase Price') . qq|</th>|;
   $column_header{total} =
     qq|<th align=right nowrap>| . $locale->text('Extended') . qq|</th>|;
   $column_header{bom}        = qq|<th>| . $locale->text('BOM') . qq|</th>|;
@@ -1585,11 +1588,15 @@ sub assembly_row {
 
     $linetotal =
       $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+    $line_purchase_price  = 
+      $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"}, 2); #lastcost == purchase_price | ungenaue datenbankfeld-übersetzung
     $form->{assemblytotal} += $linetotal;
+    $form->{assembly_purchase_price_total}  += $line_purchase_price;
 
     $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
 
     $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
+    $line_purchase_price = $form->format_amount(\%myconfig, $line_purchase_price, 2);
 
     if (($i >= 1) && ($i == $numrows)) {
 
@@ -1651,6 +1658,7 @@ sub assembly_row {
         qq|<td><input type=hidden name="description_$i" value="$form->{"description_$i"}">$form->{"description_$i"}</td>|;
     }
 
+    $column_data{lastcost} = qq|<td align=right>$line_purchase_price</td>|;
     $column_data{total} = qq|<td align=right>$linetotal</td>|;
 
     $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
diff --git a/templates/webpages/ic/form_footer_de.html b/templates/webpages/ic/form_footer_de.html
index a065eb352..78247e9d3 100644
--- a/templates/webpages/ic/form_footer_de.html
+++ b/templates/webpages/ic/form_footer_de.html
@@ -3,10 +3,10 @@
   [%- IF item == 'assembly' %]
   <tr>
     <td>
-      <table width="100%">
+      <table border="0" width="100%">
         <tr>
-          <th colspan="2" align="right">Summe</th>
-          <th align="right">[% LxERP.format_amount(assemblytotal, 2) %]</th>
+          <th colspan="2" align=right>Summe&nbsp;</th>
+	  <th align=right>Purchase Price:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  Verkaufspreis: [% LxERP.format_amount(assemblytotal, 2) %]</th>
         </tr>
       </table>
     </td>
diff --git a/templates/webpages/ic/form_footer_master.html b/templates/webpages/ic/form_footer_master.html
index d041971b0..d5904f2c0 100644
--- a/templates/webpages/ic/form_footer_master.html
+++ b/templates/webpages/ic/form_footer_master.html
@@ -3,10 +3,10 @@
   [%- IF item == 'assembly' %]
   <tr>
     <td>
-      <table width="100%">
+      <table border="0" width="100%">
         <tr>
-          <th colspan="2" align="right"><translate>Total</translate></th>
-          <th align="right">[% LxERP.format_amount(assemblytotal, 2) %]</th>
+          <th colspan="2" align=right><translate>Total</translate>&nbsp;</th>
+	  <th align=right><translate>Purchase Price</translate>:[% LxERP.format_amount(assembly_purchase_price_total, 2) %]  <translate>Sell Price</translate>: [% LxERP.format_amount(assemblytotal, 2) %]</th>
         </tr>
       </table>
     </td>