From: Moritz Bunkus Date: Fri, 4 May 2007 14:38:34 +0000 (+0000) Subject: Den Dialog zum Bearbeiten der Mahnungskonfiguration auf die Verwendung von HTML-Vorla... X-Git-Tag: release-2.4.3^2~383 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fec0904532e2136a1a769f568c351f4875257d56;p=kivitendo-erp.git Den Dialog zum Bearbeiten der Mahnungskonfiguration auf die Verwendung von HTML-Vorlagen umgestellt. --- diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index ee77c8224..a81d9452e 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -36,6 +36,7 @@ use SL::PE; use SL::DN; use Data::Dumper; +require "bin/mozilla/common.pl"; require "bin/mozilla/io.pl"; require "bin/mozilla/arap.pl"; @@ -44,174 +45,15 @@ require "bin/mozilla/arap.pl"; sub edit_config { $lxdebug->enter_sub(); - # edit all dunning config data - - $form->header; DN->get_config(\%myconfig, \%$form); - $form->{title} = $locale->text('Edit Dunning Process Config'); - - $form->{callback} = - "$form->{script}?action=edit_config&login=$form->{login}&password=$form->{password}" - unless $form->{callback}; - - @column_index = qw(dunning_level dunning_description active auto email payment_terms terms fee interest_rate template); - - $column_header{dunning_level} = - qq|| - . $locale->text('Dunning Level') - . qq||; - $column_header{dunning_description} = - qq|| - . $locale->text('Dunning Description') - . qq||; - $column_header{active} = - qq|| - . $locale->text('Active?') - . qq||; - $column_header{auto} = - qq|| - . $locale->text('Auto Send?') - . qq||; - $column_header{email} = - qq|| - . $locale->text('eMail Send?') - . qq||; - $column_header{payment_terms} = - qq|| - . $locale->text('Fristsetzung') - . qq||; - $column_header{terms} = - qq|| - . $locale->text('Duedate +Days') - . qq||; - $column_header{fee} = - qq|| - . $locale->text('Fee') - . qq||; - $column_header{interest_rate} = - qq|| - . $locale->text('Interest Rate') - . qq||; - $column_header{template} = - qq|| - . $locale->text('Template') - . qq||; - print qq| - - - -
{script}> - - - - - - - - |; - map { print "$column_header{$_}\n" } @column_index; - - print qq| - -|; - my $i = 0; - foreach $ref (@{ $form->{DUNNING} }) { - - $i++; - my $j = $i % 2; - - print qq| - -|; - - - $column_data{dunning_level} = - qq||; - $column_data{dunning_description} = qq||; - my $active = ($ref->{active}) ? "checked" : ""; - $column_data{active} = - qq||; - my $email = ($ref->{email}) ? "checked" : ""; - $column_data{email} = - qq||; - - my $auto = ($ref->{auto}) ? "checked" : ""; - $column_data{auto} = - qq||; - $column_data{payment_terms} = qq||; - $column_data{terms} = qq||; - $column_data{fee} = qq||; - $column_data{interest_rate} = qq||; - $column_data{template} = qq||; - - - - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - } - $i++; - my $j = $i % 2; - - print qq| - -|; - - - $column_data{dunning_level} = - qq||; - $column_data{dunning_description} = qq||; - $column_data{active} = - qq||; - my $email = ""; - $column_data{email} = - qq||; - my $auto = ""; - $column_data{auto} = - qq||; - $column_data{payment_terms} = qq||; - $column_data{terms} = qq||; - $column_data{fee} = qq||; - $column_data{interest_rate} = qq||; - $column_data{template} = qq||; - - - $form->{rowcount} = $i; - map { print "$column_data{$_}\n" } @column_index; - - print qq| - -|; - - - print qq| -
$form->{title}
$i%
$i%
- - - -
- - - -
-{script}> - - - - -{login}> -{password}> - - -
+ $form->{title} = $locale->text('Edit Dunning Process Config'); + $form->{callback} ||= build_std_url("action=edit_config"); + $form->{rowcount} = 1 + scalar @{ $form->{DUNNING} }; + $form->{rowcount_odd} = $form->{rowcount} % 2; - - -|; + $form->header(); + print $form->parse_html_template("dunning/edit_config"); $lxdebug->leave_sub(); } diff --git a/locale/de/all b/locale/de/all index bf1d90fd5..d47514acb 100644 --- a/locale/de/all +++ b/locale/de/all @@ -922,6 +922,7 @@ gestartet', 'Save and Order' => 'Speichern und Auftrag erfassen', 'Save and Quotation' => 'Speichern und Angebot', 'Save and RFQ' => 'Speichern und Lieferantenanfrage', + 'Save and close' => 'Speichern und schließen', 'Save as new' => 'als neu speichern', 'Save draft' => 'Entwurf speichern', 'Saving the file \'%s\' failed. OS error message: %s' => 'Das Speichern der Datei \'%s\' schlug fehl. Fehlermeldung des Betriebssystems: %s', diff --git a/locale/de/dn b/locale/de/dn index 62096fd43..d1dd556a9 100644 --- a/locale/de/dn +++ b/locale/de/dn @@ -15,7 +15,6 @@ $self->{texts} = { 'Attempt to call an undefined sub named \'%s\'' => 'Es wurde versucht, eine nicht definierte Unterfunktion namens \'%s\' aufzurufen.', 'Aug' => 'Aug', 'August' => 'August', - 'Auto Send?' => 'Auto. Versand?', 'Billing Address' => 'Rechnungsadresse', 'Bin' => 'Lagerplatz', 'Bin List' => 'Lagerliste', @@ -44,10 +43,8 @@ $self->{texts} = { 'Dependency loop detected:' => 'Schleife in den Abhängigkeiten entdeckt:', 'Description' => 'Beschreibung', 'Discount' => 'Rabatt', - 'Duedate +Days' => 'Fällikeitsdatum +Tage', 'Dunning Date' => 'Mahndatum', 'Dunning Date from' => 'Mahnungen von', - 'Dunning Description' => 'Mahnstufenbeschreibung', 'Dunning Description missing in row ' => 'Mahnstufenbeschreibung fehlt in Zeile ', 'Dunning Duedate' => 'Zahlbar bis', 'Dunning Level' => 'Mahnlevel', @@ -67,14 +64,11 @@ gestartet', 'Fax' => 'Fax', 'Feb' => 'Feb', 'February' => 'Februar', - 'Fee' => 'Gebühr', - 'Fristsetzung' => 'Fristsetzung', 'Group' => 'Warengruppe', 'Group Invoices' => 'Rechnungen zusammenfassen', 'History' => 'Historie', 'In-line' => 'im Text', 'Interest' => 'Zinsen', - 'Interest Rate' => 'Zinssatz', 'Inv. Duedate' => 'Rg. Fälligkeit', 'Invdate' => 'Rechnungsdatum', 'Invdate from' => 'Rechnungen von', @@ -161,7 +155,6 @@ gestartet', 'SAVED FOR DUNNING' => 'Gespeichert', 'SCREENED' => 'Angezeigt', 'Sales Order' => 'Kundenauftrag', - 'Save' => 'Speichern', 'Screen' => 'Bildschirm', 'Search Dunning' => 'Mahnung suchen', 'Select a Customer' => 'Endkunde auswählen', @@ -188,7 +181,6 @@ gestartet', 'Storno Packing List' => 'Stornolieferschein', 'Street' => 'Straße', 'Subtotal' => 'Zwischensumme', - 'Template' => 'Druckvorlage', 'Terms missing in row ' => '+Tage fehlen in Zeile ', 'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.', 'The dunning process started' => 'Der Mahnprozess ist gestartet.', @@ -206,7 +198,6 @@ gestartet', 'Zipcode' => 'PLZ', 'bin_list' => 'Lagerliste', 'button' => '?', - 'eMail Send?' => 'eMail-Versand?', 'eMail?' => 'eMail?', 'emailed to' => 'gemailt an', 'invoice' => 'Rechnung', diff --git a/locale/de/menuv3 b/locale/de/menuv3 index 31a973a0d..4886d1d85 100644 --- a/locale/de/menuv3 +++ b/locale/de/menuv3 @@ -1,5 +1,6 @@ $self->{texts} = { 'Logout' => 'Abmeldung', + 'User' => 'Benutzer', }; $self->{subs} = { diff --git a/templates/webpages/dunning/edit_config_de.html b/templates/webpages/dunning/edit_config_de.html new file mode 100644 index 000000000..741108f0f --- /dev/null +++ b/templates/webpages/dunning/edit_config_de.html @@ -0,0 +1,94 @@ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MahnlevelMahnstufenbeschreibungAktiviert?Auto. Versand?eMail-Versand?FristsetzungFällikeitsdatum +TageGebührZinssatzDruckvorlage
+ + + + checked> + checked> + + + + + checked>%
+ + + + + + + + + + %
+ +
+ + + + + + + + + +
+ + + diff --git a/templates/webpages/dunning/edit_config_master.html b/templates/webpages/dunning/edit_config_master.html new file mode 100644 index 000000000..ac336cbb5 --- /dev/null +++ b/templates/webpages/dunning/edit_config_master.html @@ -0,0 +1,94 @@ + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Dunning LevelDunning DescriptionActive?Auto Send?eMail Send?FristsetzungDuedate +DaysFeeInterest RateTemplate
+ + + + checked> + checked> + + + + + checked>%
+ + + + + + + + + + %
+ +
+ + + + + + + + + +
+ + +