From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 4 Mar 2010 09:17:31 +0000 (+0100)
Subject: "Firmenname" durch "Kundenname"/"Lieferantenname" in Stammdatenmasken ersetzt
X-Git-Tag: release-2.6.1beta1~36^2~2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6156d51ea0360382df95007e10a874f24f4dd81a;p=kivitendo-erp.git

"Firmenname" durch "Kundenname"/"Lieferantenname" in Stammdatenmasken ersetzt

Fix für Bug 1198.
---

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 0130a464b..c2d3b9069 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -156,7 +156,7 @@ sub list_names {
   my %column_defs = (
     'id'                => { 'text' => $locale->text('ID'), },
     "$form->{db}number" => { 'text' => $locale->text('Number'), },
-    'name'              => { 'text' => $locale->text('Name'), },
+    'name'              => { 'text' => $form->{IS_CUSTOMER} ? $::locale->text('Customer Name') : $::locale->text('Vendor Name'), },
     'contact'           => { 'text' => $locale->text('Contact'), },
     'phone'             => { 'text' => $locale->text('Phone'), },
     'fax'               => { 'text' => $locale->text('Fax'), },
diff --git a/locale/de/all b/locale/de/all
index 6e5956400..78cd7268c 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -442,6 +442,7 @@ $self->{texts} = {
   'Custom Variables'            => 'Benutzerdefinierte Variablen',
   'Custom variables for module' => 'Benutzerdefinierte Variablen für Modul',
   'Customer'                    => 'Kunde',
+  'Customer Name'               => 'Kundenname',
   'Customer Number'             => 'Kundennummer',
   'Customer Order Number'       => 'Bestellnummer des Kunden',
   'Customer deleted!'           => 'Kunde gelöscht!',
@@ -1774,6 +1775,7 @@ $self->{texts} = {
   'Vendor'                      => 'Lieferant',
   'Vendor Invoice'              => 'Einkaufsrechnung',
   'Vendor Invoices'             => 'Einkaufsrechnungen',
+  'Vendor Name'                 => 'Lieferantenname',
   'Vendor Number'               => 'Lieferantennummer',
   'Vendor Order Number'         => 'Bestellnummer beim Lieferanten',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
diff --git a/locale/de/ct b/locale/de/ct
index 5e9976721..31ba2cf88 100644
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -60,6 +60,7 @@ $self->{texts} = {
   'Create and edit vendor invoices' => 'Eingangsrechnungen erfassen und bearbeiten',
   'Credit Note'                 => 'Gutschrift',
   'Customer'                    => 'Kunde',
+  'Customer Name'               => 'Kundenname',
   'Customer Number'             => 'Kundennummer',
   'Customer deleted!'           => 'Kunde gelöscht!',
   'Customer details'            => 'Kundendetails',
@@ -171,6 +172,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Lieferant',
   'Vendor Invoice'              => 'Einkaufsrechnung',
+  'Vendor Name'                 => 'Lieferantenname',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor saved!'               => 'Lieferant gespeichert!',
diff --git a/templates/webpages/ct/form_header_de.html b/templates/webpages/ct/form_header_de.html
index 7ba33321c..4113f0d77 100644
--- a/templates/webpages/ct/form_header_de.html
+++ b/templates/webpages/ct/form_header_de.html
@@ -73,7 +73,7 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap>Firmenname</th>
+      <th align="right" nowrap>[% IF is_customer %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 
diff --git a/templates/webpages/ct/form_header_master.html b/templates/webpages/ct/form_header_master.html
index ffe9c6976..33ecfef27 100644
--- a/templates/webpages/ct/form_header_master.html
+++ b/templates/webpages/ct/form_header_master.html
@@ -73,7 +73,7 @@
      </tr>
 
      <tr>
-      <th align="right" nowrap><translate>Company Name</translate></th>
+      <th align="right" nowrap>[% IF is_customer %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
       <td><input name="name" size="35" maxlength="75" value="[% HTML.escape(name) %]"></td>
      </tr>
 
diff --git a/templates/webpages/ct/search_de.html b/templates/webpages/ct/search_de.html
index ea5222e81..07734787f 100644
--- a/templates/webpages/ct/search_de.html
+++ b/templates/webpages/ct/search_de.html
@@ -13,7 +13,7 @@
    </tr>
 
    <tr>
-    <th align="right" nowrap>Firmenname</th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
@@ -86,7 +86,7 @@
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name">Firmenname</label>
+        <label for="l_name">[% IF IS_CUSTOMER %]Kundenname[%- ELSE %]Lieferantenname[%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>
diff --git a/templates/webpages/ct/search_master.html b/templates/webpages/ct/search_master.html
index 6d0e6daf7..b54a864c7 100644
--- a/templates/webpages/ct/search_master.html
+++ b/templates/webpages/ct/search_master.html
@@ -13,7 +13,7 @@
    </tr>
 
    <tr>
-    <th align="right" nowrap><translate>Company Name</translate></th>
+    <th align="right" nowrap>[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</th>
     <td><input name="name" size="35"></td>
    </tr>
 
@@ -86,7 +86,7 @@
        </td>
        <td>
         <input name="l_name" id="l_name" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_name"><translate>Company Name</translate></label>
+        <label for="l_name">[% IF IS_CUSTOMER %]<translate>Customer Name</translate>[%- ELSE %]<translate>Vendor Name</translate>[%- END %]</label>
        </td>
        <td>
         <input name="l_street" id="l_street" type="checkbox" class="checkbox" value="Y" checked>