$department = "";
} else {
if ($form->{report} eq "balance_sheet") {
- $name_1 = "compareasofdate";
- $id_1 = "compareasofdate";
- $value_1 = "";
+ $name_1 = "asofdate";
+ $id_1 = "asofdate";
+ $value_1 = "$form->{asofdate}";
$trigger_1 = "trigger1";
- $name_2 = "asofdate";
- $id_2 = "asofdate";
- $value_2 = "$form->{asofdate}";
+ $name_2 = "compareasofdate";
+ $id_2 = "compareasofdate";
+ $value_2 = "$form->{compareasofdate}";
$trigger_2 = "trigger2";
} elsif ($form->{report} =~ /(receipts|payments)$/) {
$name_1 = "fromdate";
#write Trigger
$jsscript =
- Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2", "",
- "", "");
+ Form->write_trigger(\%myconfig, "1", "$name_2", "BR", "$trigger_2");
} else {
$button1 = qq|
<input name=$name_1 id=$id_1 size=11 title="$myconfig{dateformat}" value=$value_1>|;
. $locale->text('button') . qq|>|;
$button2 = qq|
<input name=$name_2 id=$id_2 size=11 title="$myconfig{dateformat}">|;
- $button2_2 = qq|
+ $button2_2 = qq|
<input type=button name=$name_2 id="$trigger_2" value=|
. $locale->text('button') . qq|>
|;
<td><input name=l_heading class=checkbox type=checkbox value=Y> |
. $locale->text('Heading') . qq|
<input name=l_subtotal class=checkbox type=checkbox value=Y> |
- . $locale->text('Subtotal')
- . qq|</td>
+ . $locale->text('Subtotal') . qq|</td>
</tr>
$jsscript
<table>
<tr>
<th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
- . $locale->text('Customized Report')
- . qq|</th>
+ . $locale->text('Customized Report') . qq|</th>
</tr>
<tr>
<th colspan=1>| . $locale->text('Year') . qq|</th>
<td><input name=year size=11 title="|
- . $locale->text('YYYY')
- . qq|" value="$year"></td>
+ . $locale->text('YYYY') . qq|" value="$year"></td>
</tr>
|;
<td align=right> <input name=duetyp class=radio type=radio value="13"
"checked"></td>
<td><input name=duetyp class=radio type=radio value="A" $checked > 1. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
|;
$checked = "";
print qq|
<td><input name=duetyp class=radio type=radio value="1" $checked > |
- . $locale->text('January')
- . qq|</td>
+ . $locale->text('January') . qq|</td>
|;
$checked = "";
print qq|
<td><input name=duetyp class=radio type=radio value="5" $checked > |
- . $locale->text('May')
- . qq|</td>
+ . $locale->text('May') . qq|</td>
<td><input name=duetyp class=radio type=radio value="9" $checked > |
- . $locale->text('September')
- . qq|</td>
+ . $locale->text('September') . qq|</td>
</tr>
<tr>
<td align= right> </td>
<td><input name=duetyp class=radio type=radio value="B" $checked> 2. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
<td><input name=duetyp class=radio type=radio value="2" $checked > |
- . $locale->text('February')
- . qq|</td>
+ . $locale->text('February') . qq|</td>
<td><input name=duetyp class=radio type=radio value="6" $checked > |
- . $locale->text('June')
- . qq|</td>
+ . $locale->text('June') . qq|</td>
<td><input name=duetyp class=radio type=radio value="10" $checked > |
- . $locale->text('October')
- . qq|</td>
+ . $locale->text('October') . qq|</td>
</tr>
<tr>
<td> </td>
<td><input name=duetyp class=radio type=radio value="C" $checked> 3. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
<td><input name=duetyp class=radio type=radio value="3" $checked > |
- . $locale->text('March')
- . qq|</td>
+ . $locale->text('March') . qq|</td>
<td><input name=duetyp class=radio type=radio value="7" $checked > |
- . $locale->text('July')
- . qq|</td>
+ . $locale->text('July') . qq|</td>
<td><input name=duetyp class=radio type=radio value="11" $checked > |
- . $locale->text('November')
- . qq|</td>
+ . $locale->text('November') . qq|</td>
</tr>
<tr>
<td> </td>
<td><input name=duetyp class=radio type=radio value="D" $checked> 4. |
- . $locale->text('Quarter')
- . qq| </td>
+ . $locale->text('Quarter') . qq| </td>
<td><input name=duetyp class=radio type=radio value="4" $checked > |
- . $locale->text('April')
- . qq|</td>
+ . $locale->text('April') . qq|</td>
<td><input name=duetyp class=radio type=radio value="8" $checked > |
- . $locale->text('August')
- . qq|</td>
+ . $locale->text('August') . qq|</td>
<td><input name=duetyp class=radio type=radio value="12" $checked > |
- . $locale->text('December')
- . qq|</td>
+ . $locale->text('December') . qq|</td>
</tr>
<tr>
</tr>
<tr>
<th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
- . $locale->text('Free report period')
- . qq|</th>
+ . $locale->text('Free report period') . qq|</th>
<td align=left colspan=4>| . $locale->text('From') . qq|
$button1
$button1_2
</tr>
<tr>
<td colspan=5><hr size=3 noshade></td>
- </tr>
+ </tr>
<tr>
<th align=leftt>| . $locale->text('Method') . qq|</th>
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
<input name=method class=radio type=radio value=cash $cash>|
- . $locale->text('EUR')
- . qq|</td>
+ . $locale->text('EUR') . qq|</td>
</tr>
$jsscript
<table>
<tr>
<th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
- . $locale->text('Customized Report')
- . qq|</th>
+ . $locale->text('Customized Report') . qq|</th>
</tr>
<tr>
<th colspan=1>| . $locale->text('Year') . qq|</th>
<td><input name=year size=11 title="|
- . $locale->text('YYYY')
- . qq|" value="$year"></td>
+ . $locale->text('YYYY') . qq|" value="$year"></td>
</tr>
|;
<td align=right> <input name=duetyp class=radio type=radio value="13"
$checked></td>
<td><input name=duetyp class=radio type=radio value="A" $checked > 1. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
|;
$checked = "checked";
print qq|
<td><input name=duetyp class=radio type=radio value="1" $checked > |
- . $locale->text('January')
- . qq|</td>
+ . $locale->text('January') . qq|</td>
|;
$checked = "";
print qq|
<td><input name=duetyp class=radio type=radio value="5" $checked > |
- . $locale->text('May')
- . qq|</td>
+ . $locale->text('May') . qq|</td>
<td><input name=duetyp class=radio type=radio value="9" $checked > |
- . $locale->text('September')
- . qq|</td>
+ . $locale->text('September') . qq|</td>
</tr>
<tr>
<td align= right> </td>
<td><input name=duetyp class=radio type=radio value="B" $checked> 2. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
<td><input name=duetyp class=radio type=radio value="2" $checked > |
- . $locale->text('February')
- . qq|</td>
+ . $locale->text('February') . qq|</td>
<td><input name=duetyp class=radio type=radio value="6" $checked > |
- . $locale->text('June')
- . qq|</td>
+ . $locale->text('June') . qq|</td>
<td><input name=duetyp class=radio type=radio value="10" $checked > |
- . $locale->text('October')
- . qq|</td>
+ . $locale->text('October') . qq|</td>
</tr>
<tr>
<td> </td>
<td><input name=duetyp class=radio type=radio value="C" $checked> 3. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
<td><input name=duetyp class=radio type=radio value="3" $checked > |
- . $locale->text('March')
- . qq|</td>
+ . $locale->text('March') . qq|</td>
<td><input name=duetyp class=radio type=radio value="7" $checked > |
- . $locale->text('July')
- . qq|</td>
+ . $locale->text('July') . qq|</td>
<td><input name=duetyp class=radio type=radio value="11" $checked > |
- . $locale->text('November')
- . qq|</td>
+ . $locale->text('November') . qq|</td>
</tr>
<tr>
<td> </td>
<td><input name=duetyp class=radio type=radio value="D" $checked> 4. |
- . $locale->text('Quarter')
- . qq| </td>
+ . $locale->text('Quarter') . qq| </td>
<td><input name=duetyp class=radio type=radio value="4" $checked > |
- . $locale->text('April')
- . qq|</td>
+ . $locale->text('April') . qq|</td>
<td><input name=duetyp class=radio type=radio value="8" $checked > |
- . $locale->text('August')
- . qq|</td>
+ . $locale->text('August') . qq|</td>
<td><input name=duetyp class=radio type=radio value="12" $checked > |
- . $locale->text('December')
- . qq|</td>
+ . $locale->text('December') . qq|</td>
</tr>
<tr>
</tr>
<tr>
<th align=left><input name=reporttype class=radio type=radio value="free" $checked> |
- . $locale->text('Free report period')
- . qq|</th>
+ . $locale->text('Free report period') . qq|</th>
<td align=left colspan=4>| . $locale->text('From') . qq|
$button1
$button1_2
</tr>
<tr>
<td colspan=5><hr size=3 noshade></td>
- </tr>
+ </tr>
<tr>
<th align=leftt>| . $locale->text('Method') . qq|</th>
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
<input name=method class=radio type=radio value=cash $cash>|
- . $locale->text('EUR')
- . qq|</td>
+ . $locale->text('EUR') . qq|</td>
</tr>
-
-$jsscript
+ <tr>
+ <th align=right colspan=4>|
+ . $locale->text('Decimalplaces')
+ . qq|</th>
+ <td><input name=decimalplaces size=3 value="2"></td>
+ </tr>
+
+$jsscript
|;
}
if ($form->{report} eq "ustva") {
print qq|
-
+
<br>
<input type=hidden name=nextsub value=generate_ustva>
</table>
<table>
<tr>
<th align=left><input name=reporttype class=radio type=radio value="custom" checked> |
- . $locale->text('Zeitraum')
- . qq|</th>
+ . $locale->text('Zeitraum') . qq|</th>
</tr>
<tr>
<th colspan=1>| . $locale->text('Year') . qq|</th>
<td><input name=year size=11 title="|
- . $locale->text('YYYY')
- . qq|" value="$year"></td>
+ . $locale->text('YYYY') . qq|" value="$year"></td>
</tr>
|;
<td align=right> <input name=duetyp class=radio type=radio value="13"
$checked></td>
<td><input name=duetyp class=radio type=radio value="A" $checked > 1. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
|;
$checked = "checked";
print qq|
<td><input name=duetyp class=radio type=radio value="1" $checked > |
- . $locale->text('January')
- . qq|</td>
+ . $locale->text('January') . qq|</td>
|;
$checked = "";
print qq|
<td><input name=duetyp class=radio type=radio value="5" $checked > |
- . $locale->text('May')
- . qq|</td>
+ . $locale->text('May') . qq|</td>
<td><input name=duetyp class=radio type=radio value="9" $checked > |
- . $locale->text('September')
- . qq|</td>
+ . $locale->text('September') . qq|</td>
</tr>
<tr>
<td align= right> </td>
<td><input name=duetyp class=radio type=radio value="B" $checked> 2. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
<td><input name=duetyp class=radio type=radio value="2" $checked > |
- . $locale->text('February')
- . qq|</td>
+ . $locale->text('February') . qq|</td>
<td><input name=duetyp class=radio type=radio value="6" $checked > |
- . $locale->text('June')
- . qq|</td>
+ . $locale->text('June') . qq|</td>
<td><input name=duetyp class=radio type=radio value="10" $checked > |
- . $locale->text('October')
- . qq|</td>
+ . $locale->text('October') . qq|</td>
</tr>
<tr>
<td> </td>
<td><input name=duetyp class=radio type=radio value="C" $checked> 3. |
- . $locale->text('Quarter')
- . qq|</td>
+ . $locale->text('Quarter') . qq|</td>
<td><input name=duetyp class=radio type=radio value="3" $checked > |
- . $locale->text('March')
- . qq|</td>
+ . $locale->text('March') . qq|</td>
<td><input name=duetyp class=radio type=radio value="7" $checked > |
- . $locale->text('July')
- . qq|</td>
+ . $locale->text('July') . qq|</td>
<td><input name=duetyp class=radio type=radio value="11" $checked > |
- . $locale->text('November')
- . qq|</td>
+ . $locale->text('November') . qq|</td>
</tr>
<tr>
<td> </td>
<td><input name=duetyp class=radio type=radio value="D" $checked> 4. |
- . $locale->text('Quarter')
- . qq| </td>
+ . $locale->text('Quarter') . qq| </td>
<td><input name=duetyp class=radio type=radio value="4" $checked > |
- . $locale->text('April')
- . qq|</td>
+ . $locale->text('April') . qq|</td>
<td><input name=duetyp class=radio type=radio value="8" $checked > |
- . $locale->text('August')
- . qq|</td>
+ . $locale->text('August') . qq|</td>
<td><input name=duetyp class=radio type=radio value="12" $checked > |
- . $locale->text('December')
- . qq|</td>
+ . $locale->text('December') . qq|</td>
</tr>
<tr>
<td colspan=5><hr size=3 noshade></td>
- </tr>
+ </tr>
<tr>
<th align=left>| . $locale->text('Method') . qq|</th>
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
<input name=method class=radio type=radio value=cash $cash>|
- . $locale->text('EUR')
- . qq|</td>
+ . $locale->text('EUR') . qq|</td>
</tr>
<tr>
<th colspan=4>|;
</tr>
<tr>
<th align=right>| . $locale->text('Decimalplaces') . qq|</th>
- <td><input name=decimalplaces size=3></td>
+ <td><input name=decimalplaces size=3 value="2"></td>
</tr>
</table>
</td>
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
<input name=method class=radio type=radio value=cash $cash>|
- . $locale->text('EUR')
- . qq|</td>
+ . $locale->text('EUR') . qq|</td>
</tr>
<tr>
<input name=l_subtotal class=checkbox type=checkbox value=Y> |
. $locale->text('Subtotal') . qq|
<input name=l_accno class=checkbox type=checkbox value=Y> |
- . $locale->text('Account Number')
- . qq|</td>
+ . $locale->text('Account Number') . qq|</td>
</tr>
-
+
$jsscript
|;
}
<input name=l_subtotal class=checkbox type=checkbox value=Y> |
. $locale->text('Subtotal') . qq|
<input name=all_accounts class=checkbox type=checkbox value=Y> |
- . $locale->text('All Accounts')
- . qq|</td>
+ . $locale->text('All Accounts') . qq|</td>
</tr>
-
+
$jsscript
|;
}
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
<input name=method class=radio type=radio value=cash $cash>|
- . $locale->text('EUR')
- . qq|</td>
+ . $locale->text('EUR') . qq|</td>
</tr>
</table>
</td>
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>|
. $locale->text('Accrual') . qq|
<input name=method class=radio type=radio value=cash $cash>|
- . $locale->text('EUR')
- . qq|</td>
+ . $locale->text('EUR') . qq|</td>
</tr>
<tr>
<th align=right>| . $locale->text('Include in Report') . qq|</th>
<input type=hidden name=nextsub value=$nextsub>
<input type=hidden name=action value=$nextsub>
-
+
$jsscript
|;
}
<tr>
<td align=right><input type=checkbox style=checkbox name=fx_transaction value=1 checked></td>
<th align=left colspan=3>|
- . $locale->text('Include Exchangerate Difference')
- . qq|</td>
+ . $locale->text('Include Exchangerate Difference') . qq|</td>
</tr>
-$jsscript
-
+$jsscript
+
<input type=hidden name=db value=$form->{db}>
<input type=hidden name=sort value=transdate>
|;
$longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
- $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
+ $form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
$locale->text('for Period')
- . qq|<br>\n$longfromdate |
+ . qq|\n$longfromdate |
. $locale->text('Bis')
. qq| $longtodate|;
}
$longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
$shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
- $form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
+ $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
$form->{period} .=
- "<br>\n$longcomparefromdate "
+ "\n$longcomparefromdate "
. $locale->text('Bis')
. qq| $longcomparetodate|;
}
# setup variables for the form
@a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
- $form->{address} =~ s/\\n/<br>/g;
$form->{templates} = $myconfig{templates};
$form->{IN} = "balance_sheet.html";
# setup company variables for the form
- map { $form->{$_} = $myconfig{$_} }
+ map { $form->{$_} = $myconfig{$_};
+ $form->{$_} =~ s/\\n/\n/g; }
(qw(company address businessnumber nativecurr));
- $form->{address} =~ s/\\n/<br>/g;
$form->{templates} = $myconfig{templates};
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
- $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, " ");
- $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, " ");
+ $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " ";
+ $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " ";
$begbalance =
$form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " ");
$endbalance =
$i++;
if ($subtotal) {
- $c0subtotal =
- $form->format_amount(\%myconfig, $c0subtotal, 2, " ");
- $c30subtotal =
- $form->format_amount(\%myconfig, $c30subtotal, 2, " ");
- $c60subtotal =
- $form->format_amount(\%myconfig, $c60subtotal, 2, " ");
- $c90subtotal =
- $form->format_amount(\%myconfig, $c90subtotal, 2, " ");
+ $c0subtotal = ($c0subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c0subtotal, 2, " ") : "";
+ $c30subtotal = ($c30subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c30subtotal, 2, " ") : "";
+ $c60subtotal = ($c60subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c60subtotal, 2, " ") : "";
+ $c90subtotal = ($c90subtotal != 0) ?
+ $form->format_amount(\%myconfig, $c90subtotal, 2, " ") : "";
}
$column_data{ct} = qq|<th> </th>|;
$c60total += $ref->{c60};
$c90total += $ref->{c90};
- $ref->{c0} = $form->format_amount(\%myconfig, $ref->{c0}, 2, " ");
- $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, " ");
- $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, " ");
- $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, " ");
+ $ref->{c0} = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0}, 2, " ") : "";
+ $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, " ") : "";
+ $ref->{c60} = ($ref->{c60} != 0) ? $form->format_amount(\%myconfig, $ref->{c60}, 2, " ") : "";
+ $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : "";
$href =
qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=|
<input type=hidden name=path value=$form->{path}>
<input type=hidden name=login value=$form->{login}>
<input type=hidden name=password value=$form->{password}>
-
+
<br>
<input class=submit type=submit name=action value="|
. $locale->text('Select all') . qq|">
<input class=submit type=submit name=action value="|
. $locale->text('Print') . qq|">
<input class=submit type=submit name=action value="|
- . $locale->text('E-mail') . qq|">
-|;
- }
-
- if ($form->{menubar}) {
- require "$form->{path}/menu.pl";
- &menubar;
- }
+ . $locale->text('E-mail') . qq|">|;
+}
- print qq|
+print qq|
</form>
</body>
$lxdebug->leave_sub();
}
-sub print_options {
- $lxdebug->enter_sub();
-
- $form->{sendmode} = "attachment";
- $form->{copies} = 2 unless $form->{copies};
-
- $form->{PD}{ $form->{type} } = "selected";
- $form->{DF}{ $form->{format} } = "selected";
- $form->{OP}{ $form->{media} } = "selected";
- $form->{SM}{ $form->{sendmode} } = "selected";
-
- $type = qq|
- <option value=statement $form->{PD}{statement}>|
- . $locale->text('Statement');
-
- if ($form->{media} eq 'email') {
- $media = qq|
- <option value=attachment $form->{SM}{attachment}>|
- . $locale->text('Attachment') . qq|
- <option value=inline $form->{SM}{inline}>| . $locale->text('In-line');
- } else {
- $media = qq|
- <option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex) {
- $media .= qq|
- <option value=printer $form->{OP}{printer}>|
- . $locale->text('Printer');
- }
- }
-
- if ($latex) {
- $format .= qq|
- <option value=postscript $form->{DF}{postscript}>|
- . $locale->text('Postscript') . qq|
- <option value=pdf $form->{DF}{pdf}>| . $locale->text('PDF');
- }
-
- print qq|
-<table>
- <tr>
- <td><select name=type>$type</select></td>
- <td><select name=format>$format</select></td>
- <td><select name=media>$media</select></td>
-|;
-
- if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
- print qq|
- <td>| . $locale->text('Copies') . qq|
- <input name=copies size=2 value=$form->{copies}></td>
-|;
- }
-
- print qq|
- </tr>
-</table>
-|;
-
- $lxdebug->leave_sub();
-}
-
sub e_mail {
$lxdebug->enter_sub();
$form->{templates} = "$myconfig{templates}";
- # setup variables for the form
- @a = qw(company address businessnumber tel fax);
- map { $form->{$_} = $myconfig{$_} } @a;
- $form->format_string(@a);
-
$form->{IN} = "$form->{type}.html";
if ($form->{format} eq 'postscript') {
(name, street, zipcode, city, country, contact, email,
"$form->{ct}phone", "$form->{ct}fax");
map { $form->{$_} = $ref->{$_} } @a;
- $form->format_string(@a);
$form->{ $form->{ct} } = $form->{name};
$form->{"$form->{ct}_id"} = $ref->{ctid};
sub winston_export {
$lxdebug->enter_sub();
- print(STDERR "Winston Export1\n");
#create_winston();
$form->{winston} = 1;
$lxdebug->enter_sub();
$form->{sendmode} = "attachment";
- $form->{copies} = 2 unless $form->{copies};
+
+ $form->{"format"} =
+ $form->{"format"} ? $form->{"format"} :
+ $myconfig{"template_format"} ? $myconfig{"template_format"} :
+ "pdf";
+
+ $form->{"copies"} =
+ $form->{"copies"} ? $form->{"copies"} :
+ $myconfig{"copies"} ? $myconfig{"copies"} :
+ 2;
$form->{PD}{ $form->{type} } = "selected";
$form->{DF}{ $form->{format} } = "selected";
} else {
$media = qq|
<option value=screen $form->{OP}{screen}>| . $locale->text('Screen');
- if ($myconfig{printer} && $latex) {
+ if ($myconfig{printer} && $latex_templates) {
$media .= qq|
<option value=printer $form->{OP}{printer}>|
. $locale->text('Printer');
}
}
- if ($latex) {
+ if ($latex_templates) {
$format .= qq|
<option value=html $form->{DF}{html}>|
. $locale->text('HTML') . qq|
<td><select name=media>$media</select></td>
|;
- if ($myconfig{printer} && $latex && $form->{media} ne 'email') {
+ if ($myconfig{printer} && $latex_templates && $form->{media} ne 'email') {
print qq|
<td>| . $locale->text('Copies') . qq|
<input name=copies size=2 value=$form->{copies}></td>
$longfromdate = $locale->date(\%germandate, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%germandate, $form->{fromdate}, 0);
- $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
+ $form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
$locale->text('for Period')
- . qq|<br>\n$longfromdate |
+ . qq|\n$longfromdate |
. $locale->text('bis')
. qq| $longtodate|;
}
# setup variables for the form
@a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
- $form->{address} =~ s/\\n/<br>/g;
$form->{templates} = $myconfig{templates};
$form->{IN} = "bwa.html";
# Hier Aufruf von get_config aus bin/mozilla/fa.pl zum
# Einlesen der Finanzamtdaten
- print(STDERR "Winston4\n");
get_config($userspath, 'finanzamt.ini');
# &get_project(generate_bwa);
foreach $item (@anmeldungszeitraum) {
$form->{$item} = "";
}
- print(STDERR "Winston2\n");
if ($form->{reporttype} eq "custom") {
#forgotten the year --> thisyear
$longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
- $form->{this_period} = "$shortfromdate<br>\n$shorttodate";
+ $form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
$locale->text('for Period')
. qq|<br>\n$longfromdate |
$longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
$shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
- $form->{last_period} = "$shortcomparefromdate<br>\n$shortcomparetodate";
+ $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
$form->{period} .=
- "<br>\n$longcomparefromdate "
+ "\n$longcomparefromdate "
. $locale->text('bis')
. qq| $longcomparetodate|;
}
$form->{address} =~ s/\\n/$form->{br}/g;
if ($form->{winston} eq '1') {
- print(STDERR "fast bei winston\n");
create_winston();
} else {
}
$lxdebug->leave_sub();
}
-