From: Niclas Zimmermann <niclas@lx-office-hosting.de>
Date: Tue, 11 Sep 2012 09:14:38 +0000 (+0200)
Subject: Anzeige von Kundennummmer in Verkauf
X-Git-Tag: release-3.0.0beta1~240
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7d026c7c58d00ec0f48beedf8a8c221738863772;p=kivitendo-erp.git

Anzeige von Kundennummmer in Verkauf

In Verkauf-Berichte-Aufträge/Angebote/Lieferscheine/Rechnungen
kann man jetzt auch die Kundennummer in den Bericht mit aufnehmen.
---

diff --git a/SL/DO.pm b/SL/DO.pm
index 8d61b0f1f..c4303f442 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -62,7 +62,7 @@ sub transactions {
 
   my $query =
     qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.transdate,
-         ct.name, dord.${vc}_id, dord.globalproject_id,
+         ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id,
          dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
          dord.transaction_description,
          pr.projectnumber AS globalprojectnumber,
diff --git a/SL/OE.pm b/SL/OE.pm
index 07758a84d..bdff8cb6b 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -78,7 +78,7 @@ sub transactions {
 
   $query =
     qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
-    qq|  o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
+    qq|  o.amount, ct.${vc}number, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
     qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
     qq|  o.transaction_description, | .
     qq|  o.marge_total, o.marge_percent, | .
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index d58c82653..1bcf20985 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -488,7 +488,7 @@ sub orders {
   my @columns = qw(
     ids                     transdate
     id                      donumber
-    ordnumber
+    ordnumber               customernumber
     name                    employee  salesman
     shipvia                 globalprojectnumber
     transaction_description
@@ -516,6 +516,7 @@ sub orders {
     'id'                      => { 'text' => $locale->text('ID'), },
     'donumber'                => { 'text' => $locale->text('Delivery Order'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
+    'customernumber'          => { 'text' => $locale->text('Customer Number'), },
     'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
     'employee'                => { 'text' => $locale->text('Employee'), },
     'salesman'                => { 'text' => $locale->text('Salesman'), },
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 4eab4dce3..cac445036 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -777,6 +777,7 @@ sub orders {
   my @columns = (
     "transdate",               "reqdate",
     "id",                      $ordnumber,
+    "customernumber", 
     "name",                    "netamount",
     "tax",                     "amount",
     "curr",                    "employee",
@@ -836,6 +837,7 @@ sub orders {
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
     'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
+    'customernumber'          => { 'text' => $locale->text('Customer Number'), },
     'netamount'               => { 'text' => $locale->text('Amount'), },
     'tax'                     => { 'text' => $locale->text('Tax'), },
     'amount'                  => { 'text' => $locale->text('Total'), },
diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 2da933963..89cb50c9c 100644
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -138,6 +138,10 @@
           <tr>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
            <td nowrap>[% 'Customer' | $T8 %]</td>
+           <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Customer Number' | $T8 %]</td>
+          </tr>
+          <tr>
            <td align=right><input name="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
            <td nowrap>[% 'Amount' | $T8 %]</td>
            <td align=right><input name="l_tax" class=checkbox type=checkbox value=Y></td>
diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index 213f962ea..66cd07f4e 100644
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -173,6 +173,13 @@
          <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>
         </td>
+
+        [% IF is_customer %]
+        <td>
+         <input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_customernumber">[% 'Customer Number' | $T8 %]</label>
+        </td>
+        [% END %]
        </tr>
 
        <tr>
diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index fb28ea18a..9282beb95 100644
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -169,6 +169,12 @@
          <label for="l_shipvia">[% 'Ship via' | $T8 %]</label>
         </td>
        </tr>
+       <tr>
+        <td>
+         <input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_customernumber">[% 'Customer Number' | $T8 %]</label>
+        </td>
+       </tr>
        <tr>
         <td>
          <input name="l_netamount" id="l_netamount" class="checkbox" type="checkbox" value="Y">