Lieferplan um Filter nach Abteilungen ergänzt

diff --git a/SL/Controller/DeliveryPlan.pm b/SL/Controller/DeliveryPlan.pm
index 2332462ac227db6dec0abfe578ec7ce66f63e3f6..6e6eed403ee1eaebaf58eb7999839b5269445fce 100644 (file)
--- a/SL/Controller/DeliveryPlan.pm
+++ b/SL/Controller/DeliveryPlan.pm
@@ -16,7 +16,7 @@ use Carp;
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],
 
 use Rose::Object::MakeMethods::Generic (
   scalar => [ qw(db_args flat_filter) ],

-  'scalar --get_set_init' => [ qw(models all_edit_right vc use_linked_items all_employees all_businesses) ],
+  'scalar --get_set_init' => [ qw(models all_edit_right vc use_linked_items all_employees all_businesses all_departments) ],

 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });
 );
 
 __PACKAGE__->run_before(sub { $::auth->assert('delivery_plan'); });


@@ -116,13 +116,14 @@ sub calc_qtys {
 sub make_filter_summary {
   my ($self) = @_;
   my $vc     = $self->vc;
 sub make_filter_summary {
   my ($self) = @_;
   my $vc     = $self->vc;

-  my ($business, $employee);
+  my ($business, $employee, $department);

 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 
   $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"};
   $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id};
 
   my $filter = $::form->{filter} || {};
   my @filter_strings;
 
   $business = SL::DB::Business->new(id => $filter->{order}{customer}{"business_id"})->load->description if $filter->{order}{customer}{"business_id"};
   $employee = SL::DB::Employee->new(id => $filter->{order}{employee_id})->load->name if $filter->{order}{employee_id};

+  $department = SL::DB::Department->new(id => $filter->{order}{department_id})->load->description if $filter->{order}{department_id};

 
   my @filters = (
     [ $filter->{order}{"ordnumber:substr::ilike"},                    $::locale->text('Number')                                             ],
 
   my @filters = (
     [ $filter->{order}{"ordnumber:substr::ilike"},                    $::locale->text('Number')                                             ],


@@ -137,6 +138,7 @@ sub make_filter_summary {
     [ $filter->{order}{customer}{"name:substr::ilike"},               $::locale->text('Customer')                                           ],
     [ $filter->{order}{customer}{"customernumber:substr::ilike"},     $::locale->text('Customer Number')                                    ],
     [ $business,                                                      $::locale->text('Customer type')                                      ],
     [ $filter->{order}{customer}{"name:substr::ilike"},               $::locale->text('Customer')                                           ],
     [ $filter->{order}{customer}{"customernumber:substr::ilike"},     $::locale->text('Customer Number')                                    ],
     [ $business,                                                      $::locale->text('Customer type')                                      ],

+    [ $department,                                                    $::locale->text('Department')                                         ],

     [ $employee,                                                      $::locale->text('Employee')                                           ],
   );
 
     [ $employee,                                                      $::locale->text('Employee')                                           ],
   );
 


@@ -353,6 +355,9 @@ sub init_all_employees {
 sub init_all_businesses {
   return SL::DB::Manager::Business->get_all_sorted;
 }
 sub init_all_businesses {
   return SL::DB::Manager::Business->get_all_sorted;
 }

+sub init_all_departments {
+  return SL::DB::Manager::Department->get_all_sorted;
+}

 sub link_to {
   my ($self, $object, %params) = @_;
 
 sub link_to {
   my ($self, $object, %params) = @_;
 

diff --git a/doc/changelog b/doc/changelog
index afb9a471264e501fce8d12bd495fb86c7182f417..239ebba32d1f73eaace6caf1c3d61236203e41fa 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -28,7 +28,7 @@ Mittelgroße neue Features:
 
 Kleinere neue Features und Detailverbesserungen:
   - Verknüpfte Belege um die Verknüpfung von Beleg nach E-Mail-Journal erweitert.
 
 Kleinere neue Features und Detailverbesserungen:
   - Verknüpfte Belege um die Verknüpfung von Beleg nach E-Mail-Journal erweitert.

-
+  - Filter nach Abteilungen für Lieferplan

 
 2017-12-12 - Release 3.5.1
 
 
 2017-12-12 - Release 3.5.1
 

diff --git a/templates/webpages/delivery_plan/_filter.html b/templates/webpages/delivery_plan/_filter.html
index 2f195885e3898ab0b5d9cf9c4b2792dde1bc03ac..65ed964860b496fb13e369e29dab4ac7e7e7307a 100644 (file)
--- a/templates/webpages/delivery_plan/_filter.html
+++ b/templates/webpages/delivery_plan/_filter.html
@@ -78,6 +78,14 @@
                      style      => 'width: 200px') %]
    </td>
   </tr>
                      style      => 'width: 200px') %]
    </td>
   </tr>

+  [%- IF SELF.all_departments.size %]
+    <tr>
+      <th align="right">[% 'Department' | $T8 %]</th>
+      <td>
+        [% L.select_tag('filter.order.department_id', SELF.all_departments, default=filter.order.department_id, title_key='description', with_empty=1, style='width:200px') %]
+      </td>
+    </tr>
+  [%- END %]

   <tr>
    <th align="right">[% 'Type' | $T8 %]</th>
    <td>
   <tr>
    <th align="right">[% 'Type' | $T8 %]</th>
    <td>