X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdrafts.pl;h=c471d009bcca0a9f61210a8bfafe94f145fc4af2;hb=b81f2b8fd88c28f96f49fbe50e94276384d0d511;hp=515a64205f6e1c3697416dbbe655eb5269e58447;hpb=5928c14319d76d50522128f1cb98864679f961a9;p=kivitendo-erp.git

diff --git a/bin/mozilla/drafts.pl b/bin/mozilla/drafts.pl
index 515a64205..c471d009b 100644
--- a/bin/mozilla/drafts.pl
+++ b/bin/mozilla/drafts.pl
@@ -13,20 +13,26 @@ use SL::Drafts;
 
 require "bin/mozilla/common.pl";
 
+use strict;
+
 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};
 
-    $form->{SAVED_FORM}   = save_form();
+    $form->{SAVED_FORM}   = save_form(qw(stylesheet login password));
     $form->{remove_draft} = 1;
 
     $form->header();
-    print($form->parse_html_template2("drafts/save_new"));
+    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});
@@ -40,48 +46,56 @@ sub save_draft {
 
   update();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 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)};
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub load_draft_maybe {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $lxdebug->leave_sub() and return 0 if ($form->{DONT_LOAD_DRAFT});
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::lxdebug->leave_sub() and return 0 if ($form->{DONT_LOAD_DRAFT});
 
   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};
-  my $saved_form = save_form();
+  my $saved_form = save_form(qw(stylesheet login password));
 
   $form->header();
-  print($form->parse_html_template2("drafts/load",
-                                    { "DRAFTS" => \@drafts,
-                                      "SAVED_FORM" => $saved_form,
-                                      "draft_nextsub" => $draft_nextsub }));
+  print($form->parse_html_template("drafts/load",
+                                   { "DRAFTS"        => \@drafts,
+                                     "SAVED_FORM"    => $saved_form,
+                                     "draft_nextsub" => $draft_nextsub }));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 
   return 1;
 }
 
 sub dont_load_draft {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
 
   my $draft_nextsub = $form->{draft_nextsub} || "add";
 
@@ -92,11 +106,14 @@ sub dont_load_draft {
 
   call_sub($draft_nextsub);
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 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});
 
@@ -104,7 +121,7 @@ sub load_draft {
     $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};
 
@@ -112,14 +129,20 @@ sub load_draft {
     $form->{draft_description}     = $description;
     $form->{remove_draft}          = 'checked';
   }
-
+  # Ich vergesse bei Rechnungsentwürfe das Rechnungsdatum zu ändern. Dadurch entstehen 
+  # ungültige Belege. Vielleicht geht es anderen ähnlich jan 19.2.2011
+  $form->{invdate} = $form->current_date(\%myconfig); # Aktuelles Rechnungsdatum  ...
+  $form->{duedate} = $form->current_date(\%myconfig); # Aktuelles Fälligkeitsdatum  ...
   update();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete_drafts {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   my @ids;
   foreach (keys %{$form}) {
@@ -132,11 +155,14 @@ sub delete_drafts {
 
   add();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 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();
@@ -145,7 +171,7 @@ sub draft_action_dispatcher {
     delete_drafts();
   }
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 1;