is_templates: Kundenauswahl ohne dropdown fix.

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index d6c5d8b1b4baa6d4f6aa6163f1f5401fb6637bab..797c2600246c59ca15b4e8f861da1fb575c16f8d 100644 (file)
--- 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 45e3c04bed0b77a827fd68bc0efaed622b44c82a..beedc7dbd3b01e96fad1c433d3586d9c7863fad3 100644 (file)
--- 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ählen',

diff --git a/templates/webpages/dunning/search_de.html b/templates/webpages/dunning/search_de.html
index 5bd1b9d0d0010f2847440fe9e6afc2b0d0f382e3..d9b10b0e46a01a5e4bbfb8aa8d4e398f0bd5f5f1 100644 (file)
--- 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 6cab7ad6b6fe0697a41e27be8ca35790fc77e13f..f519ce2d0c4dfdd60dca4f79bcf8665e4eeddab3 100644 (file)
--- 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 3b9d87ca54c8b662923a687499eef2e7b62530ca..1c016cdf217b1beb19b9f473cbd279ec2fd19d9e 100644 (file)
--- 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 %]">