Revision 14d71a6d
Von Sven Schöling vor fast 9 Jahren hinzugefügt
| SL/AM.pm | ||
|---|---|---|
| 59 | 59 |
my $dbh = $form->dbconnect($myconfig); |
| 60 | 60 |
my $query = qq{
|
| 61 | 61 |
SELECT c.accno, c.description, c.charttype, c.category, |
| 62 |
c.link, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from, |
|
| 62 |
c.link, c.pos_bilanz, c.pos_eur, c.pos_er, c.new_chart_id, c.valid_from,
|
|
| 63 | 63 |
c.pos_bwa, datevautomatik, |
| 64 | 64 |
tk.taxkey_id, tk.pos_ustva, tk.tax_id, |
| 65 | 65 |
tk.tax_id || '--' || tk.taxkey_id AS tax, tk.startdate |
| ... | ... | |
| 301 | 301 |
pos_bwa = ?, |
| 302 | 302 |
pos_bilanz = ?, |
| 303 | 303 |
pos_eur = ?, |
| 304 |
pos_er = ?, |
|
| 304 | 305 |
new_chart_id = ?, |
| 305 | 306 |
valid_from = ?, |
| 306 | 307 |
datevautomatik = ? |
| ... | ... | |
| 315 | 316 |
conv_i($form->{pos_bwa}),
|
| 316 | 317 |
conv_i($form->{pos_bilanz}),
|
| 317 | 318 |
conv_i($form->{pos_eur}),
|
| 319 |
conv_i($form->{pos_er}),
|
|
| 318 | 320 |
conv_i($form->{new_chart_id}),
|
| 319 | 321 |
conv_date($form->{valid_from}),
|
| 320 | 322 |
($form->{datevautomatik} eq 'T') ? 'true':'false',
|
| SL/DB/MetaSetup/Chart.pm | ||
|---|---|---|
| 21 | 21 |
new_chart_id => { type => 'integer' },
|
| 22 | 22 |
pos_bilanz => { type => 'integer' },
|
| 23 | 23 |
pos_bwa => { type => 'integer' },
|
| 24 |
pos_er => { type => 'integer' },
|
|
| 24 | 25 |
pos_eur => { type => 'integer' },
|
| 25 | 26 |
taxkey_id => { type => 'integer' },
|
| 26 | 27 |
valid_from => { type => 'date' },
|
| SL/RP.pm | ||
|---|---|---|
| 1917 | 1917 |
my ($inclusion); |
| 1918 | 1918 |
|
| 1919 | 1919 |
if ($category eq 'I') {
|
| 1920 |
$inclusion = "AND pos_eur = NULL OR pos_eur > '0' AND pos_eur <= '5'";
|
|
| 1920 |
$inclusion = "AND pos_er = NULL OR pos_er > '0' AND pos_er <= '5'";
|
|
| 1921 | 1921 |
} elsif ($category eq 'E') {
|
| 1922 |
$inclusion = "AND pos_eur = NULL OR pos_eur >= '6' AND pos_eur < '100'";
|
|
| 1922 |
$inclusion = "AND pos_er = NULL OR pos_er >= '6' AND pos_er < '100'";
|
|
| 1923 | 1923 |
} else {
|
| 1924 | 1924 |
$inclusion = ""; |
| 1925 | 1925 |
} |
| bin/mozilla/am.pl | ||
|---|---|---|
| 214 | 214 |
} |
| 215 | 215 |
|
| 216 | 216 |
my $select_eur = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
|
| 217 |
my %eur; |
|
| 218 |
if (($form->{country_mode} = SL::DB::Default->get->country_mode) eq 'CH') {
|
|
| 219 |
%eur = ( |
|
| 220 |
1 => "Ertrag", |
|
| 221 |
6 => "Aufwand", |
|
| 222 |
); |
|
| 223 |
} else {
|
|
| 224 |
%eur = ( |
|
| 225 |
1 => "Umsatzerlöse", |
|
| 226 |
2 => "sonstige Erlöse", |
|
| 227 |
3 => "Privatanteile", |
|
| 228 |
4 => "Zinserträge", |
|
| 229 |
5 => "Ausserordentliche Erträge", |
|
| 230 |
6 => "Vereinnahmte Umsatzst.", |
|
| 231 |
7 => "Umsatzsteuererstattungen", |
|
| 232 |
8 => "Wareneingänge", |
|
| 233 |
9 => "Löhne und Gehälter", |
|
| 234 |
10 => "Gesetzl. sozialer Aufw.", |
|
| 235 |
11 => "Mieten", |
|
| 236 |
12 => "Gas, Strom, Wasser", |
|
| 237 |
13 => "Instandhaltung", |
|
| 238 |
14 => "Steuern, Versich., Beiträge", |
|
| 239 |
15 => "Kfz-Steuern", |
|
| 240 |
16 => "Kfz-Versicherungen", |
|
| 241 |
17 => "Sonst. Fahrzeugkosten", |
|
| 242 |
18 => "Werbe- und Reisekosten", |
|
| 243 |
19 => "Instandhaltung u. Werkzeuge", |
|
| 244 |
20 => "Fachzeitschriften, Bücher", |
|
| 245 |
21 => "Miete für Einrichtungen", |
|
| 246 |
22 => "Rechts- und Beratungskosten", |
|
| 247 |
23 => "Bürobedarf, Porto, Telefon", |
|
| 248 |
24 => "Sonstige Aufwendungen", |
|
| 249 |
25 => "Abschreibungen auf Anlagever.", |
|
| 250 |
26 => "Abschreibungen auf GWG", |
|
| 251 |
27 => "Vorsteuer", |
|
| 252 |
28 => "Umsatzsteuerzahlungen", |
|
| 253 |
29 => "Zinsaufwand", |
|
| 254 |
30 => "Ausserordentlicher Aufwand", |
|
| 255 |
31 => "Betriebliche Steuern", |
|
| 256 |
); |
|
| 257 |
} |
|
| 217 |
my %eur = ( |
|
| 218 |
1 => "Umsatzerlöse", |
|
| 219 |
2 => "sonstige Erlöse", |
|
| 220 |
3 => "Privatanteile", |
|
| 221 |
4 => "Zinserträge", |
|
| 222 |
5 => "Ausserordentliche Erträge", |
|
| 223 |
6 => "Vereinnahmte Umsatzst.", |
|
| 224 |
7 => "Umsatzsteuererstattungen", |
|
| 225 |
8 => "Wareneingänge", |
|
| 226 |
9 => "Löhne und Gehälter", |
|
| 227 |
10 => "Gesetzl. sozialer Aufw.", |
|
| 228 |
11 => "Mieten", |
|
| 229 |
12 => "Gas, Strom, Wasser", |
|
| 230 |
13 => "Instandhaltung", |
|
| 231 |
14 => "Steuern, Versich., Beiträge", |
|
| 232 |
15 => "Kfz-Steuern", |
|
| 233 |
16 => "Kfz-Versicherungen", |
|
| 234 |
17 => "Sonst. Fahrzeugkosten", |
|
| 235 |
18 => "Werbe- und Reisekosten", |
|
| 236 |
19 => "Instandhaltung u. Werkzeuge", |
|
| 237 |
20 => "Fachzeitschriften, Bücher", |
|
| 238 |
21 => "Miete für Einrichtungen", |
|
| 239 |
22 => "Rechts- und Beratungskosten", |
|
| 240 |
23 => "Bürobedarf, Porto, Telefon", |
|
| 241 |
24 => "Sonstige Aufwendungen", |
|
| 242 |
25 => "Abschreibungen auf Anlagever.", |
|
| 243 |
26 => "Abschreibungen auf GWG", |
|
| 244 |
27 => "Vorsteuer", |
|
| 245 |
28 => "Umsatzsteuerzahlungen", |
|
| 246 |
29 => "Zinsaufwand", |
|
| 247 |
30 => "Ausserordentlicher Aufwand", |
|
| 248 |
31 => "Betriebliche Steuern"); |
|
| 258 | 249 |
foreach my $item (sort({ $a <=> $b } keys(%eur))) {
|
| 259 | 250 |
my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
|
| 260 | 251 |
if ($item == $form->{pos_eur}) {
|
| ... | ... | |
| 265 | 256 |
|
| 266 | 257 |
} |
| 267 | 258 |
|
| 259 |
my $select_er = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
|
|
| 260 |
my %er = ( |
|
| 261 |
1 => "Ertrag", |
|
| 262 |
6 => "Aufwand"); |
|
| 263 |
foreach my $item (sort({ $a <=> $b } keys(%er))) {
|
|
| 264 |
my $text = H($::locale->{iconv_utf8}->convert($eur{$item}));
|
|
| 265 |
if ($item == $form->{pos_er}) {
|
|
| 266 |
$select_er .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
|
|
| 267 |
} else {
|
|
| 268 |
$select_er .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
|
|
| 269 |
} |
|
| 270 |
|
|
| 271 |
} |
|
| 272 |
|
|
| 268 | 273 |
my $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
|
| 269 | 274 |
|
| 270 | 275 |
my %bwapos = ( |
| ... | ... | |
| 367 | 372 |
select_bwa => $select_bwa, |
| 368 | 373 |
select_bilanz => $select_bilanz, |
| 369 | 374 |
select_eur => $select_eur, |
| 375 |
select_er => $select_er, |
|
| 370 | 376 |
}; |
| 371 | 377 |
|
| 372 | 378 |
# Ausgabe des Templates |
| sql/Pg-upgrade2/chart_pos_er.sql | ||
|---|---|---|
| 1 |
-- @tag: chart_pos_er |
|
| 2 |
-- @description: pos_er Feld in Konten für die Position ind er Erfolgsrechnung |
|
| 3 |
-- @depends: release_3_3_0 |
|
| 4 |
-- @encoding: utf-8 |
|
| 5 |
|
|
| 6 |
ALTER TABLE chart ADD COLUMN pos_er INTEGER; |
|
| sql/Switzerland-deutsch-MWST-2014-chart.sql | ||
|---|---|---|
| 5 | 5 |
|
| 6 | 6 |
DELETE FROM chart; |
| 7 | 7 |
|
| 8 |
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
|
|
| 8 |
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_er, datevautomatik, valid_from) VALUES |
|
| 9 | 9 |
('1', 'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
|
| 10 | 10 |
('10', 'UMLAUFSVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
|
| 11 | 11 |
('100', 'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
|
| sql/Switzerland-deutsch-ohneMWST-2014-chart.sql | ||
|---|---|---|
| 5 | 5 |
|
| 6 | 6 |
DELETE FROM chart; |
| 7 | 7 |
|
| 8 |
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik, valid_from) VALUES
|
|
| 8 |
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_er, datevautomatik, valid_from) VALUES |
|
| 9 | 9 |
('1', 'AKTIVEN','H','','','1',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
|
| 10 | 10 |
('10', 'UMLAUFSVERMÖGEN','H','','','10',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
|
| 11 | 11 |
('100', 'Flüssige Mittel','H','','','100',0,NULL,NULL,NULL,NULL,FALSE,'2011-01-01 00:00:00.000000'),
|
| templates/webpages/am/edit_accounts.html | ||
|---|---|---|
| 217 | 217 |
<tr> |
| 218 | 218 |
<th align="left">[% 'Taxkey' | $T8 %]</th> |
| 219 | 219 |
<th align="left">[% 'valid from' | $T8 %]</th> |
| 220 |
[% IF country_mode != 'CH' %] |
|
| 221 |
<th align="left">[% 'pos_ustva' | $T8 %]</th> |
|
| 222 |
[% END %] |
|
| 220 |
<th align="left">[% 'pos_ustva' | $T8 %]</th> |
|
| 223 | 221 |
<th align="left">[% 'delete' | $T8 %] ? </th> |
| 224 | 222 |
</tr> |
| 225 | 223 |
[% FOREACH tk = ACCOUNT_TAXKEYS %] |
| ... | ... | |
| 229 | 227 |
<input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]"> |
| 230 | 228 |
<td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td> |
| 231 | 229 |
<td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td> |
| 232 |
[% IF country_mode != 'CH' %] |
|
| 233 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
| 234 |
[% END %] |
|
| 230 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
| 235 | 231 |
<td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox" |
| 236 | 232 |
class="checkbox" value="delete"></td> |
| 237 | 233 |
[% ELSE %] |
| 238 | 234 |
<input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW"> |
| 239 | 235 |
<td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td> |
| 240 | 236 |
<td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td> |
| 241 |
[% IF country_mode != 'CH' %] |
|
| 242 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
| 243 |
[% END %] |
|
| 237 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
| 244 | 238 |
<td> </td> |
| 245 | 239 |
[% END %] |
| 246 | 240 |
</tr> |
| ... | ... | |
| 257 | 251 |
<th align="left">[% 'EUER' | $T8 %]</th> |
| 258 | 252 |
<td colspan="3"><select name="pos_eur">[% select_eur %]</select></td> |
| 259 | 253 |
</tr> |
| 260 |
[% IF country_mode != 'CH' %] |
|
| 254 |
<tr> |
|
| 255 |
<th align="left">[% 'Erfolgsrechnung' | $T8 %]</th> |
|
| 256 |
<td colspan="3"><select name="pos_er">[% select_er %]</select></td> |
|
| 257 |
</tr> |
|
| 261 | 258 |
<tr> |
| 262 | 259 |
<th align="left">[% 'BWA' | $T8 %]</th> |
| 263 | 260 |
<td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td> |
| ... | ... | |
| 271 | 268 |
<th align="left">[% 'Datevautomatik' | $T8 %]</th> |
| 272 | 269 |
<td colspan="3"><input name="datevautomatik" type="checkbox" class="checkbox" value="T" [% IF datevautomatik %]checked [% END %]>[% 'If checked the taxkey will not be exported in the DATEV Export, but only IF chart taxkeys differ from general ledger taxkeys' | $T8 %] </td> |
| 273 | 270 |
</tr> |
| 274 |
[% END %] |
|
| 275 | 271 |
<tr> |
| 276 | 272 |
<th align="left">[% 'Folgekonto' | $T8 %]</th> |
| 277 | 273 |
<td><select name="new_chart_id">[% selectnewaccount %]</select></td> |
Auch abrufbar als: Unified diff
Erfolgsrechnung: von pos_eur auf pos_er gelegt.