From bf46061c5ae831038315d77ae8be55bf712b2c87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Fri, 18 Sep 2015 12:37:11 +0200 Subject: [PATCH] =?utf8?q?Auftrags-Controller:=20Verk=C3=A4ufer:=20copy/pa?= =?utf8?q?ste-Fehler=20behoben=20und=20eigene=20Liste.?= 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 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index f82ecf5e8..e3f45a8df 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -431,6 +431,9 @@ sub _pre_render { $self->{all_employees} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->employee_id, deleted => 0 ] ], sort_by => 'name'); + $self->{all_salesmen} = SL::DB::Manager::Employee->get_all(where => [ or => [ id => $self->order->salesman_id, + deleted => 0 ] ], + sort_by => 'name'); $self->{all_projects} = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id, active => 1 ] ], sort_by => 'projectnumber'); diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html index 11d456a26..6a89ae9cb 100644 --- a/templates/webpages/order/tabs/basic_data.html +++ b/templates/webpages/order/tabs/basic_data.html @@ -79,8 +79,8 @@ [% IF SELF.cv == 'customer' %] [% 'Salesman' | $T8 %] - [% L.select_tag('order.employee_id', - SELF.all_employees, + [% L.select_tag('order.salesman_id', + SELF.all_salesmen, default=(SELF.order.salesman_id ? SELF.order.salesman_id : SELF.current_employee_id), title_key='safe_name') %] -- 2.20.1