Revision d333f237
Von Moritz Bunkus vor fast 18 Jahren hinzugefügt
| bin/mozilla/rp.pl | ||
|---|---|---|
| 703 | 703 |
} |
| 704 | 704 |
|
| 705 | 705 |
if ($form->{report} =~ /^tax_/) {
|
| 706 |
$gifi = ""; |
|
| 707 |
|
|
| 708 | 706 |
$form->{db} = ($form->{report} =~ /_collected/) ? "ar" : "ap";
|
| 709 | 707 |
|
| 710 | 708 |
RP->get_taxaccounts(\%myconfig, \%$form); |
| ... | ... | |
| 741 | 739 |
|
| 742 | 740 |
</td> |
| 743 | 741 |
</tr> |
| 744 |
|; |
|
| 745 |
|
|
| 746 |
if (@{ $form->{gifi_taxaccounts} }) {
|
|
| 747 |
print qq| |
|
| 748 |
<tr> |
|
| 749 |
<th align=right>| . $locale->text('GIFI') . qq|</th>
|
|
| 750 |
<td colspan=3> |
|
| 751 |
|; |
|
| 752 |
|
|
| 753 |
foreach $ref (@{ $form->{gifi_taxaccounts} }) {
|
|
| 754 |
|
|
| 755 |
|
|
| 756 |
qq|<input name=accno class=radio type=radio value="gifi_$ref->{accno}"> $ref->{description}
|
|
| 757 |
|
|
| 758 |
<input name="gifi_$ref->{accno}_description" type=hidden value="$ref->{description}">
|
|
| 759 |
<input name="gifi_$ref->{accno}_rate" type=hidden value="$ref->{rate}">|;
|
|
| 760 |
|
|
| 761 |
} |
|
| 762 |
|
|
| 763 |
print qq| |
|
| 764 |
</td> |
|
| 765 |
</tr> |
|
| 766 |
|; |
|
| 767 |
} |
|
| 768 |
|
|
| 769 |
print qq| |
|
| 770 | 742 |
<tr> |
| 771 | 743 |
<th align=right>| . $locale->text('Method') . qq|</th>
|
| 772 | 744 |
<td colspan=3><input name=method class=radio type=radio value=accrual $accrual>| |
| ... | ... | |
| 823 | 795 |
} |
| 824 | 796 |
|
| 825 | 797 |
if ($form->{report} =~ /^nontaxable_/) {
|
| 826 |
$gifi = ""; |
|
| 827 |
|
|
| 828 | 798 |
$form->{db} = ($form->{report} =~ /_sales/) ? "ar" : "ap";
|
| 829 | 799 |
|
| 830 | 800 |
print qq| |
| ... | ... | |
| 888 | 858 |
} |
| 889 | 859 |
|
| 890 | 860 |
if (($form->{report} eq "ar_aging") || ($form->{report} eq "ap_aging")) {
|
| 891 |
$gifi = ""; |
|
| 892 |
|
|
| 893 | 861 |
if ($form->{report} eq 'ar_aging') {
|
| 894 | 862 |
$label = $locale->text('Customer');
|
| 895 | 863 |
$form->{vc} = 'customer';
|
| ... | ... | |
| 938 | 906 |
# above action can be removed if there is more than one input field |
| 939 | 907 |
|
| 940 | 908 |
if ($form->{report} =~ /(receipts|payments)$/) {
|
| 941 |
$gifi = ""; |
|
| 942 |
|
|
| 943 | 909 |
$form->{db} = ($form->{report} =~ /payments$/) ? "ap" : "ar";
|
| 944 | 910 |
|
| 945 | 911 |
RP->paymentaccounts(\%myconfig, \%$form); |
| ... | ... | |
| 1358 | 1324 |
$column_header{endbalance} =
|
| 1359 | 1325 |
qq|<th class=listheading>| . $locale->text('Balance') . qq|</th>|;
|
| 1360 | 1326 |
|
| 1361 |
if ($form->{accounttype} eq 'gifi') {
|
|
| 1362 |
$column_header{accno} =
|
|
| 1363 |
qq|<th class=listheading>| . $locale->text('GIFI') . qq|</th>|;
|
|
| 1364 |
} |
|
| 1365 |
|
|
| 1366 | 1327 |
$form->header; |
| 1367 | 1328 |
|
| 1368 | 1329 |
print qq| |
| ... | ... | |
| 1393 | 1354 |
$description = $form->escape($ref->{description});
|
| 1394 | 1355 |
|
| 1395 | 1356 |
$href = |
| 1396 |
qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}|;
|
|
| 1397 |
|
|
| 1398 |
if ($form->{accounttype} eq 'gifi') {
|
|
| 1399 |
$href .= "&gifi_accno=$ref->{accno}&gifi_description=$description";
|
|
| 1400 |
$na = $locale->text('N/A');
|
|
| 1401 |
map { $ref->{$_} = $na } qw(accno description) unless $ref->{accno};
|
|
| 1402 |
} else {
|
|
| 1403 |
$href .= "&accno=$ref->{accno}&description=$description";
|
|
| 1404 |
} |
|
| 1357 |
qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description";
|
|
| 1405 | 1358 |
|
| 1406 | 1359 |
$ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
|
| 1407 | 1360 |
|
| ... | ... | |
| 2167 | 2120 |
$description = $form->escape($form->{$descvar});
|
| 2168 | 2121 |
$ratevar = "$form->{accno}_rate";
|
| 2169 | 2122 |
|
| 2170 |
if ($form->{accno} =~ /^gifi_/) {
|
|
| 2171 |
$descvar = "gifi_$form->{accno}_description";
|
|
| 2172 |
$description = $form->escape($form->{$descvar});
|
|
| 2173 |
$ratevar = "gifi_$form->{accno}_rate";
|
|
| 2174 |
} |
|
| 2175 |
|
|
| 2176 | 2123 |
$department = $form->escape($form->{department});
|
| 2177 | 2124 |
|
| 2178 | 2125 |
# construct href |
| ... | ... | |
| 2185 | 2132 |
$callback = |
| 2186 | 2133 |
"$form->{script}?path=$form->{path}&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}";
|
| 2187 | 2134 |
|
| 2188 |
$form->{title} = $locale->text('GIFI') . " - "
|
|
| 2189 |
if ($form->{accno} =~ /^gifi_/);
|
|
| 2190 |
|
|
| 2191 | 2135 |
$title = $form->escape($form->{title});
|
| 2192 | 2136 |
$href .= "&title=$title"; |
| 2193 | 2137 |
$title = $form->escape($form->{title}, 1);
|
Auch abrufbar als: Unified diff
Weitere Vorkommen von GIFI entfernt. GIFI müsste bis auf Spalte chart.gifi_accno und Tabelle chart komplett entfernt sein.