From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 26 Aug 2009 08:25:57 +0000 (+0200)
Subject: 2 Felder noch on die Auftragssuche übernommen.
X-Git-Tag: release-2.6.1beta1~327
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=15bcb411e920997822f5e931a81acdce709668fb;p=kivitendo-erp.git

2 Felder noch on die Auftragssuche übernommen.
---

diff --git a/SL/OE.pm b/SL/OE.pm
index fe293612a..739d8a017 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -73,7 +73,8 @@ sub transactions {
     qq|  o.marge_total, o.marge_percent, | .
     qq|  ex.$rate AS exchangerate, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
-    qq|  e.name AS employee, s.name AS salesman | .
+    qq|  e.name AS employee, s.name AS salesman, | .
+    qq|  ct.country, ct.ustid  | .
     qq|FROM oe o | .
     qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
     qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index c55689e72..3017456d2 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -681,7 +681,8 @@ sub orders {
     "salesman",
     "shipvia",                 "globalprojectnumber",
     "transaction_description", "open",
-    "delivered", "marge_total", "marge_percent"
+    "delivered", "marge_total", "marge_percent",
+    "country",                 "ustid",
   );
 
   # only show checkboxes if gotten here via sales_order form.
@@ -742,7 +743,9 @@ sub orders {
     'open'                    => { 'text' => $locale->text('Open'), },
     'delivered'               => { 'text' => $locale->text('Delivered'), },
     'marge_total'             => { 'text' => $locale->text('Ertrag'), },
-    'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), }
+    'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
+    'country'                 => { 'text' => $locale->text('Country'), },
+    'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
   );
 
   foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia transaction_description)) {
diff --git a/locale/de/login b/locale/de/login
index b51bda170..1a66e0027 100644
--- a/locale/de/login
+++ b/locale/de/login
@@ -337,6 +337,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
   'Transfer To Stock'           => 'Lagereingang',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
+  'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Value'                       => 'Wert',
diff --git a/locale/de/oe b/locale/de/oe
index 2f5b23ec2..1043f4846 100644
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -310,6 +310,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
   'Transfer To Stock'           => 'Lagereingang',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
+  'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Value'                       => 'Wert',
diff --git a/locale/de/todo b/locale/de/todo
index 86131d812..5009eb7a5 100644
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -333,6 +333,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
   'Transfer To Stock'           => 'Lagereingang',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
+  'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Value'                       => 'Wert',
diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
index cc271283a..363a3e46b 100644
--- a/templates/webpages/oe/search_de.html
+++ b/templates/webpages/oe/search_de.html
@@ -226,6 +226,19 @@
          <label for="l_salesman">Verkäufer/in</label>
         </td>
        </tr>
+       <tr>
+        <td colspan=4 align=left><b>Kunde</td>
+       </tr>
+       <tr>
+		<td>
+         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
+		 <label for="l_country">Land</label>
+        </td>
+		<td>
+         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
+		 <label for="l_ustid">USt-IdNr.</label>
+        </td>
+       </tr>
 [%- IF type == 'sales_order' %]
        <tr><td colspan="3"><hr></td></tr>
 [%- END %]
diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index 3d69965cd..47de1246c 100644
--- a/templates/webpages/oe/search_master.html
+++ b/templates/webpages/oe/search_master.html
@@ -226,6 +226,19 @@
          <label for="l_salesman"><translate>Salesman</translate></label>
         </td>
        </tr>
+       <tr>
+        <td colspan=4 align=left><b><translate>Customer</translate></td>
+       </tr>
+       <tr>
+		<td>
+         <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
+		 <label for="l_country"><translate>Country</translate></label>
+        </td>
+		<td>
+         <input name="l_ustid"  id="l_ustid" class="checkbox" type="checkbox" value="Y">
+		 <label for="l_ustid"><translate>USt-IdNr.</translate></label>
+        </td>
+       </tr>
 [%- IF type == 'sales_order' %]
        <tr><td colspan="3"><hr></td></tr>
 [%- END %]