"Bestellnummer des Kunden" bei Lieferantenlieferscheinen in "Bestellnummer beim Liefe...

Fix für Bug 1177.

diff --git a/doc/changelog b/doc/changelog
index bb2de11b446f30874df520e05d14b345c778c36b..b26b855c34d12eebb234b3e3fbd78026edf9c825 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -161,7 +161,7 @@
   922 940 1024 1025 1028 1030 1031 1034 1035 1037 1040 1043 1044 1046
   1051 1055 1057 1058 1072 1073 1077 1081 1082 1095 1098 1100 1101
   1108 1110 1118 1125 1127 1130 1133 1136 1138 1147 1150 1151 1155
-  1164 1186 1190 1191 1199 1201
+  1164 1177 1186 1190 1191 1199 1201
 
 
 2009-06-02 - Version 2.6.0

diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index b2b90cdcbcacbcdb42192d2bed49ea83a4f2c993..5120d5b4b411e631adf5fcb77761ec2a8294a043 100644 (file)
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -1179,6 +1179,10 @@ td {
  <p>
   <table border="1">
    <tr><th>Variablenname</th><th>Bedeutung</th></tr>
+   <tr>
+    <td><code>cusordnumber</code></td>
+    <td>Bestellnummer des Kunden (im Verkauf) bzw. Bestellnummer des Lieferanten (im Einkauf)</td>
+   </tr>
    <tr>
     <td><code>donumber</code></td>
     <td>Lieferscheinnummer</td>

diff --git a/locale/de/all b/locale/de/all
index 0bdf41d6c8d22d1145206497818018411656d6a1..60a86bbf1230c6411aa5b20f3ee68b6c108e469f 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1771,6 +1771,7 @@ $self->{texts} = {
   'Vendor Invoice'              => 'Einkaufsrechnung',
   'Vendor Invoices'             => 'Einkaufsrechnungen',
   'Vendor Number'               => 'Lieferantennummer',
+  'Vendor Ordner Number'        => 'Bestellnummer beim Lieferanten',
   'Vendor deleted!'             => 'Lieferant gelöscht!',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor missing!'             => 'Lieferant fehlt!',

diff --git a/templates/webpages/do/form_header_de.html b/templates/webpages/do/form_header_de.html
index a29e0e969420eea70980c5ffc53d101c39bb8fa1..372227855b69602a016c0a23c32bc03aeedbee4b 100644 (file)
--- a/templates/webpages/do/form_header_de.html
+++ b/templates/webpages/do/form_header_de.html
@@ -318,7 +318,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]Bestellnummer des Kunden[% ELSE %]Bestellnummer beim Lieferanten[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>
 

diff --git a/templates/webpages/do/form_header_master.html b/templates/webpages/do/form_header_master.html
index ce7f57a303d187008bcb890a3f591c57c0a5e5d8..3e7c02dd52fdd4fce703aca3609ae7f121409f87 100644 (file)
--- a/templates/webpages/do/form_header_master.html
+++ b/templates/webpages/do/form_header_master.html
@@ -318,7 +318,7 @@
        </tr>
 
        <tr>
-        <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
+        <th width="70%" align="right" nowrap>[% IF is_customer %]<translate>Customer Order Number</translate>[% ELSE %]<translate>Vendor Ordner Number</translate>[% END %]</th>
         <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"[% RO %]></td>
        </tr>