From: Holger Lindemann <hli@lx-system.de>
Date: Wed, 29 Nov 2006 13:24:41 +0000 (+0000)
Subject: Kundenspezifische Felder mit Schalter ausblenden
X-Git-Tag: release-2.4.0^2~149
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=833972cfaec59768a582d2e7dfe8f2904605db36;p=kivitendo-erp.git

Kundenspezifische Felder mit Schalter ausblenden
---

diff --git a/SL/CT.pm b/SL/CT.pm
index f5729927e..246a5fea6 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -875,9 +875,10 @@ sub get_delivery {
   if ($form->{to}) {
     $where .= "AND $tabelle.transdate <= '$form->{to}' ";
   }
-  my $query = qq|select shiptoname, $tabelle.transdate, $tabelle.invnumber, $tabelle.ordnumber, invoice.description, qty, invoice.unit FROM $tabelle LEFT JOIN shipto ON |;
+  if ($kdspez1) { $adr_code="adr_code, "; }
+  my $query = qq|select shiptoname, $adr_code $tabelle.transdate, $tabelle.invnumber, $tabelle.ordnumber, invoice.description, qty, invoice.unit FROM $tabelle LEFT JOIN shipto ON |;
   $query .= ($tabelle eq "ar") ? qq|($tabelle.shipto_id=shipto.shipto_id) |:qq|($tabelle.id=shipto.trans_id) |;
-  $query .=qq|LEFT join invoice on ($tabelle.id=invoice.trans_id) LEFT join parts ON (parts.id=invoice.parts_id) $where ORDER BY $tabelle.transdate DESC LIMIT 15|;
+  $query .=qq|LEFT join invoice on ($tabelle.id=invoice.trans_id) LEFT join parts ON (parts.id=invoice.parts_id) LEFT join adr ON (parts.adr_id=adr.id) $where ORDER BY $tabelle.transdate DESC LIMIT 15|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
@@ -891,5 +892,35 @@ sub get_delivery {
   $main::lxdebug->leave_sub();
 }
 
+sub adr {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+  my $dbh   = $form->dbconnect($myconfig);
+  $where = " WHERE 1=1 ";
+  if ($form->{from}) {
+    $where .= "AND ar.transdate >= '$form->{from}' ";
+  }
+  if ($form->{to}) {
+    $where .= "AND ar.transdate <= '$form->{to}' ";
+  }
+  if ($form->{year}) {
+    $where = " WHERE ar.transdate >= '$form->{year}-01-01' AND ar.transdate <= '$form->{year}-12-31' ";
+  }
+
+  my $query = qq|select adr_code, adr_description, sum(base_qty), parts.unit from ar LEFT join invoice on (ar.id=invoice.trans_id) LEFT join parts ON (invoice.parts_id=parts.id) LEFT join adr ON (adr.id=parts.adr_id) $where GROUP BY adr_code,adr_description,parts.unit|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute || $form->dberror($query);
+
+
+  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+    push @{ $form->{ADR} }, $ref;
+  }
+  $sth->finish;
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+
 1;