projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verbrauchsbericht: Lager->Berichte->Lagerentnahme
[kivitendo-erp.git]
/
bin
/
mozilla
/
gl.pl
diff --git
a/bin/mozilla/gl.pl
b/bin/mozilla/gl.pl
index
8a81819
..
ea94a28
100644
(file)
--- a/
bin/mozilla/gl.pl
+++ b/
bin/mozilla/gl.pl
@@
-42,7
+42,7
@@
use SL::GL;
use SL::IS;
use SL::PE;
use SL::ReportGenerator;
use SL::IS;
use SL::PE;
use SL::ReportGenerator;
-use SL::DBUtils qw(selectrow_query);
+use SL::DBUtils qw(selectrow_query
selectall_hashref_query
);
require "bin/mozilla/common.pl";
require "bin/mozilla/reportgenerator.pl";
require "bin/mozilla/common.pl";
require "bin/mozilla/reportgenerator.pl";
@@
-165,7
+165,7
@@
sub prepare_transaction {
$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
- $form->{"taxchart_$i"} =
"0--0.
00";
+ $form->{"taxchart_$i"} =
$ref->{id}."--0.000
00";
$form->{"project_id_$i"} = $ref->{project_id};
$i++;
}
$form->{"project_id_$i"} = $ref->{project_id};
$i++;
}
@@
-528,6
+528,10
@@
sub update {
my $creditcount = 0;
my ($debitcredit, $amount);
my $creditcount = 0;
my ($debitcredit, $amount);
+ my $dbh = SL::DB->client->dbh;
+ my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
+ my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
+
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@
-566,10
+570,10
@@
sub update {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
- $form->{"taxchart_$i"} = "
0
--0.00";
+ $form->{"taxchart_$i"} = "
$notax_id
--0.00";
}
if (!$debitcredit && $debittax) {
}
if (!$debitcredit && $debittax) {
- $form->{"taxchart_$i"} = "
0
--0.00";
+ $form->{"taxchart_$i"} = "
$notax_id
--0.00";
}
$amount =
($form->{"debit_$i"} == 0)
}
$amount =
($form->{"debit_$i"} == 0)
@@
-577,11
+581,12
@@
sub update {
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
- $form->{"taxchart_$i"} = "
0
--0.00";
+ $form->{"taxchart_$i"} = "
$notax_id
--0.00";
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
if ($debitcredit) {
$debittax = 1;
} else {
@@
-896,7
+901,7
@@
sub form_footer {
my ($follow_ups, $follow_ups_due);
if ($::form->{id}) {
my ($follow_ups, $follow_ups_due);
if ($::form->{id}) {
- $follow_ups = FU->follow_ups('trans_id' => $::form->{id});
+ $follow_ups = FU->follow_ups('trans_id' => $::form->{id}
, 'not_done' => 1
);
$follow_ups_due = sum map { $_->{due} * 1 } @{ $follow_ups || [] };
}
$follow_ups_due = sum map { $_->{due} * 1 } @{ $follow_ups || [] };
}
@@
-992,9
+997,9
@@
sub post_transaction {
my $debitcredit;
my %split_safety = ();
my $debitcredit;
my %split_safety = ();
- my $dbh =
$form->dbconnect_noauto(\%myconfig)
;
+ my $dbh =
SL::DB->client->dbh
;
my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
-
$dbh->disconnect
;
+
my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", )
;
my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@
-1050,7
+1055,8
@@
sub post_transaction {
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
if ($debitcredit) {
$debittax = 1;
} else {