projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8145351)
Kundennummer in Auftragssuche in vcnumber umbenannt um Lieferantenaufträge mit abzude...
authorDavid Ohlbrecht <ohlbrecht@ok-it-services.de>
Thu, 19 Nov 2009 09:24:45 +0000 (10:24 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 19 Nov 2009 09:26:02 +0000 (10:26 +0100)
Fix für Bugs 1264 und 1266.

SL/OE.pm patch | blob | history
bin/mozilla/oe.pl patch | blob | history
templates/webpages/oe/search_de.html patch | blob | history
templates/webpages/oe/search_master.html patch | blob | history

diff --git a/SL/OE.pm b/SL/OE.pm
index dcfca7a..1bf8a71 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -90,7 +90,7 @@ sub transactions {
     qq|  ex.$rate AS exchangerate, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  e.name AS employee, s.name AS salesman, | .
-    qq|  ct.customernumber, ct.country, ct.ustid  | .
+    qq|  ct.${vc}number AS vcnumber, 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 d33db62..f05bcfb 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -745,7 +745,7 @@ sub orders {
     "shipvia",                 "globalprojectnumber",
     "transaction_description", "open",
     "delivered", "marge_total", "marge_percent",
-    "customernumber",          "ustid",
+    "vcnumber",                "ustid",
     "country",
   );
 
@@ -808,7 +808,7 @@ sub orders {
     'delivered'               => { 'text' => $locale->text('Delivered'), },
     'marge_total'             => { 'text' => $locale->text('Ertrag'), },
     'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
-    'customernumber'                 => { 'text' => $locale->text('Customer Number'), },
+    'vcnumber'                => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
     'country'                 => { 'text' => $locale->text('Country'), },
     'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
   );
diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
index d2cca79..0ebe9e0 100644 (file)
--- a/templates/webpages/oe/search_de.html
+++ b/templates/webpages/oe/search_de.html
@@ -1,5 +1,6 @@
 [%- USE HTML %]
 [%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %]
+[%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %]
 <body>
 
 <form method="post" action="oe.pl">
@@ -227,12 +228,12 @@
         </td>
        </tr>
        <tr>
-        <td colspan=4 align=left><b>Kunde</td>
+        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
        </tr>
        <tr>
         <td>
-         <input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_customernumber">Kundennummer</label>
+         <input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
         </td>
         <td>
          <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index 9a3df39..cc0a2cb 100644 (file)
--- a/templates/webpages/oe/search_master.html
+++ b/templates/webpages/oe/search_master.html
@@ -1,5 +1,6 @@
 [%- USE HTML %]
 [%- SET vclabel = vc == 'customer' ? '<translate>Customer</translate>' : '<translate>Vendor</translate>' %]
+[%- SET vcnumberlabel = vc == 'customer' ? '<translate>Customer Number</translate>' : '<translate>Vendor Number</translate>' %]
 <body>
 
 <form method="post" action="oe.pl">
@@ -227,12 +228,12 @@
         </td>
        </tr>
        <tr>
-        <td colspan=4 align=left><b><translate>Customer</translate></td>
+        <td colspan=4 align=left><b>[% HTML.escape(vclabel) %]</td>
        </tr>
        <tr>
         <td>
-         <input name="l_customernumber" id="l_customernumber" class="checkbox" type="checkbox" value="Y">
-         <label for="l_customernumber"><translate>Customer Number</translate></label>
+         <input name="l_vcnumber" id="l_vcnumber" class="checkbox" type="checkbox" value="Y">
+         <label for="l_vcnumber">[% HTML.escape(vcnumberlabel) %]</label>
         </td>
         <td>
          <input name="l_country" id="l_country" class="checkbox" type="checkbox" value="Y">
Unnamed repository; edit this file 'description' to name the repository.