projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bearbeiten der Konfiguration für wiederkehrende Rechnungen implementiert
[kivitendo-erp.git]
/
bin
/
mozilla
/
drafts.pl
diff --git
a/bin/mozilla/drafts.pl
b/bin/mozilla/drafts.pl
index
dbe61ff
..
f6cc7b6
100644
(file)
--- a/
bin/mozilla/drafts.pl
+++ b/
bin/mozilla/drafts.pl
@@
-13,20
+13,26
@@
use SL::Drafts;
require "bin/mozilla/common.pl";
require "bin/mozilla/common.pl";
+use strict;
+
sub save_draft {
sub save_draft {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
if (!$form->{draft_id} && !$form->{draft_description}) {
restore_form($form->{SAVED_FORM}, 1) if ($form->{SAVED_FORM});
delete $form->{SAVED_FORM};
if (!$form->{draft_id} && !$form->{draft_description}) {
restore_form($form->{SAVED_FORM}, 1) if ($form->{SAVED_FORM});
delete $form->{SAVED_FORM};
- $form->{SAVED_FORM} = save_form();
+ $form->{SAVED_FORM} = save_form(
qw(stylesheet login password)
);
$form->{remove_draft} = 1;
$form->header();
print($form->parse_html_template("drafts/save_new"));
$form->{remove_draft} = 1;
$form->header();
print($form->parse_html_template("drafts/save_new"));
- return $lxdebug->leave_sub();
+ return $
main::
lxdebug->leave_sub();
}
my ($draft_id, $draft_description) = ($form->{draft_id}, $form->{draft_description});
}
my ($draft_id, $draft_description) = ($form->{draft_id}, $form->{draft_description});
@@
-40,48
+46,56
@@
sub save_draft {
update();
update();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub remove_draft {
}
sub remove_draft {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
Drafts->remove(\%myconfig, $form, $form->{draft_id}) if ($form->{draft_id});
delete @{$form}{qw(draft_id draft_description)};
Drafts->remove(\%myconfig, $form, $form->{draft_id}) if ($form->{draft_id});
delete @{$form}{qw(draft_id draft_description)};
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub load_draft_maybe {
}
sub load_draft_maybe {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- $lxdebug->leave_sub() and return 0 if ($form->{DONT_LOAD_DRAFT});
+ $
main::
lxdebug->leave_sub() and return 0 if ($form->{DONT_LOAD_DRAFT});
my ($draft_nextsub) = @_;
my @drafts = Drafts->list(\%myconfig, $form);
my ($draft_nextsub) = @_;
my @drafts = Drafts->list(\%myconfig, $form);
- $lxdebug->leave_sub() and return 0 unless (@drafts);
+ $
main::
lxdebug->leave_sub() and return 0 unless (@drafts);
$draft_nextsub = "add" unless ($draft_nextsub);
delete $form->{action};
$draft_nextsub = "add" unless ($draft_nextsub);
delete $form->{action};
- my $saved_form = save_form();
+ my $saved_form = save_form(
qw(stylesheet login password)
);
$form->header();
print($form->parse_html_template("drafts/load",
$form->header();
print($form->parse_html_template("drafts/load",
- { "DRAFTS" => \@drafts,
- "SAVED_FORM" => $saved_form,
+ { "DRAFTS"
=> \@drafts,
+ "SAVED_FORM"
=> $saved_form,
"draft_nextsub" => $draft_nextsub }));
"draft_nextsub" => $draft_nextsub }));
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
return 1;
}
sub dont_load_draft {
return 1;
}
sub dont_load_draft {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
my $draft_nextsub = $form->{draft_nextsub} || "add";
my $draft_nextsub = $form->{draft_nextsub} || "add";
@@
-92,11
+106,14
@@
sub dont_load_draft {
call_sub($draft_nextsub);
call_sub($draft_nextsub);
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub load_draft {
}
sub load_draft {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
my ($old_form, $id, $description) = Drafts->load(\%myconfig, $form, $form->{id});
my ($old_form, $id, $description) = Drafts->load(\%myconfig, $form, $form->{id});
@@
-104,7
+121,7
@@
sub load_draft {
$old_form = YAML::Load($old_form);
my %dont_save_vars = map { $_ => 1 } @Drafts::dont_save;
$old_form = YAML::Load($old_form);
my %dont_save_vars = map { $_ => 1 } @Drafts::dont_save;
- my @restore_vars = grep { !$
skip
_vars{$_} } keys %{ $old_form };
+ my @restore_vars = grep { !$
dont_save
_vars{$_} } keys %{ $old_form };
@{$form}{@restore_vars} = @{$old_form}{@restore_vars};
@{$form}{@restore_vars} = @{$old_form}{@restore_vars};
@@
-115,11
+132,14
@@
sub load_draft {
update();
update();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub delete_drafts {
}
sub delete_drafts {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
my @ids;
foreach (keys %{$form}) {
my @ids;
foreach (keys %{$form}) {
@@
-132,11
+152,14
@@
sub delete_drafts {
add();
add();
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
sub draft_action_dispatcher {
}
sub draft_action_dispatcher {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my $locale = $main::locale;
if ($form->{draft_action} eq $locale->text("Skip")) {
dont_load_draft();
if ($form->{draft_action} eq $locale->text("Skip")) {
dont_load_draft();
@@
-145,7
+168,7
@@
sub draft_action_dispatcher {
delete_drafts();
}
delete_drafts();
}
- $lxdebug->leave_sub();
+ $
main::
lxdebug->leave_sub();
}
1;
}
1;