Revision e82db1a7
Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt
| SL/AM.pm | ||
|---|---|---|
| 1777 | 1777 |
taxdescription, |
| 1778 | 1778 |
round(rate * 100, 2) AS rate, |
| 1779 | 1779 |
chart_id, |
| 1780 |
chart_categories, |
|
| 1780 | 1781 |
(id IN (SELECT tax_id |
| 1781 | 1782 |
FROM acc_trans)) AS tax_already_used |
| 1782 | 1783 |
FROM tax |
| ... | ... | |
| 1834 | 1835 |
|
| 1835 | 1836 |
$form->{rate} = $form->{rate} / 100;
|
| 1836 | 1837 |
|
| 1837 |
my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id} );
|
|
| 1838 |
my $chart_categories = ''; |
|
| 1839 |
$chart_categories .= 'A' if $form->{asset};
|
|
| 1840 |
$chart_categories .= 'L' if $form->{liability};
|
|
| 1841 |
$chart_categories .= 'Q' if $form->{equity};
|
|
| 1842 |
$chart_categories .= 'I' if $form->{revenue};
|
|
| 1843 |
$chart_categories .= 'E' if $form->{expense};
|
|
| 1844 |
$chart_categories .= 'C' if $form->{costs};
|
|
| 1845 |
|
|
| 1846 |
my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id}, $chart_categories);
|
|
| 1838 | 1847 |
if ($form->{id} ne "") {
|
| 1839 | 1848 |
$query = qq|UPDATE tax SET |
| 1840 | 1849 |
taxkey = ?, |
| 1841 | 1850 |
taxdescription = ?, |
| 1842 | 1851 |
rate = ?, |
| 1843 | 1852 |
chart_id = ?, |
| 1844 |
taxnumber = (SELECT accno FROM chart WHERE id= ? ) |
|
| 1853 |
taxnumber = (SELECT accno FROM chart WHERE id= ? ), |
|
| 1854 |
chart_categories = ? |
|
| 1845 | 1855 |
WHERE id = ?|; |
| 1846 | 1856 |
push(@values, $form->{id});
|
| 1847 | 1857 |
|
| ... | ... | |
| 1852 | 1862 |
taxdescription, |
| 1853 | 1863 |
rate, |
| 1854 | 1864 |
chart_id, |
| 1855 |
taxnumber |
|
| 1865 |
taxnumber, |
|
| 1866 |
chart_categories |
|
| 1856 | 1867 |
) |
| 1857 |
VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?) )|; |
|
| 1868 |
VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ? )|;
|
|
| 1858 | 1869 |
} |
| 1859 | 1870 |
do_query($form, $dbh, $query, @values); |
| 1860 | 1871 |
|
Auch abrufbar als: Unified diff
Filtert Steuern bei Dialogbuchungen
Bei Dialogbuchungen kam es in der Vergangenheit zu Verwechslungen
von Umsatz- und Vorsteuer. Für jedes Konto werden daher nun Steuern
nur noch angezeigt, wenn die Steuer so eingestellt ist, dass sie
für die Kontoart des ausgewählten Kontos angezeigt wird.
Implementiert #2249.