From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 6 Nov 2009 12:17:03 +0000 (+0100)
Subject: is_templates: Kundenauswahl ohne dropdown fix.
X-Git-Tag: release-2.6.1beta1~112
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a818dbfa04276f3adb49e8f47cd4521a25e8e510;p=kivitendo-erp.git

is_templates: Kundenauswahl ohne dropdown fix.
---

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d6c5d8b1b..797c26002 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -168,8 +168,15 @@ sub invoice_links {
     $form->{customer}         = qq|$form->{customer}--$form->{"customer_id"}|;
   }
 
-  $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
-  $form->{selectcustomer} = 1;
+  $form->{"oldcustomer"}  = $form->{customer};
+
+  if ($form->{"oldcustomer"} !~ m/--\d+$/ && $form->{"customer_id"}) {
+    $form->{"oldcustomer"} .= qq|--$form->{"customer_id"}|
+  }
+
+
+#  $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
+#  $form->{selectcustomer} = 1;
 
   $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
diff --git a/locale/de/dn b/locale/de/dn
index 45e3c04be..beedc7dbd 100644
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -218,9 +218,9 @@ $self->{texts} = {
   'SAVED FOR DUNNING'           => 'Gespeichert',
   'SCREENED'                    => 'Angezeigt',
   'Sales Invoice'               => 'Rechnung',
-  'Salesperson'                 => 'Verkäufer/in',
   'Sales Order'                 => 'Kundenauftrag',
   'Sales quotation'             => 'Angebot',
+  'Salesperson'                 => 'Verkäufer',
   'Screen'                      => 'Bildschirm',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a customer'           => 'Einen Kunden ausw&auml;hlen',
diff --git a/templates/webpages/dunning/search_de.html b/templates/webpages/dunning/search_de.html
index 5bd1b9d0d..d9b10b0e4 100644
--- a/templates/webpages/dunning/search_de.html
+++ b/templates/webpages/dunning/search_de.html
@@ -105,8 +105,6 @@
       <tr>
        <th align="right" nowrap>Alte Mahnungen anzeigen</th>
        <td><input type="checkbox" value="1" name="showold"></td>
-       <th align="right" nowrap>Verk&auml;ufer anzeigen</th>
-       <td><input type="checkbox" value="1" name="l_salesman"></td>
       </tr>
      </table>
     </td>
diff --git a/templates/webpages/is/form_header_de.html b/templates/webpages/is/form_header_de.html
index 6cab7ad6b..f519ce2d0 100644
--- a/templates/webpages/is/form_header_de.html
+++ b/templates/webpages/is/form_header_de.html
@@ -7,6 +7,7 @@
 <script type="text/javascript" src="js/vendor_selection.js"></script>
 <script type="text/javascript" src="js/calculate_qty.js"></script>
 <script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
 
 <form method="post" name="invoice" action="[% script %]">
 
diff --git a/templates/webpages/is/form_header_master.html b/templates/webpages/is/form_header_master.html
index 3b9d87ca5..1c016cdf2 100644
--- a/templates/webpages/is/form_header_master.html
+++ b/templates/webpages/is/form_header_master.html
@@ -7,6 +7,7 @@
 <script type="text/javascript" src="js/vendor_selection.js"></script>
 <script type="text/javascript" src="js/calculate_qty.js"></script>
 <script type="text/javascript" src="js/follow_up.js"></script>
+<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
 
 <form method="post" name="invoice" action="[% script %]">