projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preisfaktoren in Erzeugnissen auch im globalen Verkaufspreis richtig übernehmen.
[kivitendo-erp.git]
/
bin
/
mozilla
/
gl.pl
diff --git
a/bin/mozilla/gl.pl
b/bin/mozilla/gl.pl
index
0f34f1b
..
185e2a5
100644
(file)
--- a/
bin/mozilla/gl.pl
+++ b/
bin/mozilla/gl.pl
@@
-793,7
+793,7
@@
sub display_rows {
my $taxchart_init;
foreach my $item (@{ $form->{ALL_CHARTS} }) {
my $key = $item->{accno} . "--" . $item->{tax_id};
my $taxchart_init;
foreach my $item (@{ $form->{ALL_CHARTS} }) {
my $key = $item->{accno} . "--" . $item->{tax_id};
- $taxchart_init = $item->{tax
key
_id} unless (@chart_values);
+ $taxchart_init = $item->{tax_id} unless (@chart_values);
push(@chart_values, $key);
$chart_labels{$key} = $item->{accno} . "--" . $item->{description};
$charts{$item->{accno}} = $item;
push(@chart_values, $key);
$chart_labels{$key} = $item->{accno} . "--" . $item->{description};
$charts{$item->{accno}} = $item;
@@
-804,7
+804,7
@@
sub display_rows {
my %taxcharts = ();
foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
my $key = $item->{id} . "--" . $item->{rate};
my %taxcharts = ();
foreach my $item (@{ $form->{ALL_TAXCHARTS} }) {
my $key = $item->{id} . "--" . $item->{rate};
- $taxchart_init = $key if ($taxchart_init
eq $item->{taxkey
});
+ $taxchart_init = $key if ($taxchart_init
== $item->{id
});
push(@taxchart_values, $key);
$taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %';
$taxcharts{$item->{id}} = $item;
push(@taxchart_values, $key);
$taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %';
$taxcharts{$item->{id}} = $item;
@@
-839,13
+839,13
@@
sub display_rows {
$selected_taxchart = "$item->{id}--$item->{rate}";
}
$selected_taxchart = "$item->{id}--$item->{rate}";
}
- $selected_accno = '' if ($init);
- $selected_taxchart
= $taxchart_init unless ($selected_taxchart ne "")
;
+ $selected_accno
= '' if ($init);
+ $selected_taxchart
||= $taxchart_init
;
$accno = qq|<td>| .
NTI($cgi->popup_menu('-name' => "accno_$i",
'-id' => "accno_$i",
$accno = qq|<td>| .
NTI($cgi->popup_menu('-name' => "accno_$i",
'-id' => "accno_$i",
- '-onChange' => "setTaxkey(
this,
$i)",
+ '-onChange' => "setTaxkey($i)",
'-style' => 'width:200px',
'-values' => \@chart_values,
'-labels' => \%chart_labels,
'-style' => 'width:200px',
'-values' => \@chart_values,
'-labels' => \%chart_labels,
@@
-990,7
+990,8
@@
sub form_header {
$form->{javascript} = qq|<script type="text/javascript">
<!--
$form->{javascript} = qq|<script type="text/javascript">
<!--
- function setTaxkey(accno, row) {
+ function setTaxkey(row) {
+ var accno = document.getElementById('accno_' + row);
var taxkey = accno.options[accno.selectedIndex].value;
var reg = /--([0-9]*)/;
var found = reg.exec(taxkey);
var taxkey = accno.options[accno.selectedIndex].value;
var reg = /--([0-9]*)/;
var found = reg.exec(taxkey);
@@
-1291,7
+1292,7
@@
$follow_ups_block
. qq|"> |;
} else {
. qq|"> |;
} else {
-
print qq|
+ print qq|
<input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="| . $locale->text('Post') . qq|">|;
}
<input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
<input class=submit type=submit name=action value="| . $locale->text('Post') . qq|">|;
}