From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Fri, 30 Aug 2013 12:59:48 +0000 (+0200)
Subject: Rabatt in Kunden-/Lieferanten-Bericht mit aufnehmen können.
X-Git-Tag: release-3.1.0beta1~71
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=880122f8e55b8817d0e7c59bece8f3a556e49d49;p=kivitendo-erp.git

Rabatt in Kunden-/Lieferanten-Bericht mit aufnehmen können.
---

diff --git a/SL/CT.pm b/SL/CT.pm
index 44707f91b..cae50f0fb 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -634,6 +634,7 @@ sub search {
       "zipcode"            => "ct.zipcode",
       "city"               => "ct.city",
       "country"            => "ct.country",
+      "discount"           => "ct.discount",
       "salesman"           => "e.name"
     );
 
@@ -649,7 +650,7 @@ sub search {
   }
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
 
-  if ($sortorder !~ /(business|id)/ && !$join_records) {
+  if ($sortorder !~ /(business|id|discount)/ && !$join_records) {
     $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";
diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 256eb45a1..513a7ff21 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -170,7 +170,7 @@ sub list_names {
   }
 
   my @columns = (
-    'id',        'name',      "$form->{db}number",   'contact',   'phone',
+    'id',        'name',      "$form->{db}number",   'contact',   'phone',    'discount',
     'fax',       'email',     'taxnumber',           'street',    'zipcode' , 'city',
     'business',  'invnumber', 'ordnumber',           'quonumber', 'salesman', 'country'
   );
@@ -200,6 +200,7 @@ sub list_names {
     'city'              => { 'text' => $locale->text('City'), },
     'country'           => { 'text' => $locale->text('Country'), },
     'salesman'          => { 'text' => $locale->text('Salesman'), },
+    'discount'          => { 'text' => $locale->text('Discount'), },
     %column_defs_cvars,
   );
 
@@ -268,6 +269,7 @@ sub list_names {
 
     if ($ref->{id} ne $previous_id) {
       $previous_id = $ref->{id};
+      $ref->{discount} = $form->format_amount(\%myconfig, $ref->{discount} * 100.0, 2);
       map { $row->{$_}->{data} = $ref->{$_} } @columns;
 
       $row->{name}->{link}  = build_std_url('script=controller.pl', 'action=CustomerVendor/edit', 'id=' . E($ref->{id}), 'callback', @hidden_nondefault);
diff --git a/templates/webpages/ct/search.html b/templates/webpages/ct/search.html
index 617925e9d..2a7748c58 100644
--- a/templates/webpages/ct/search.html
+++ b/templates/webpages/ct/search.html
@@ -154,14 +154,18 @@
         <label for="l_country">[% 'Country' | $T8 %]</label>
       </td>
       </tr>
-      [% IF IS_CUSTOMER %]
       <tr>
        <td>
-        <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
-        <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+        <input name="l_discount" id="l_discount" type="checkbox" class="checkbox" value="Y">
+        <label for="l_discount">[% 'Discount' | $T8 %]</label>
        </td>
-      </tr>
+      [% IF IS_CUSTOMER %]
+      <td>
+       <input name="l_salesman" id="l_salesman" type="checkbox" class="checkbox" value="Y">
+       <label for="l_salesman">[% 'Salesman' | $T8 %]</label>
+      </td>
       [% END %]
+      </tr>
 
       [% CUSTOM_VARIABLES_INCLUSION_CODE %]