X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=68272b31ca8b3dc338154746af3dc54f17cd9e74;hb=80f6efd0cd9de22d54ccc605808a74c9955e643c;hp=d5bb9c3d3a19ddeab86e565e06cd302f5ef3a905;hpb=d4b177761705664e043109244defa9ebbe673c8e;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index d5bb9c3d3..68272b31c 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -674,13 +674,22 @@ sub header {
|;
}
- my $fokus = qq| document.$self->{fokus}.focus();| if ($self->{"fokus"});
+ my $fokus = qq|
+
+ | if $self->{"fokus"};
#Set Calendar
my $jsscript = "";
if ($self->{jsscript} == 1) {
$jsscript = qq|
+
@@ -711,13 +720,7 @@ sub header {
$jsscript
$ajax
-
+ $fokus
@@ -2065,11 +2068,11 @@ sub get_duedate {
my ($self, $myconfig, $reference_date) = @_;
- my $reference_date = $reference_date ? conv_dateq($reference_date) . '::DATE' : 'current_date';
+ $reference_date = $reference_date ? conv_dateq($reference_date) . '::DATE' : 'current_date';
- my $dbh = $self->get_standard_dbh($myconfig);
- my $query = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|;
- my ($duedate) = selectrow_query($self, $dbh, $query, $self->{payment_id});
+ my $dbh = $self->get_standard_dbh($myconfig);
+ my $query = qq|SELECT ${reference_date} + terms_netto FROM payment_terms WHERE id = ?|;
+ my ($duedate) = selectrow_query($self, $dbh, $query, $self->{payment_id});
$main::lxdebug->leave_sub();
@@ -2196,7 +2199,7 @@ sub _get_charts {
my $transdate = quote_db_date($params->{transdate});
my $query =
- qq|SELECT c.id, c.accno, c.description, c.link, tk.taxkey_id, tk.tax_id | .
+ qq|SELECT c.id, c.accno, c.description, c.link, c.charttype, tk.taxkey_id, tk.tax_id | .
qq|FROM chart c | .
qq|LEFT JOIN taxkeys tk ON | .
qq|(tk.id = (SELECT id FROM taxkeys | .