2 Felder noch on die Auftragssuche übernommen.

diff --git a/SL/OE.pm b/SL/OE.pm
index fe293612a0002e928b0390ff40f64bc710e0adbd..739d8a017c0ffdf441ed56de201cdd02aeba1106 100644 (file)
--- 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 c55689e72ff1a48b2a5e6c1fb7f753101e95a5ed..3017456d2cf452fcfa4f9325b44d295d5b1681a0 100644 (file)
--- 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 b51bda170844552bf9daef71a304cc1383dd6be9..1a66e0027160e60607f10abea587a6df15eea1de 100644 (file)
--- 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ängigkeit \'%s\'.',
   'Value'                       => 'Wert',

diff --git a/locale/de/oe b/locale/de/oe
index 2f5b23ec25406bc54afa918ddb55ddca605dbe61..1043f4846895de8238bd194c8e56cac4f9646793 100644 (file)
--- 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ängigkeit \'%s\'.',
   'Value'                       => 'Wert',

diff --git a/locale/de/todo b/locale/de/todo
index 86131d812ac6a77e8194bfabd9356bf309ca76a2..5009eb7a5654bb42a43cc38caef5983433044177 100644 (file)
--- 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ängigkeit \'%s\'.',
   'Value'                       => 'Wert',

diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
index cc271283a6fd8fefbab6bb190e33dcb783f22757..363a3e46b11a97122e426e47c28db9e1efeb5586 100644 (file)
--- 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 3d69965cd2741b2e847bf5e3ee4b7cb40d0a5856..47de1246ccf8393e70392be5e7a426d56da0784e 100644 (file)
--- 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 %]