Kreditorenbuchungen: Checkbox für "Lastschrifteinzug"; Vorbelegung aus Stammdaten

diff --git a/SL/AP.pm b/SL/AP.pm
index 53607fff43761cfc06a749d5c3b39a4da9b94e7e..03a21e3c677c4bd30338f09a88d49230b2ff9ed2 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -186,7 +186,7 @@ sub post_transaction {
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,
                 curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,
                 invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
                 amount = ?, duedate = ?, paid = ?, netamount = ?,
                 curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,

-                globalproject_id = ?
+                globalproject_id = ?, direct_debit = ?

                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),
                WHERE id = ?|;
     @values = ($form->{invnumber}, conv_date($form->{transdate}),
                   $form->{ordnumber}, conv_i($form->{vendor_id}),


@@ -196,6 +196,7 @@ sub post_transaction {
                   $form->{currency}, $form->{notes},
                   conv_i($form->{department_id}), $form->{storno},
                   $form->{storno_id}, conv_i($form->{globalproject_id}),
                   $form->{currency}, $form->{notes},
                   conv_i($form->{department_id}), $form->{storno},
                   $form->{storno_id}, conv_i($form->{globalproject_id}),

+                  $form->{direct_debit} ? 't' : 'f',

                   $form->{id});
     do_query($form, $dbh, $query, @values);
 
                   $form->{id});
     do_query($form, $dbh, $query, @values);
 

diff --git a/SL/Form.pm b/SL/Form.pm
index 23ee185551b181e8d28cfecf95aa112a59289c30..f406817f6ef83404ac657f84ece1b478a3a01a22 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2529,7 +2529,7 @@ sub all_vc {
   # Hotfix für Bug 1837 - Besser wäre es alte Buchungsbelege
   # OHNE Auswahlliste (reines Textfeld) zu laden. Hilft aber auch
   # nicht für veränderbare Belege (oe, do, ...)
   # Hotfix für Bug 1837 - Besser wäre es alte Buchungsbelege
   # OHNE Auswahlliste (reines Textfeld) zu laden. Hilft aber auch
   # nicht für veränderbare Belege (oe, do, ...)

-  my $obsolete = "WHERE NOT obsolete" unless $self->{id};
+  my $obsolete = $self->{id} ? '' : "WHERE NOT obsolete";

   my $query = qq|SELECT count(*) FROM $table $obsolete|;
   my ($count) = selectrow_query($self, $dbh, $query);
 
   my $query = qq|SELECT count(*) FROM $table $obsolete|;
   my ($count) = selectrow_query($self, $dbh, $query);
 


@@ -2730,7 +2730,7 @@ sub create_links {
   }
 
   my $extra_columns = '';
   }
 
   my $extra_columns = '';

-  $extra_columns   .= 'a.direct_debit, ' if $module eq 'AR';
+  $extra_columns   .= 'a.direct_debit, ' if ($module eq 'AR') || ($module eq 'AP');

 
   if ($self->{id}) {
     $query =
 
   if ($self->{id}) {
     $query =

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index dddf6c515dc061039aa9c7e0a7c353fb53e1cba2..581142f830d494361d3cac9f1cbf5f7bc66f4488 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -97,7 +97,7 @@ sub add {
 
   AP->get_transdate(\%myconfig, $form);
   $form->{initial_transdate} = $form->{transdate};
 
   AP->get_transdate(\%myconfig, $form);
   $form->{initial_transdate} = $form->{transdate};

-  &create_links;
+  create_links(dont_save => 1);

   $form->{transdate} = $form->{initial_transdate};
   &display_form;
 
   $form->{transdate} = $form->{initial_transdate};
   &display_form;
 


@@ -113,7 +113,7 @@ sub edit {
 
   $form->{title} = "Edit";
 
 
   $form->{title} = "Edit";
 

-  &create_links;
+  create_links();

   &display_form;
 
   $main::lxdebug->leave_sub();
   &display_form;
 
   $main::lxdebug->leave_sub();


@@ -135,18 +135,23 @@ sub display_form {
 sub create_links {
   $main::lxdebug->enter_sub();
 
 sub create_links {
   $main::lxdebug->enter_sub();
 

+  my %params   = @_;
+

   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
   $main::auth->assert('general_ledger');
 
   $form->create_links("AP", \%myconfig, "vendor");
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
   $main::auth->assert('general_ledger');
 
   $form->create_links("AP", \%myconfig, "vendor");

-  my $taxincluded = $form->{taxincluded};
-  my $duedate     = $form->{duedate};
+  my %saved;
+  if (!$params{dont_save}) {
+    %saved = map { ($_ => $form->{$_}) } qw(direct_debit taxincluded);
+    $saved{duedate} = $form->{duedate} if $form->{duedate};
+  }

 
   IR->get_vendor(\%myconfig, \%$form);
 
   IR->get_vendor(\%myconfig, \%$form);

-  $form->{taxincluded} = $taxincluded;
-  $form->{duedate}   = $duedate if $duedate;
+
+  $form->{$_}        = $saved{$_} for keys %saved;

   $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}";
   $form->{rowcount}  = 1;
 
   $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}";
   $form->{rowcount}  = 1;
 

diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index 0d003c60026a606e02ebb674d8e94daa678c85c4..29e0dc43dc15691e7b081acdba64dddbb794b91b 100644 (file)
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -139,6 +139,10 @@
                 <td align="right"><input name="taxincluded" class="checkbox" type="checkbox" value="1" [% IF ( taxincluded ) %]checked[% END %]></td>
                 <th align=left nowrap>[% 'Tax Included' | $T8 %]</th>
               </tr>
                 <td align="right"><input name="taxincluded" class="checkbox" type="checkbox" value="1" [% IF ( taxincluded ) %]checked[% END %]></td>
                 <th align=left nowrap>[% 'Tax Included' | $T8 %]</th>
               </tr>

+              <tr>
+                <td align="right"><input name="direct_debit" class="checkbox" type="checkbox" value="1" [% IF direct_debit %]checked[% END %]></td>
+                <th align="left" nowrap>[% 'direct debit' | $T8 %]</th>
+              </tr>

             </table>
           </td>
 
             </table>
           </td>