Mahnungen: Funktion »Diese Sprache verwenden« gefixt Teil 2

Wenn die Checkbox angehakt ist, so soll die Benutzer*in die Möglichkeit
haben, über die Druckoptionen einen Sprache für alle zu erzeugenden
Mahnungen auszuwählen. Ist die Checkbox aus, so wird die Sprache des
Kunden der jeweiligen Mahnung genommen, und dann muss die Sprachauswahl
deaktiviert werden.

Der erste Commit hat nur die Maske zum Erstellen neuer Mahnungen
abgedeckt. Dieser erledigt die Maske zum Anzeigen vorhandener Mahnungen.

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index a4d46b5c3040843c39d72eda7d6d0e40afc09e66..8a10912cff3b6173fbadb5f1e09a17aefe07419c 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -454,6 +454,7 @@ sub show_dunning {
 
   $report->set_options_from_form();
 
 
   $report->set_options_from_form();
 

+  $::request->layout->add_javascripts("kivi.Dunning.js");

   $report->generate_with_headers();
 
   $main::lxdebug->leave_sub();
   $report->generate_with_headers();
 
   $main::lxdebug->leave_sub();

diff --git a/templates/webpages/dunning/show_dunning_bottom.html b/templates/webpages/dunning/show_dunning_bottom.html
index 92556809025d089452de314d8faff49100783036..135de5c1e5ef31da7b6e550068052e8b621a17be 100644 (file)
--- a/templates/webpages/dunning/show_dunning_bottom.html
+++ b/templates/webpages/dunning/show_dunning_bottom.html
@@ -4,12 +4,6 @@
 [%- USE L %]
 <input type="hidden" name="rowcount" value="[% rowcount %]">
 
 [%- USE L %]
 <input type="hidden" name="rowcount" value="[% rowcount %]">
 

-  <p>
-    <input type="checkbox" id='force_lang' name="force_lang" size="6" value="1">
-    [% 'Override invoice language' | $T8 %]
-    [% PRINT_OPTIONS %]
-  </p>
-

   <p>
    [% 'Dunnings' | $T8 %]<br>
    [% L.hidden_tag('action', 'dispatcher') %]
   <p>
    [% 'Dunnings' | $T8 %]<br>
    [% L.hidden_tag('action', 'dispatcher') %]


@@ -18,9 +12,3 @@
   </p>
 
  </form>
   </p>
 
  </form>

- <script type='text/javascript'>
-   $(function() {
-     $("select[name='language_id']").prop('disabled', !$('#force_lang').prop('checked'));
-     $('#force_lang').checkall('select[name="language_id"]', 'disabled', 'inverted');
-   });
- </script>

diff --git a/templates/webpages/dunning/show_dunning_top.html b/templates/webpages/dunning/show_dunning_top.html
index f835f956d2341d1b2602e464e2fc8d800a3e3b84..fbc7cfd4708420ac555ebef0d54f4e79b9ae1f93 100644 (file)
--- a/templates/webpages/dunning/show_dunning_top.html
+++ b/templates/webpages/dunning/show_dunning_top.html
@@ -1,5 +1,9 @@
-[% USE HTML %] <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-
+[% USE HTML %][%- USE LxERP -%][%- USE L -%]

  <form method="post" action="dn.pl">
 
  <form method="post" action="dn.pl">
 

+  <h2>[% LxERP.t8("Print options") %]</h2>
+
+  [% L.checkbox_tag("force_lang", label=LxERP.t8('Override invoice language'), checked=force_lang) %]
+  [% PRINT_OPTIONS %]
+
+  <h2>[% LxERP.t8("Dunnings") %]</h2>

diff --git a/templates/webpages/dunning/show_invoices.html b/templates/webpages/dunning/show_invoices.html
index f0932ca5fddeb4d0380f5e90e211c4798c6eefda..db49d7e59deaed72f1ce16fd1c3b615968666ab1 100644 (file)
--- a/templates/webpages/dunning/show_invoices.html
+++ b/templates/webpages/dunning/show_invoices.html
@@ -5,9 +5,6 @@
 
 [% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
 [% SET all_email = 1 %][% FOREACH row = DUNNINGS %][% IF !row.email %][% SET all_email = 0 %][% LAST %][% END %][% END %]
 
 [% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
 [% SET all_email = 1 %][% FOREACH row = DUNNINGS %][% IF !row.email %][% SET all_email = 0 %][% LAST %][% END %][% END %]

- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/dunning.js"></script>
-

  <form name="Form" method="post" action="dn.pl" id="form">
 
   <h2>[% LxERP.t8("Print options") %]</h2>
  <form name="Form" method="post" action="dn.pl" id="form">
 
   <h2>[% LxERP.t8("Print options") %]</h2>