From: Moritz Bunkus Date: Wed, 21 Nov 2012 15:07:56 +0000 (+0100) Subject: Buttons "Als Vorlage verwenden" zwecks Einheitlichkeit X-Git-Tag: release-3.0.0beta2~10^2~4^2~1 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3cd3e832747e15c4fc6b69bd185b0159f1a8dbd3;p=kivitendo-erp.git Buttons "Als Vorlage verwenden" zwecks Einheitlichkeit Siehe #2065. --- diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index dfac71d2f..ef40046c8 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -1124,7 +1124,7 @@ sub post_as_new { $main::lxdebug->leave_sub(); } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); my $form = $main::form; diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 80c87f966..ad1407cfd 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -509,7 +509,7 @@ $follow_ups_block } if ($transdate > $closedto) { print qq| - |; + |; } print qq| @@ -803,7 +803,7 @@ sub post_as_new { $main::lxdebug->leave_sub(); } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); $main::auth->assert('general_ledger'); diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 554d2fd4f..143696311 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -609,7 +609,7 @@ sub storno { } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); my $form = $main::form; diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 45305c9b7..6184128b1 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -799,7 +799,7 @@ sub print_and_post { } -sub use_as_template { +sub use_as_new { $main::lxdebug->enter_sub(); my $form = $main::form; @@ -813,7 +813,7 @@ sub use_as_template { $form->{invdate} = $form->current_date(\%myconfig); $form->{duedate} = $form->get_duedate(\%myconfig, $form->{invdate}) || $form->{invdate}; - # remember pricegroups for "use as template" + # remember pricegroups for "use as new" IS->get_pricegroups_for_parts(\%myconfig, \%$form); set_pricegroup($_) for 1 .. $form->{rowcount}; diff --git a/locale/de/all b/locale/de/all index 6cc8b97e2..72d72c8bd 100644 --- a/locale/de/all +++ b/locale/de/all @@ -2170,7 +2170,7 @@ $self->{texts} = { 'Updated' => 'Erneuert am', 'Updating prices of existing entry in database' => 'Preis des Eintrags in der Datenbank wird aktualisiert', 'Uploaded on #1, size #2 kB' => 'Am #1 hochgeladen, Größe #2 kB', - 'Use As Template' => 'Als Vorlage verwenden', + 'Use As New' => 'Als neu verwenden', 'Use Templates' => 'Benutze Vorlagen', 'User' => 'Benutzer', 'User Config' => 'Einstellungen', diff --git a/templates/webpages/ap/form_footer.html b/templates/webpages/ap/form_footer.html index 2408d5245..95ce79684 100644 --- a/templates/webpages/ap/form_footer.html +++ b/templates/webpages/ap/form_footer.html @@ -32,7 +32,7 @@ [%- END %] - + [%- ELSIF show_post_draft %] @@ -66,5 +66,3 @@ function set_duedate() { } //--> - - diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html index b2732a7ce..06350eaf0 100644 --- a/templates/webpages/ir/form_footer.html +++ b/templates/webpages/ir/form_footer.html @@ -96,7 +96,7 @@ [% END %] - + [% IF show_delete %] @@ -128,5 +128,3 @@ - - diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html index ee093dc95..deccd790f 100644 --- a/templates/webpages/is/form_footer.html +++ b/templates/webpages/is/form_footer.html @@ -130,7 +130,7 @@ [% END %] - + [% IF id && !is_type_credit_note %] @@ -169,5 +169,3 @@ - -