sub get_coa {
- my ( $self, $form, $myconfig) = @_;
-
- my $query = q{ SELECT coa FROM defaults };
-
- my $dbh = $form->dbconnect($myconfig);
- my $sth = $dbh->prepare($query);
- $sth->execute() || $form->dberror($query);
-
- my ($coa) = selectrow_query($form, $dbh, $query);
-
- $sth->finish;
- $dbh->disconnect;
+ my ( $self, $form ) = @_;
+ my $coa = $::instance_conf->get_coa;
$form->{coa} = $coa;
$form->{"COA_$coa"} = '1';
$form->{COA_Germany} = '1' if ($coa =~ m/^germany/i);
# Get all positions for taxreport out of the database
# Needs Databaseupdate Pg-upgrade2/USTVA_abstraction.pl
- return unless defined wantarray;
-
my ( $self,
$arg_ref) = @_;
my ($self, $myconfig, $form) = @_;
# connect to database
- my $dbh = $form->dbconnect($myconfig);
+ my $dbh = $form->get_standard_dbh;
my $last_period = 0;
my $category = "pos_ustva";
foreach my $item (@category_euro) {
$form->{"$item"} = 0;
}
- my $coa_name = coa_get($dbh);
+ my $coa_name = $::instance_conf->get_coa;
$form->{coa} = $coa_name;
# Controlvariable for templates
$form->{"Z45"} = $form->{"Z43"};
- $form->{"Z53"} = $form->{"Z45"} + $form->{"53"} + $form->{"74"}
+ $form->{"Z53"} = $form->{"Z45"} + $form->{"47"} + $form->{"53"} + $form->{"74"}
+ $form->{"85"} + $form->{"65"};
- $form->{"Z62"} = $form->{"Z43"} - $form->{"66"} - $form->{"61"}
+ $form->{"Z62"} = $form->{"Z53"} - $form->{"66"} - $form->{"61"}
- $form->{"62"} - $form->{"67"} - $form->{"63"}
- $form->{"64"} - $form->{"59"};
$main::lxdebug->leave_sub();
}
-sub coa_get {
-
- my ($dbh) = @_;
- my $form = $main::form;
-
- my $query= qq|SELECT coa FROM defaults|;
-
- my $sth = $dbh->prepare($query);
-
- $sth->execute || $form->dberror($query);
-
- my ($ref) = $sth->fetchrow_array;
-
- return $ref;
-
-};
-
sub get_accounts_ustva {
$main::lxdebug->enter_sub();
my $arwhere = "";
my $item;
- my $gltaxkey_where = "(tk.pos_ustva>=59 AND tk.pos_ustva<=66)";
+ my $gltaxkey_where = "((tk.pos_ustva = 46) OR (tk.pos_ustva>=59 AND tk.pos_ustva<=67) or (tk.pos_ustva>=89 AND tk.pos_ustva<=93))";
if ($fromdate) {
if ($form->{method} eq 'cash') {
$form->error("Missing Parameter: @_") if !$userspath || !$filename;
- $filename = "$form->{login}_$filename";
+ $filename = "$::myconfig{login}_$filename";
$filename =~ s|.*/||;
$filename = "$userspath/$filename";
open my $FACONF, "<", $filename or do {# Annon Sub