Revision 0483b692
Von Rolf Fluehmann vor fast 9 Jahren hinzugefügt
SL/Controller/ClientConfig.pm | ||
---|---|---|
29 | 29 |
my ($self, %params) = @_; |
30 | 30 |
|
31 | 31 |
$::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new'; |
32 |
$::form->{country_mode} = $self->defaults->country_mode; |
|
32 | 33 |
$self->edit_form; |
33 | 34 |
} |
34 | 35 |
|
SL/DB/MetaSetup/Default.pm | ||
---|---|---|
35 | 35 |
customer_hourly_rate => { type => 'numeric', precision => 8, scale => 2 }, |
36 | 36 |
customer_projects_only_in_sales => { type => 'boolean', default => 'false', not_null => 1 }, |
37 | 37 |
customernumber => { type => 'text' }, |
38 |
country_mode => { type => 'text', default => 'DE', not_null => 1 }, |
|
38 | 39 |
datev_check_on_ap_transaction => { type => 'boolean', default => 'true' }, |
39 | 40 |
datev_check_on_ar_transaction => { type => 'boolean', default => 'true' }, |
40 | 41 |
datev_check_on_gl_transaction => { type => 'boolean', default => 'true' }, |
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 |
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"); |
|
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 |
} |
|
249 | 258 |
foreach my $item (sort({ $a <=> $b } keys(%eur))) { |
250 | 259 |
my $text = H($::locale->{iconv_utf8}->convert($eur{$item})); |
251 | 260 |
if ($item == $form->{pos_eur}) { |
config/kivitendo.conf.default | ||
---|---|---|
65 | 65 |
# and "en" (English, not perfect) are available. |
66 | 66 |
language = de |
67 | 67 |
|
68 |
# Set default_manager for admin forms. Currently "german" |
|
69 |
# and "swiss" are available. |
|
70 |
default_manager = german |
|
71 |
|
|
68 | 72 |
# The memory limits given here determine the maximum process size |
69 | 73 |
# (vsz, the total amount of memory this process uses including memory |
70 | 74 |
# swapped out or shared with other processes) or resident set size |
sql/Pg-upgrade2/defaults_add_country_mode.sql | ||
---|---|---|
1 |
-- @tag: defaults_add_country_mode |
|
2 |
-- @description: adds new column 'country_mode' (ISO-3166) in table defaults used for erp.ini |
|
3 |
-- @depends: release_3_2_0 |
|
4 |
ALTER TABLE defaults ADD COLUMN country_mode TEXT NOT NULL DEFAULT('DE'); |
|
5 |
|
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 |
<th align="left">[% 'pos_ustva' | $T8 %]</th> |
|
220 |
[% IF country_mode != 'CH' %] |
|
221 |
<th align="left">[% 'pos_ustva' | $T8 %]</th> |
|
222 |
[% END %] |
|
221 | 223 |
<th align="left">[% 'delete' | $T8 %] ? </th> |
222 | 224 |
</tr> |
223 | 225 |
[% FOREACH tk = ACCOUNT_TAXKEYS %] |
... | ... | |
227 | 229 |
<input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="[% tk.id %]"> |
228 | 230 |
<td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td> |
229 | 231 |
<td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td> |
230 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
232 |
[% IF country_mode != 'CH' %] |
|
233 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
234 |
[% END %] |
|
231 | 235 |
<td><input name="taxkey_del_[% tk.runningnumber %]" type="checkbox" |
232 | 236 |
class="checkbox" value="delete"></td> |
233 | 237 |
[% ELSE %] |
234 | 238 |
<input type="hidden" name="taxkey_id_[% tk.runningnumber %]" value="NEW"> |
235 | 239 |
<td><select name="taxkey_tax_[% tk.runningnumber %]">[% tk.selecttaxkey %]</select></td> |
236 | 240 |
<td><input name="taxkey_startdate_[% tk.runningnumber %]" value="[% HTML.escape(tk.startdate) %]"></td> |
237 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
241 |
[% IF country_mode != 'CH' %] |
|
242 |
<td><select name="taxkey_pos_ustva_[% tk.runningnumber %]">[% tk.select_tax %]</select></td> |
|
243 |
[% END %] |
|
238 | 244 |
<td> </td> |
239 | 245 |
[% END %] |
240 | 246 |
</tr> |
... | ... | |
251 | 257 |
<th align="left">[% 'EUER' | $T8 %]</th> |
252 | 258 |
<td colspan="3"><select name="pos_eur">[% select_eur %]</select></td> |
253 | 259 |
</tr> |
260 |
[% IF country_mode != 'CH' %] |
|
254 | 261 |
<tr> |
255 | 262 |
<th align="left">[% 'BWA' | $T8 %]</th> |
256 | 263 |
<td colspan="3"><select name="pos_bwa">[% select_bwa %]</select></td> |
... | ... | |
264 | 271 |
<th align="left">[% 'Datevautomatik' | $T8 %]</th> |
265 | 272 |
<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> |
266 | 273 |
</tr> |
274 |
[% END %] |
|
267 | 275 |
<tr> |
268 | 276 |
<th align="left">[% 'Folgekonto' | $T8 %]</th> |
269 | 277 |
<td><select name="new_chart_id">[% selectnewaccount %]</select></td> |
Auch abrufbar als: Unified diff
Schweizer Modus