projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
5fd0e68
..
e115f97
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-1032,6
+1032,12
@@
sub parse_template {
$self->{"myconfig_${_}"} = $myconfig->{$_} for grep { $_ ne 'dbpasswd' } keys %{ $myconfig };
$self->{$_} = $defaults->$_ for qw(co_ustid);
$self->{"myconfig_${_}"} = $defaults->$_ for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber);
$self->{"myconfig_${_}"} = $myconfig->{$_} for grep { $_ ne 'dbpasswd' } keys %{ $myconfig };
$self->{$_} = $defaults->$_ for qw(co_ustid);
$self->{"myconfig_${_}"} = $defaults->$_ for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber);
+ $self->{AUTH} = $::auth;
+ $self->{INSTANCE_CONF} = $::instance_conf;
+ $self->{LOCALE} = $::locale;
+ $self->{LXCONFIG} = $::lx_office_conf;
+ $self->{LXDEBUG} = $::lxdebug;
+ $self->{MYCONFIG} = \%::myconfig;
$self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
$self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
@@
-1075,7
+1081,7
@@
sub parse_template {
close OUT if $self->{OUT};
close OUT if $self->{OUT};
- my $copy_to_webdav = $::instance_conf->get_webdav && $::instance_conf->get_webdav_documents && !$self->{preview};
+ my $copy_to_webdav = $::instance_conf->get_webdav && $::instance_conf->get_webdav_documents && !$self->{preview}
&& $self->{tmpdir} && $self->{tmpfile} && $self->{type}
;
if ($self->{media} eq 'file') {
copy(join('/', $self->{cwd}, $userspath, $self->{tmpfile}), $out =~ m|^/| ? $out : join('/', $self->{cwd}, $out)) if $template->uses_temp_file;
if ($self->{media} eq 'file') {
copy(join('/', $self->{cwd}, $userspath, $self->{tmpfile}), $out =~ m|^/| ? $out : join('/', $self->{cwd}, $out)) if $template->uses_temp_file;
@@
-1422,7
+1428,7
@@
sub date_closed {
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
- my $dbh = $self->
dbconnect($myconfig)
;
+ my $dbh = $self->
get_standard_dbh
;
my $query = "SELECT 1 FROM defaults WHERE ? < closedto";
my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date));
my $query = "SELECT 1 FROM defaults WHERE ? < closedto";
my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date));
@@
-1455,7
+1461,7
@@
sub date_max_future {
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
- my $dbh = $self->
dbconnect($myconfig)
;
+ my $dbh = $self->
get_standard_dbh
;
my $query = "SELECT 1 FROM defaults WHERE ? - current_date > max_future_booking_interval";
my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date));
my $query = "SELECT 1 FROM defaults WHERE ? - current_date > max_future_booking_interval";
my $sth = prepare_execute_query($self, $dbh, $query, conv_date($date));
@@
-1944,7
+1950,7
@@
sub get_duedate {
: $self->{vendor_id} ? SL::DB::Vendor ->new(id => $self->{vendor_id}) ->load->payment
: croak("Missing field in \$::form: payment_id, customer_id or vendor_id");
: $self->{vendor_id} ? SL::DB::Vendor ->new(id => $self->{vendor_id}) ->load->payment
: croak("Missing field in \$::form: payment_id, customer_id or vendor_id");
- my $duedate = $terms
->calc_date(reference_date => $reference_date)->to_kivitendo
;
+ my $duedate = $terms
? $terms->calc_date(reference_date => $reference_date)->to_kivitendo : undef
;
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
@@
-2095,10
+2101,10
@@
sub _get_taxcharts {
if (ref $params eq 'HASH') {
$key = $params->{key} if ($params->{key});
if ($params->{module} eq 'AR') {
if (ref $params eq 'HASH') {
$key = $params->{key} if ($params->{key});
if ($params->{module} eq 'AR') {
- push @where, '
taxkey NOT IN (8, 9, 18, 19)
';
+ push @where, '
chart_categories ~ \'[ACILQ]\'
';
} elsif ($params->{module} eq 'AP') {
} elsif ($params->{module} eq 'AP') {
- push @where, '
taxkey NOT IN (1, 2, 3, 12, 13)
';
+ push @where, '
chart_categories ~ \'[ACELQ]\'
';
}
} elsif ($params) {
}
} elsif ($params) {
@@
-2131,10
+2137,22
@@
sub _get_taxzones {
sub _get_employees {
$main::lxdebug->enter_sub();
sub _get_employees {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $default_key, $key) = @_;
+ my ($self, $dbh, $params) = @_;
+
+ my $deleted = 0;
+
+ my $key;
+ if (ref $params eq 'HASH') {
+ $key = $params->{key};
+ $deleted = $params->{deleted};
+
+ } else {
+ $key = $params;
+ }
- $key = $default_key unless ($key);
- $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee ORDER BY lower(name)|);
+ $key ||= "all_employees";
+ my $filter = $deleted ? '' : 'WHERE NOT COALESCE(deleted, FALSE)';
+ $self->{$key} = selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee $filter ORDER BY lower(name)|);
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
@@
-2374,7
+2392,7
@@
sub get_lists {
}
if ($params{"employees"}) {
}
if ($params{"employees"}) {
- $self->_get_employees($dbh,
"all_employees",
$params{"employees"});
+ $self->_get_employees($dbh, $params{"employees"});
}
if ($params{"salesmen"}) {
}
if ($params{"salesmen"}) {