# connect to database
my $dbh = $form->dbconnect($myconfig);
+ my $query = qq§SELECT c.accno, c.description, c.charttype, c.gifi_accno,
+ c.category,c.link, tk.taxkey_id, tk.pos_ustva, tk.tax_id,tk.tax_id||'--'||tk.taxkey_id AS tax, tk.startdate, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from, c.pos_bwa
+ FROM chart c LEFT JOIN taxkeys tk
+ ON (c.id=tk.chart_id AND tk.id = (SELECT id from taxkeys where taxkeys.chart_id =c.id AND startdate<=current_date ORDER BY startdate desc LIMIT 1))
+ WHERE c.id = $form->{id}§;
- my $query = qq|SELECT c.accno, c.description, c.charttype, c.gifi_accno,
- c.category, c.link, c.taxkey_id, c.pos_ustva, c.pos_bwa, c.pos_bilanz,c.pos_eur, c.new_chart_id, c.valid_from
- FROM chart c
- WHERE c.id = $form->{id}|;
my $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$sth->finish;
# get taxkeys and description
- $query = qq|SELECT taxkey, taxdescription
- FROM tax|;
+ $query = qq§SELECT id, taxkey,id||'--'||taxkey AS tax, taxdescription
+ FROM tax ORDER BY taxkey§;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
-
- $ref = $sth->fetchrow_hashref(NAME_lc);
-
+
+ $form->{TAXKEY} = [];
+
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
push @{ $form->{TAXKEY} }, $ref;
}
map({ $form->{$_} = "NULL" unless ($form->{$_}); }
qw(pos_ustva pos_bwa pos_bilanz pos_eur new_chart_id));
-
+ my($tax_id, $taxkey) = split /--/, $form->{tax};
$form->{valid_from} = ($form->{valid_from}) ? "'$form->{valid_from}'" : "NULL";
-
+ my $startdate = ($form->{startdate}) ? "'$form->{startdate}'" : "'1970-01-01'";
if ($form->{id} && $form->{orphaned}) {
$query = qq|UPDATE chart SET
accno = '$form->{accno}',
gifi_accno = '$form->{gifi_accno}',
category = '$form->{category}',
link = '$form->{link}',
- taxkey_id = $form->{taxkey_id},
+ taxkey_id = $taxkey,
pos_ustva = $form->{pos_ustva},
pos_bwa = $form->{pos_bwa},
pos_bilanz = $form->{pos_bilanz},
(accno, description, charttype, gifi_accno, category, link, taxkey_id, pos_ustva, pos_bwa, pos_bilanz,pos_eur, new_chart_id, valid_from)
VALUES ('$form->{accno}', '$form->{description}',
'$form->{charttype}', '$form->{gifi_accno}',
- '$form->{category}', '$form->{link}', $form->{taxkey_id}, $form->{pos_ustva}, $form->{pos_bwa}, $form->{pos_bilanz}, $form->{pos_eur}, $form->{new_chart_id}, $form->{valid_from})|;
+ '$form->{category}', '$form->{link}', $taxkey, $form->{pos_ustva}, $form->{pos_bwa}, $form->{pos_bilanz}, $form->{pos_eur}, $form->{new_chart_id}, $form->{valid_from})|;
}
$dbh->do($query) || $form->dberror($query);
- if ($form->{IC_taxpart} || $form->{IC_taxservice} || $form->{CT_tax}) {
-
- my $chart_id = $form->{id};
-
- unless ($form->{id}) {
-
- # get id from chart
- $query = qq|SELECT c.id
- FROM chart c
- WHERE c.accno = '$form->{accno}'|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- ($chart_id) = $sth->fetchrow_array;
- $sth->finish;
- }
-
- # add account if it doesn't exist in tax
- $query = qq|SELECT t.chart_id
- FROM tax t
- WHERE t.chart_id = $chart_id|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- my ($tax_id) = $sth->fetchrow_array;
- $sth->finish;
-
- # add tax if it doesn't exist
- unless ($tax_id) {
- $query = qq|INSERT INTO tax (chart_id, rate)
- VALUES ($chart_id, 0)|;
- $dbh->do($query) || $form->dberror($query);
- }
+ #Save Taxes
+ if (!$form->{id}) {
+ $query = qq|INSERT INTO taxkeys (chart_id,tax_id,taxkey_id, pos_ustva, startdate) VALUES ((SELECT id FROM chart where accno='$form->{accno}'), $tax_id, $taxkey,$form->{pos_ustva}, $startdate)|;
+ $dbh->do($query) || $form->dberror($query);
} else {
-
- # remove tax
- if ($form->{id}) {
- $query = qq|DELETE FROM tax
- WHERE chart_id = $form->{id}|;
- $dbh->do($query) || $form->dberror($query);
- }
+ $query = qq|DELETE FROM taxkeys WHERE chart_id=$form->{id} AND tax_id=$tax_id|;
+ $dbh->do($query) || $form->dberror($query);
+ $query = qq|INSERT INTO taxkeys (chart_id,tax_id,taxkey_id, pos_ustva, startdate) VALUES ($form->{id}, $tax_id, $taxkey,$form->{pos_ustva}, $startdate)|;
+ $dbh->do($query) || $form->dberror($query);
}
+# if ($form->{IC_taxpart} || $form->{IC_taxservice} || $form->{CT_tax}) {
+#
+# my $chart_id = $form->{id};
+#
+# unless ($form->{id}) {
+#
+# # get id from chart
+# $query = qq|SELECT c.id
+# FROM chart c
+# WHERE c.accno = '$form->{accno}'|;
+# $sth = $dbh->prepare($query);
+# $sth->execute || $form->dberror($query);
+#
+# ($chart_id) = $sth->fetchrow_array;
+# $sth->finish;
+# }
+#
+# # add account if it doesn't exist in tax
+# $query = qq|SELECT t.chart_id
+# FROM tax t
+# WHERE t.chart_id = $chart_id|;
+# $sth = $dbh->prepare($query);
+# $sth->execute || $form->dberror($query);
+#
+# my ($tax_id) = $sth->fetchrow_array;
+# $sth->finish;
+#
+# # add tax if it doesn't exist
+# unless ($tax_id) {
+# $query = qq|INSERT INTO tax (chart_id, rate)
+# VALUES ($chart_id, 0)|;
+# $dbh->do($query) || $form->dberror($query);
+# }
+# } else {
+#
+# # remove tax
+# if ($form->{id}) {
+# $query = qq|DELETE FROM tax
+# WHERE chart_id = $form->{id}|;
+# $dbh->do($query) || $form->dberror($query);
+# }
+# }
+
# commit
my $rc = $dbh->commit;
$dbh->disconnect;
$sth->finish;
}
+
+ $query = "SELECT inventory_accno_id FROM defaults";
+ ($form->{"std_inventory_accno_id"}) = $dbh->selectrow_array($query);
+
my $module = "IC";
$query = qq|SELECT c.accno, c.description, c.link, c.id,
d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
my $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- foreach my $key (split /:/, $ref->{link}) {
+ foreach my $key (split(/:/, $ref->{link})) {
+ if (!$form->{"std_inventory_accno_id"} && ($key eq "IC")) {
+ $form->{"std_inventory_accno_id"} = $ref->{"id"};
+ }
if ($key =~ /$module/) {
if ( ($ref->{id} eq $ref->{inventory_accno_id})
|| ($ref->{id} eq $ref->{income_accno_id})
description => $ref->{description},
selected => "selected",
id => $ref->{id} };
- } else {
+ } else {
push @{ $form->{"${module}_links"}{$key} },
{ accno => $ref->{accno},
description => $ref->{description},
$main::lxdebug->leave_sub();
}
-sub adr {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
-
- my $query = qq|SELECT id, adr_description, adr_code
- FROM adr
- ORDER BY adr_code|;
-
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- push @{ $form->{ALL} }, $ref;
- }
-
- $sth->finish;
- $dbh->disconnect;
-
- $main::lxdebug->leave_sub();
-}
-
-sub get_adr {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
-
- my $query =
- qq|SELECT a.adr_description, a.adr_code
- FROM adr a
- WHERE a.id = $form->{id}|;
- my $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
- my $ref = $sth->fetchrow_hashref(NAME_lc);
-
- map { $form->{$_} = $ref->{$_} } keys %$ref;
-
- $sth->finish;
-
- $dbh->disconnect;
-
- $main::lxdebug->leave_sub();
-}
-
-sub save_adr {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
-
- $form->{adr_description} =~ s/\'/\'\'/g;
- $form->{adr_code} =~ s/\'/\'\'/g;
-
-
- # id is the old record
- if ($form->{id}) {
- $query = qq|UPDATE adr SET
- adr_description = '$form->{adr_description}',
- adr_code = '$form->{adr_code}'
- WHERE id = $form->{id}|;
- } else {
- $query = qq|INSERT INTO adr
- (adr_description, adr_code)
- VALUES ('$form->{adr_description}', '$form->{adr_code}')|;
- }
- $dbh->do($query) || $form->dberror($query);
-
- $dbh->disconnect;
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_adr {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
-
- $query = qq|DELETE FROM adr
- WHERE id = $form->{id}|;
- $dbh->do($query) || $form->dberror($query);
-
- $dbh->disconnect;
-
- $main::lxdebug->leave_sub();
-}
-
sub payment {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form, $memberfile, $userspath, $webdav) = @_;
- map { ($form->{$_}) = split /--/, $form->{$_} }
+ map { ($form->{$_}) = split(/--/, $form->{$_}) }
qw(inventory_accno income_accno expense_accno fxgain_accno fxloss_accno);
my @a;
$form->{curr} =~ s/ //g;
- map { push(@a, uc pack "A3", $_) if $_ } split /:/, $form->{curr};
+ map { push(@a, uc pack "A3", $_) if $_ } split(/:/, $form->{curr});
$form->{curr} = join ':', @a;
# connect to database
WHERE login = '$form->{login}'|;
$dbh->do($query) || $form->dberror($query);
- foreach my $item (split / /, $form->{taxaccounts}) {
- $query = qq|UPDATE tax
- SET rate = | . ($form->{$item} / 100) . qq|,
- taxnumber = '$form->{"taxnumber_$item"}'
- WHERE chart_id = $item|;
- $dbh->do($query) || $form->dberror($query);
- }
+# foreach my $item (split(/ /, $form->{taxaccounts})) {
+# $query = qq|UPDATE tax
+# SET rate = | . ($form->{$item} / 100) . qq|,
+# taxnumber = '$form->{"taxnumber_$item"}'
+# WHERE chart_id = $item|;
+# $dbh->do($query) || $form->dberror($query);
+# }
my $rc = $dbh->commit;
$dbh->disconnect;
$query = qq|UPDATE defaults SET closedto = NULL,
revtrans = '1'|;
- } else {
- if ($form->{closedto}) {
+ } elsif ($form->{closedto}) {
- $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
+ $query = qq|UPDATE defaults SET closedto = '$form->{closedto}',
revtrans = '0'|;
- } else {
+ } else {
- $query = qq|UPDATE defaults SET closedto = NULL,
+ $query = qq|UPDATE defaults SET closedto = NULL,
revtrans = '0'|;
- }
}
# set close in defaults
projects / kivitendo-erp.git / blobdiff