# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
#
# administration
use SL::DB::Printer;
use SL::DB::Tax;
use SL::DB::Language;
+use SL::DB::Default;
+use SL::DBUtils qw(selectall_array_query conv_dateq);
use CGI;
require "bin/mozilla/common.pl";
my $form = $main::form;
my %myconfig = %main::myconfig;
+ my $defaults = SL::DB::Default->get;
$main::auth->assert('config');
$form->{title} = "Edit";
+ $form->{feature_balance} = $defaults->feature_balance;
+ $form->{feature_datev} = $defaults->feature_datev;
+ $form->{feature_erfolgsrechnung} = $defaults->feature_erfolgsrechnung;
+ $form->{feature_eurechnung} = $defaults->feature_eurechnung;
+ $form->{feature_ustva} = $defaults->feature_ustva;
+
AM->get_account(\%myconfig, \%$form);
foreach my $item (split(/:/, $form->{link})) {
}
+ my $select_er = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
+ my %er = (
+ 1 => "Ertrag",
+ 6 => "Aufwand");
+ foreach my $item (sort({ $a <=> $b } keys(%er))) {
+ my $text = H($::locale->{iconv_utf8}->convert($er{$item}));
+ if ($item == $form->{pos_er}) {
+ $select_er .= qq|<option value=$item selected>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
+ } else {
+ $select_er .= qq|<option value=$item>|. sprintf("%.2d", $item) .qq|. $text</option>\n|;
+ }
+
+ }
+
my $select_bwa = q|<option value=""> |. $locale->text('None') .q|</option>\n|;
my %bwapos = (
select_bwa => $select_bwa,
select_bilanz => $select_bilanz,
select_eur => $select_eur,
+ select_er => $select_er,
};
# Ausgabe des Templates
$form->{title} = $locale->text('Delete Account');
foreach my $id (
- qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id)
+ qw(inventory_accno_id income_accno_id expense_accno_id fxgain_accno_id fxloss_accno_id rndgain_accno_id rndloss_accno_id)
) {
if ($form->{id} == $form->{$id}) {
$form->error($locale->text('Cannot delete default account!'));
$::form->header;
print $::form->parse_html_template('am/language_header', {
- numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
+ numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ],
dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
});
$main::lxdebug->leave_sub();
}
-
-sub add_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- # $locale->text("Add Buchungsgruppe")
- # $locale->text("Edit Buchungsgruppe")
- $form->{title} = "Add";
-
- $form->{callback} = "am.pl?action=add_buchungsgruppe" unless $form->{callback};
-
- AM->get_buchungsgruppe(\%myconfig, \%$form);
- $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
- for (my $i = 0; 4 > $i; $i++) {
- map({ $form->{"${_}_accno_id_$i"} = $form->{"std_${_}_accno_id"}; }
- qw(income expense));
- }
-
- &buchungsgruppe_header;
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub edit_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('config');
-
- $form->{title} = "Edit";
-
- AM->get_buchungsgruppe(\%myconfig, \%$form);
-
- &buchungsgruppe_header;
-
- &form_footer;
-
- $main::lxdebug->leave_sub();
-}
-
-sub list_buchungsgruppe {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- AM->buchungsgruppe(\%::myconfig, $::form);
-
- $::form->{callback} = "am.pl?action=list_buchungsgruppe";
- $::form->{title} = $::locale->text('Buchungsgruppen');
- $::form->header;
-
- print $::form->parse_html_template('am/buchungsgruppe_list', {
- swap_link => qq|am.pl?action=swap_buchungsgruppen&|,
- });
-
- $::lxdebug->leave_sub;
-}
-
-sub buchungsgruppe_header {
- $::lxdebug->enter_sub;
- $::auth->assert('config');
-
- # $locale->text('Add Accounting Group')
- # $locale->text('Edit Accounting Group')
- $::form->{title} = $::locale->text("$::form->{title} Buchungsgruppe");
-
- my ($acc_inventory, $acc_income, $acc_expense) = ({}, {}, {});
- my %acc_type_map = (
- IC => $acc_inventory,
- IC_income => $acc_income,
- IC_sale => $acc_income,
- IC_expense => $acc_expense,
- IC_cogs => $acc_expense,
- );
-
- for my $key (keys %acc_type_map) {
- for my $ref (@{ $::form->{IC_links}{$key} }) {
- $acc_type_map{$key}{$ref->{id}} = $ref;
- }
- }
-
- my %sorted_accounts = map {
- $_ => [ sort { $a->{accno} cmp $b->{accno} } values %{ $acc_type_map{$_} } ],
- } keys %acc_type_map;
-
- $::form->header;
- print $::form->parse_html_template('am/buchungsgruppe_header', {
- accounts => \%sorted_accounts,
- account_label => sub { "$_[0]{accno}--$_[0]{description}" },
- });
-
- $::lxdebug->leave_sub;
-}
-
-sub save_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- $form->isblank("description", $locale->text('Description missing!'));
-
- AM->save_buchungsgruppe(\%myconfig, \%$form);
- $form->redirect($locale->text('Accounting Group saved!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_buchungsgruppe {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('config');
-
- AM->delete_buchungsgruppe(\%myconfig, \%$form);
- $form->redirect($locale->text('Accounting Group deleted!'));
-
- $main::lxdebug->leave_sub();
-}
-
-sub swap_buchungsgruppen {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
-
- $main::auth->assert('config');
-
- AM->swap_sortkeys(\%myconfig, $form, "buchungsgruppen");
- list_buchungsgruppe();
-
- $main::lxdebug->leave_sub();
-}
-
sub _build_cfg_options {
my $form = $main::form;
my %myconfig = %main::myconfig;
_build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
_build_cfg_options('timeformat', qw(hh:mm hh:mm:ss));
- _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
+ _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00"));
my @formats = ();
if ($::lx_office_conf{print_templates}->{opendocument}
}
$form->{STYLESHEETS} = [];
- foreach my $item (qw(lx-office-erp.css Mobile.css kivitendo.css)) {
+ foreach my $item (qw(lx-office-erp.css kivitendo.css)) {
push @{ $form->{STYLESHEETS} }, {
'name' => $item,
'value' => $item,
$myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
$form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
- $form->{todo_cfg} = { TODO->get_user_config('login' => $form->{login}) };
+ $form->{todo_cfg} = { TODO->get_user_config('login' => $::myconfig{login}) };
- $form->{title} = $locale->text('Edit Preferences for #1', $form->{login});
+ $form->{title} = $locale->text('Edit Preferences for #1', $::myconfig{login});
$form->header();
+
+ $form->{full_signature} = $form->create_email_signature();
+
print $form->parse_html_template('am/config');
$main::lxdebug->leave_sub();
$form->{stylesheet} = $form->{usestylesheet};
- TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
+ TODO->save_user_config('login' => $::myconfig{login}, %{ $form->{todo_cfg} || { } });
if (AM->save_preferences($form)) {
if ($::auth->can_change_password()
$form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
}
- $::auth->change_password($form->{login}, $form->{new_password});
+ $::auth->change_password($::myconfig{login}, $form->{new_password});
}
$form->redirect($locale->text('Preferences saved!'));
my $callback = build_std_url(qw(action einschraenkungen fromdate todate mitarbeiter searchid what2search));
$form->{order} ||= 'h.itime--1';
- my %search = ( "Artikelnummer" => "parts",
- "Kundennummer" => "customer",
- "Lieferantennummer" => "vendor",
- "Projektnummer" => "project",
- "Buchungsnummer" => "oe",
- "Eingangsrechnungnummer" => "ap",
- "Ausgangsrechnungnummer" => "ar",
- "Mahnungsnummer" => "dunning"
- );
+ # my %search = ( "Artikelnummer" => "parts",
+ # "Kundennummer" => "customer",
+ # "Lieferantennummer" => "vendor",
+ # "Projektnummer" => "project",
+ # "Auftragsnummer" => "oe",
+ # "Angebotsnummer" => "oe",
+ # "Eingangsrechnungnummer" => "ap",
+ # "Ausgangsrechnungnummer" => "ar",
+ # "Mahnungsnummer" => "dunning",
+ # "Buchungsnummer" => "gl",
+ # );
+
my %searchNo = ( "Artikelnummer" => "partnumber",
"Kundennummer" => "customernumber",
"Lieferantennummer" => "vendornumber",
"Projektnummer" => "projectnumber",
- "Buchungsnummer" => "ordnumber",
+ "Auftragsnummer" => "ordnumber",
+ "Angebotsnummer" => "quonumber",
"Eingangsrechnungnummer" => "invnumber",
"Ausgangsrechnungnummer" => "invnumber",
- "Mahnungsnummer" => "dunning_id"
+ "Mahnungsnummer" => "dunning_id",
+ "Buchungsnummer" => "gltransaction"
);
my $dbh = $form->dbconnect(\%myconfig);
my @ids = grep { $_ * 1 } selectall_array_query($form, $dbh, $query);
my $daten .= shift @ids;
- $daten .= join '', map { " OR trans_id = $_" } @ids;
-
+ if (scalar(@ids) > 0 ) {
+ $daten .= ' OR trans_id IN (' . join(',', @ids) . ')';
+ }
my ($sort, $sortby) = split(/\-\-/, $form->{order});
$sort =~ s/.*\.(.*)$/$1/;
$form->header();
print $form->parse_html_template('am/confirm_delete_warehouse');
- ::end_of_request();
+ $::dispatcher->end_request;
}
if (AM->delete_warehouse(\%myconfig, $form)) {
projects / kivitendo-erp.git / blobdiff