Verkaufsrechnung bearbeiten - ALL_DEPARTMENTS wie andere Belegemasken

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index a45adbf804d2999e2a24c7c531d62ac09875099a..4007f8d3b302464d860834c043bc050d5a67f537 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -302,9 +302,10 @@ sub form_header {
   $form->get_lists("taxzones"      => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
                    "currencies"    => "ALL_CURRENCIES",
                    "customers"     => "ALL_CUSTOMERS",
   $form->get_lists("taxzones"      => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"),
                    "currencies"    => "ALL_CURRENCIES",
                    "customers"     => "ALL_CUSTOMERS",

-                   "departments"   => "all_departments",

                    "price_factors" => "ALL_PRICE_FACTORS");
 
                    "price_factors" => "ALL_PRICE_FACTORS");
 

+  $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+

   # Projects
   my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
   my @old_ids_cond    = @old_project_ids ? (id => \@old_project_ids) : ();
   # Projects
   my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"});
   my @old_ids_cond    = @old_project_ids ? (id => \@old_project_ids) : ();

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 5e76f88d7a28bc178bd7336350bb11cff0fa2257..28f3f4da43c933d7ac251e8da2fa6c9d1bc9e0a8 100644 (file)
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -146,11 +146,11 @@
   [%- END %]
           </td>
         </tr>
   [%- END %]
           </td>
         </tr>

-[%- IF all_departments %]
+[%- IF ALL_DEPARTMENTS %]

         <tr>
           <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">
         <tr>
           <th align="right" nowrap>[% 'Department' | $T8 %]</th>
           <td colspan="3">

-            [% L.select_tag('department_id', all_departments, default = department_id, title_sub = \department_labels, with_empty = 1, style = 'width:250px') %]
+            [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title_key = 'description', with_empty = 1, style = 'width:250px') %]

           </td>
         </tr>
 [%- END %]
           </td>
         </tr>
 [%- END %]