From 29d636435456494e8dc702ccc1015452a71275d9 Mon Sep 17 00:00:00 2001
From: Philip Reetz
Date: Fri, 13 Jul 2007 13:31:28 +0000
Subject: [PATCH] Fehler in der Datenbankabfrage fuer Lieferungen bei
Kundenstammdaten, Ansicht erweitert um Verkaufspreis
---
SL/CT.pm | 2 +-
bin/mozilla/ct.pl | 7 +++++--
locale/de/ct | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/SL/CT.pm b/SL/CT.pm
index 51c4507a4..dfbbee6cf 100644
--- 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, | .
- qq| invoice.description, invoice.unit | .
+ qq| i.description, i.unit, i.sellprice | .
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 bf2724ca0..4d06662e2 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -1153,7 +1153,8 @@ sub get_delivery {
transdate,
description,
qty,
- unit);
+ unit,
+ sellprice);
@@ -1171,6 +1172,8 @@ sub get_delivery {
qq|| . $locale->text('Qty') . qq| | |;
$column_header{unit} =
qq|| . $locale->text('Unit') . qq| | |;
+ $column_header{sellprice} =
+ qq|| . $locale->text('Sell Price') . qq| | |;
$result .= qq|
@@ -1195,7 +1198,7 @@ sub get_delivery {
} else {
map { $column_data{$_} = "$ref->{$_} | " } @column_index;
}
-
+ $column_data{sellprice} = "". $form->format_amount(\%myconfig,$ref->{sellprice},2)." | ";
$i++;
$i %= 2;
$result .= "
diff --git a/locale/de/ct b/locale/de/ct
index 0ed280ad9..b52a8d951 100644
--- 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',
+ 'Sell Price' => 'Verkaufspreis',
'Shipping Address' => 'Lieferadresse',
'Steuersatz' => 'Steuersatz',
'Storno Invoice' => 'Stornorechnung',
--
2.20.1