projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bei der Umwandlung von Angeboten/Anfragen in Auftraege wurden verschiedene Felder...
[kivitendo-erp.git]
/
bin
/
mozilla
/
gl.pl
diff --git
a/bin/mozilla/gl.pl
b/bin/mozilla/gl.pl
index
445d4f3
..
6d4cb66
100644
(file)
--- a/
bin/mozilla/gl.pl
+++ b/
bin/mozilla/gl.pl
@@
-693,14
+693,14
@@
sub generate_report {
foreach $key (sort keys(%{ $ref->{debit_accno} })) {
if ($key == 0) {
$debitaccno =
foreach $key (sort keys(%{ $ref->{debit_accno} })) {
if ($key == 0) {
$debitaccno =
- "<a href=$href&accno=$ref->{
accno
}&callback=$callback>$ref->{debit_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{
debit_accno}{$key
}&callback=$callback>$ref->{debit_accno}{$key}</a>";
} else {
$debitaccno .=
} else {
$debitaccno .=
- "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{debit_accno}{$key}</a>";
- }
- if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
- $ref->{debit_tax_accno}{$key} = $taxaccno;
+ "<br><a href=$href&accno=$ref->{debit_accno}{$key}&callback=$callback>$ref->{debit_accno}{$key}</a>";
}
}
+# if ($ref->{debit_taxkey}{$key} eq $debittaxkey) {
+# $ref->{debit_tax_accno}{$key} = $taxaccno;
+# }
$taxaccno = $ref->{debit_tax_accno}{$key};
$debittaxkey = $ref->{debit_taxkey}{$key};
}
$taxaccno = $ref->{debit_tax_accno}{$key};
$debittaxkey = $ref->{debit_taxkey}{$key};
}
@@
-711,14
+711,14
@@
sub generate_report {
foreach $key (sort keys(%{ $ref->{credit_accno} })) {
if ($key == 0) {
$creditaccno =
foreach $key (sort keys(%{ $ref->{credit_accno} })) {
if ($key == 0) {
$creditaccno =
- "<a href=$href&accno=$ref->{
accno
}&callback=$callback>$ref->{credit_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{
credit_accno}{$key
}&callback=$callback>$ref->{credit_accno}{$key}</a>";
} else {
$creditaccno .=
} else {
$creditaccno .=
- "<br><a href=$href&accno=$ref->{accno}&callback=$callback>$ref->{credit_accno}{$key}</a>";
- }
- if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
- $ref->{credit_tax_accno}{$key} = $taxaccno;
+ "<br><a href=$href&accno=$ref->{credit_accno}{$key}&callback=$callback>$ref->{credit_accno}{$key}</a>";
}
}
+# if ($ref->{credit_taxkey}{$key} eq $credittaxkey) {
+# $ref->{credit_tax_accno}{$key} = $taxaccno;
+# }
$taxaccno = $ref->{credit_tax_accno}{$key};
$credittaxkey = $ref->{credit_taxkey}{$key};
}
$taxaccno = $ref->{credit_tax_accno}{$key};
$credittaxkey = $ref->{credit_taxkey}{$key};
}
@@
-727,10
+727,10
@@
sub generate_report {
foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
if ($key == 0) {
$debittaxaccno =
foreach $key (sort keys(%{ $ref->{debit_tax_accno} })) {
if ($key == 0) {
$debittaxaccno =
- "<a href=$href&accno=$ref->{
accno
}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{
debit_tax_accno}{$key
}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
} else {
$debittaxaccno .=
} else {
$debittaxaccno .=
- "<br><a href=$href&accno=$ref->{
accno
}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
+ "<br><a href=$href&accno=$ref->{
debit_tax_accno}{$key
}&callback=$callback>$ref->{debit_tax_accno}{$key}</a>";
}
}
}
}
@@
-738,10
+738,10
@@
sub generate_report {
foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
if ($key == 0) {
$credittaxaccno =
foreach $key (sort keys(%{ $ref->{credit_tax_accno} })) {
if ($key == 0) {
$credittaxaccno =
- "<a href=$href&accno=$ref->{
accno
}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+ "<a href=$href&accno=$ref->{
credit_tax_accno}{$key
}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
} else {
$credittaxaccno .=
} else {
$credittaxaccno .=
- "<br><a href=$href&accno=$ref->{
accno
}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
+ "<br><a href=$href&accno=$ref->{
credit_tax_accno}{$key
}&callback=$callback>$ref->{credit_tax_accno}{$key}</a>";
}
}
}
}
@@
-1041,18
+1041,18
@@
sub display_rows {
for $i (1 .. $form->{rowcount}) {
$source = qq|
for $i (1 .. $form->{rowcount}) {
$source = qq|
- <td><input name="source_$i" value="$form->{"source_$i"}" tabindex=|
+ <td><input name="source_$i" value="$form->{"source_$i"}"
size="16"
tabindex=|
. ($i + 11 + (($i - 1) * 8)) . qq|></td>|;
$memo = qq|
. ($i + 11 + (($i - 1) * 8)) . qq|></td>|;
$memo = qq|
- <td><input name="memo_$i" value="$form->{"memo_$i"}" tabindex=|
+ <td><input name="memo_$i" value="$form->{"memo_$i"}"
size="16"
tabindex=|
. ($i + 12 + (($i - 1) * 8)) . qq|></td>|;
if ($init) {
$accno = qq|
. ($i + 12 + (($i - 1) * 8)) . qq|></td>|;
if ($init) {
$accno = qq|
- <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:
3
00px" tabindex=|
+ <td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:
2
00px" tabindex=|
. ($i + 5 + (($i - 1) * 8)) . qq|>$form->{chartinit}</select></td>|;
$tax =
. ($i + 5 + (($i - 1) * 8)) . qq|>$form->{chartinit}</select></td>|;
$tax =
- qq|<td><select id="taxchart_$i" name="taxchart_$i" tabindex=|
+ qq|<td><select id="taxchart_$i" name="taxchart_$i"
style="width:200px"
tabindex=|
. ($i + 10 + (($i - 1) * 8))
. qq|>$form->{taxchart}</select></td>|;
# if ($form->{selectprojectnumber}) {
. ($i + 10 + (($i - 1) * 8))
. qq|>$form->{taxchart}</select></td>|;
# if ($form->{selectprojectnumber}) {
@@
-1096,7
+1096,7
@@
sub display_rows {
$accno =~
s/value=\"$chart_selected\"/value=\"$chart_selected\" selected/;
$accno =
$accno =~
s/value=\"$chart_selected\"/value=\"$chart_selected\" selected/;
$accno =
- qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:
3
00px" tabindex=|
+ qq|<td><select name="accno_$i" onChange="setTaxkey(this, $i)" style="width:
2
00px" tabindex=|
. ($i + 5 + (($i - 1) * 8))
. qq|>$accno</select></td>|;
$tax = $taxchart;
. ($i + 5 + (($i - 1) * 8))
. qq|>$accno</select></td>|;
$tax = $taxchart;
@@
-1166,11
+1166,11
@@
sub display_rows {
print qq|<tr valign=top>
$accno
$fx_transaction
print qq|<tr valign=top>
$accno
$fx_transaction
- <td><input name="debit_$i" size=
10
value="$form->{"debit_$i"}" accesskey=$i tabindex=|
+ <td><input name="debit_$i" size=
8
value="$form->{"debit_$i"}" accesskey=$i tabindex=|
. ($i + 6 + (($i - 1) * 8)) . qq| $debitreadonly></td>
. ($i + 6 + (($i - 1) * 8)) . qq| $debitreadonly></td>
- <td><input name="credit_$i" size=
10
value="$form->{"credit_$i"}" tabindex=|
+ <td><input name="credit_$i" size=
8
value="$form->{"credit_$i"}" tabindex=|
. ($i + 7 + (($i - 1) * 8)) . qq| $creditreadonly></td>
. ($i + 7 + (($i - 1) * 8)) . qq| $creditreadonly></td>
- <td><input name="tax_$i" size=
8
value="$form->{"tax_$i"}" tabindex=|
+ <td><input name="tax_$i" size=
6
value="$form->{"tax_$i"}" tabindex=|
. ($i + 8 + (($i - 1) * 8)) . qq|></td>
$korrektur
$tax
. ($i + 8 + (($i - 1) * 8)) . qq|></td>
$korrektur
$tax
@@
-1259,7
+1259,7
@@
sub form_header {
# with JavaScript Calendar
$button1 = qq|
# with JavaScript Calendar
$button1 = qq|
- <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=
$form->{transdate}
tabindex="2" $readonly>
+ <td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=
"$form->{transdate}"
tabindex="2" $readonly>
<input type=button name=transdate id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
<input type=button name=transdate id="trigger1" value=|
. $locale->text('button') . qq|></td>
|;
@@
-1272,7
+1272,7
@@
sub form_header {
# without JavaScript Calendar
$button1 =
# without JavaScript Calendar
$button1 =
- qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=
$form->{transdate}
tabindex="2" $readonly></td>|;
+ qq|<td><input name=transdate id=transdate size=11 title="$myconfig{dateformat}" value=
"$form->{transdate}"
tabindex="2" $readonly></td>|;
}
$form->header;
}
$form->header;