From f66bf46864b00cab02e07cf4407a8d1502642a36 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Wed, 19 Aug 2015 14:38:00 +0200
Subject: [PATCH] =?utf8?q?Auftrags-Controller:=20Artikel=20nicht=20hinzuf?=
 =?utf8?q?=C3=BCgen,=20wenn=20keine=20part-id=20da=20ist.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Controller/Order.pm                        |  3 +++
 templates/webpages/order/tabs/basic_data.html | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 166926987..c4624072a 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -127,6 +127,9 @@ sub action_add_item {
   my ($self) = @_;
 
   my $form_attr = $::form->{add_item};
+
+  return unless $form_attr->{parts_id};
+
   my $item      = SL::DB::OrderItem->new;
   $item->assign_attributes(%$form_attr);
 
diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index b5d3c3bb8..ea9710ba4 100644
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -76,6 +76,16 @@
               title_key='safe_name') %]</td>
           </tr>
 
+          [% IF SELF.cv == 'customer' %]
+          <tr>
+            <th align="right">[% 'Salesman' | $T8 %]</th>
+            <td>[% L.select_tag('order.employee_id',
+              SELF.all_employees,
+              default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id),
+              title_key='safe_name') %]</td>
+          </tr>
+          [% END %]
+
           <tr>
             <th width="70%" align="right" nowrap>[% 'Order Number' | $T8 %]</th>
             <td>[% L.input_tag('order.ordnumber', SELF.order.ordnumber, size = 11) %]</td>
@@ -184,6 +194,8 @@ function reload_cv_dependend_selections() {
 }
 
 function add_item() {
+  if ($('#add_item_parts_id').val() == '') return;
+
   var data = $('#order_form').serialize();
   data += '&action=Order/add_item';
   data += '&type=' + $('#type').val();
-- 
2.20.1