Fehler in der Datenbankabfrage fuer Lieferungen bei Kundenstammdaten, Ansicht erweite...

Verkaufspreis

diff --git a/SL/CT.pm b/SL/CT.pm
index 51c4507a495bb07df4e7b9db8b2f11f2f3e46539..dfbbee6cf3d94a061aed1ff90222f08087b75eab 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -764,7 +764,7 @@ sub get_delivery {
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .
     qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .
     qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .

-    qq|  invoice.description, invoice.unit | .
+    qq|  i.description, i.unit, i.sellprice | .

     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index bf2724ca02e9ca77e4fea5382aee2e9d9ea5b468..4d06662e298ee7cd55d6bf881e966c689ecd373d 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -1153,7 +1153,8 @@ sub get_delivery {
                         transdate,
                         description,
                         qty,
                         transdate,
                         description,
                         qty,

-                        unit);
+                        unit,
+                        sellprice);

 
 
 
 
 
 


@@ -1171,6 +1172,8 @@ sub get_delivery {
     qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
   $column_header{unit} =
     qq|<th class=listheading>| . $locale->text('Unit') . qq|</th>|;
     qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
   $column_header{unit} =
     qq|<th class=listheading>| . $locale->text('Unit') . qq|</th>|;

+  $column_header{sellprice} =
+    qq|<th class=listheading>| . $locale->text('Sell Price') . qq|</th>|;

   $result .= qq|
 
 <table width=100%>
   $result .= qq|
 
 <table width=100%>


@@ -1195,7 +1198,7 @@ sub get_delivery {
     } else {
       map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } @column_index;
     }
     } else {
       map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } @column_index;
     }

-
+    $column_data{sellprice} = "<td>". $form->format_amount(\%myconfig,$ref->{sellprice},2)."&nbsp;</td>";

     $i++;
     $i %= 2;
     $result .= "
     $i++;
     $i %= 2;
     $result .= "

diff --git a/locale/de/ct b/locale/de/ct
index 0ed280ad9d76f6ec2a4b6d7a6b181d3155d2f535..b52a8d951e0eb9660a438739f425ed054b747afa 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -136,6 +136,7 @@ $self->{texts} = {
   'Select a part'               => 'Artikel auswählen',
   'Select a project'            => 'Projekt auswählen',
   'Select an employee'          => 'Angestellten auswählen',
   'Select a part'               => 'Artikel auswählen',
   'Select a project'            => 'Projekt auswählen',
   'Select an employee'          => 'Angestellten auswählen',

+  'Sell Price'                  => 'Verkaufspreis',

   'Shipping Address'            => 'Lieferadresse',
   'Steuersatz'                  => 'Steuersatz',
   'Storno Invoice'              => 'Stornorechnung',
   'Shipping Address'            => 'Lieferadresse',
   'Steuersatz'                  => 'Steuersatz',
   'Storno Invoice'              => 'Stornorechnung',