Revision a0b8d78b
Von Sven Schöling vor fast 9 Jahren hinzugefügt
| SL/Controller/Admin.pm | ||
|---|---|---|
|
use Rose::Object::MakeMethods::Generic
|
||
|
(
|
||
|
'scalar --get_set_init' => [ qw(client user group printer db_cfg is_locked
|
||
|
all_dateformats all_numberformats all_countrycodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers
|
||
|
all_dateformats all_numberformats all_countrycodes all_countrymodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers
|
||
|
all_dbsources all_used_dbsources all_accounting_methods all_inventory_systems all_profit_determinations all_charts) ],
|
||
|
);
|
||
|
|
||
| ... | ... | |
|
return [ map { id => $_, title => $cc{$_} }, sort { $cc{$a} cmp $cc{$b} } keys %cc ];
|
||
|
}
|
||
|
|
||
|
sub init_all_countrymodes {
|
||
|
my %cm = SL::DefaultManager->country_modes;
|
||
|
return [ map { id => $_, title => "$_ ($cm{$_})" }, sort keys %cm ];
|
||
|
}
|
||
|
|
||
|
#
|
||
|
# filters
|
||
|
#
|
||
| SL/Controller/ClientConfig.pm | ||
|---|---|---|
|
my ($self, %params) = @_;
|
||
|
|
||
|
$::form->{use_templates} = $self->defaults->templates ? 'existing' : 'new';
|
||
|
$::form->{country_mode} = $self->defaults->country_mode;
|
||
|
$self->edit_form;
|
||
|
}
|
||
|
|
||
| SL/DB/MetaSetup/Default.pm | ||
|---|---|---|
|
customer_hourly_rate => { type => 'numeric', precision => 8, scale => 2 },
|
||
|
customer_projects_only_in_sales => { type => 'boolean', default => 'false', not_null => 1 },
|
||
|
customernumber => { type => 'text' },
|
||
|
country_mode => { type => 'text', default => 'DE', not_null => 1 },
|
||
|
datev_check_on_ap_transaction => { type => 'boolean', default => 'true' },
|
||
|
datev_check_on_ar_transaction => { type => 'boolean', default => 'true' },
|
||
|
datev_check_on_gl_transaction => { type => 'boolean', default => 'true' },
|
||
| SL/DefaultManager.pm | ||
|---|---|---|
|
}
|
||
|
}
|
||
|
|
||
|
sub country_modes {
|
||
|
my ($self) = @_;
|
||
|
return (
|
||
|
'CH' => 'Switzerland',
|
||
|
'DE' => 'Germany',
|
||
|
)
|
||
|
}
|
||
|
|
||
|
sub AUTOLOAD {
|
||
|
our $AUTOLOAD;
|
||
|
|
||
| SL/User.pm | ||
|---|---|---|
|
use SL::Iconv;
|
||
|
use SL::Inifile;
|
||
|
use SL::System::InstallationLock;
|
||
|
use SL::DefaultManager;
|
||
|
|
||
|
use strict;
|
||
|
|
||
| ... | ... | |
|
my $dbupdater = SL::DBUpgrade2->new(form => $form, return_on_error => 1, silent => 1)->parse_dbupdate_controls;
|
||
|
# create the tables
|
||
|
$dbupdater->process_query($dbh, "sql/lx-office.sql");
|
||
|
$dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql");
|
||
|
|
||
|
$query = qq|UPDATE defaults SET coa = ?|;
|
||
|
do_query($form, $dbh, $query, map { $form->{$_} } qw(chart));
|
||
|
|
||
|
$dbh->disconnect;
|
||
|
|
||
|
# update new database
|
||
|
$self->dbupdate2(form => $form, updater => $dbupdater, database => $form->{db}, silent => 1);
|
||
|
|
||
|
$dbh = SL::DBConnect->connect($form->{dbconnect}, $form->{dbuser}, $form->{dbpasswd}, SL::DBConnect->get_options)
|
||
|
or $form->dberror;
|
||
|
|
||
|
$query = "SELECT * FROM currencies WHERE name = ?";
|
||
|
my $curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency});
|
||
|
if (!$curr->{id}) {
|
||
|
do_query($form, $dbh, "INSERT INTO currencies (name) VALUES (?)", $form->{defaultcurrency});
|
||
|
$curr = selectfirst_hashref_query($form, $dbh, $query, $form->{defaultcurrency});
|
||
|
}
|
||
|
# load chart of accounts
|
||
|
$dbupdater->process_query($dbh, "sql/$form->{chart}-chart.sql");
|
||
|
|
||
|
$query = qq|UPDATE defaults SET accounting_method = ?, profit_determination = ?, inventory_system = ?, precision = ?, currency_id = ?|;
|
||
|
do_query($form, $dbh, $query,
|
||
|
$form->{accounting_method},
|
||
|
$form->{profit_determination},
|
||
|
$form->{inventory_system},
|
||
|
$form->parse_amount(\%::myconfig, $form->{precision_as_number}),
|
||
|
$curr->{id},
|
||
|
);
|
||
|
$query = qq|UPDATE defaults SET coa = ?, accounting_method = ?, profit_determination = ?, inventory_system = ?, curr = ?|;
|
||
|
do_query($form, $dbh, $query, map { $form->{$_} } qw(chart accounting_method profit_determination inventory_system defaultcurrency));
|
||
|
|
||
|
$dbh->disconnect;
|
||
|
|
||
| ... | ... | |
|
|
||
|
sub get_default_myconfig {
|
||
|
my ($self_or_class, %user_config) = @_;
|
||
|
my $defaults = SL::DefaultManager->new($::lx_office_conf{system}->{default_manager});
|
||
|
|
||
|
return (
|
||
|
countrycode => $defaults->language('de'),
|
||
|
countrycode => 'de',
|
||
|
css_path => 'css', # Needed for menunew, see SL::Layout::Base::get_stylesheet_for_user
|
||
|
dateformat => $defaults->dateformat('dd.mm.yy'),
|
||
|
numberformat => $defaults->numberformat('1.000,00'),
|
||
|
stylesheet => $defaults->stylesheet('kivitendo.css'),
|
||
|
timeformat => $defaults->timeformat('hh:mm'),
|
||
|
dateformat => 'dd.mm.yy',
|
||
|
numberformat => '1.000,00',
|
||
|
stylesheet => 'kivitendo.css',
|
||
|
timeformat => 'hh:mm',
|
||
|
%user_config,
|
||
|
);
|
||
|
}
|
||
| sql/Pg-upgrade2/defaults_add_country_mode.sql | ||
|---|---|---|
|
-- @tag: defaults_add_country_mode
|
||
|
-- @description: adds new column 'country_mode' (ISO-3166) in table defaults used for erp.ini
|
||
|
-- @depends: release_3_2_0
|
||
|
ALTER TABLE defaults ADD COLUMN country_mode TEXT NOT NULL DEFAULT('DE');
|
||
|
|
||
| templates/webpages/admin/create_dataset.html | ||
|---|---|---|
|
<td>[% L.input_tag('db', FORM.db, class="initial_focus") %]</td>
|
||
|
</tr>
|
||
|
|
||
|
<tr>
|
||
|
<th valign="top" align="right" nowrap>[% LxERP.t8('Country') %]</th>
|
||
|
<td>[% L.select_tag('countrymode', SELF.all_countrymodes, title_key="title", default=(FORM.countrymode), onchange='select_country_defaults(this.value)') %]</td>
|
||
|
</tr>
|
||
|
|
||
|
<tr>
|
||
|
<td colspan="1"> </td>
|
||
|
<td><hr size="1" noshade></td>
|
||
Auch abrufbar als: Unified diff
Revert "country_mode entfernt."
Originalcommit: b05b5075ac0f3cbb0823c2f513cdbcacfb17bede.