$_->{description}--$_->{id}\n"
- } (@{ $form->{all_departments} || [] });
- }
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
my $i = 1;
my $tax = 0;
@@ -158,7 +140,7 @@ sub prepare_transaction {
$form->{"project_id_$j"} = $ref->{project_id};
} else {
- $form->{"accno_$i"} = "$ref->{accno}--$ref->{tax_id}";
+ $form->{"accno_id_$i"} = $ref->{chart_id};
for (qw(fx_transaction source memo)) { $form->{"${_}_$i"} = $ref->{$_} }
if ($ref->{amount} < 0) {
$form->{totaldebit} -= $ref->{amount};
@@ -167,7 +149,7 @@ sub prepare_transaction {
$form->{totalcredit} += $ref->{amount};
$form->{"credit_$i"} = $ref->{amount};
}
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = $ref->{id}."--0.00000";
$form->{"project_id_$i"} = $ref->{project_id};
$i++;
}
@@ -191,7 +173,7 @@ sub prepare_transaction {
sub edit {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -202,6 +184,18 @@ sub edit {
$form->{show_details} = $myconfig{show_form_details} unless defined $form->{show_details};
+ if ($form->{reference} && $::instance_conf->get_webdav) {
+ my $webdav = SL::Webdav->new(
+ type => 'general_ledger',
+ number => $form->{reference},
+ );
+ my $webdav_path = $webdav->webdav_path;
+ my @all_objects = $webdav->get_all_objects;
+ @{ $form->{WEBDAV} } = map { { name => $_->filename,
+ type => t8('File'),
+ link => File::Spec->catfile($_->full_filedescriptor),
+ } } @all_objects;
+ }
form_header();
display_rows();
form_footer();
@@ -212,17 +206,16 @@ sub edit {
sub search {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger');
+ $::auth->assert('general_ledger | gl_transactions');
- $::form->all_departments(\%::myconfig);
$::form->get_lists(
projects => { key => "ALL_PROJECTS", all => 1 },
);
$::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
$::form->header;
print $::form->parse_html_template('gl/search', {
- department_label => sub { ("$_[0]{description}--$_[0]{id}")x2 },
employee_label => sub { "$_[0]{id}--$_[0]{name}" },
});
@@ -251,7 +244,7 @@ sub create_subtotal_row {
sub generate_report {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('general_ledger | gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -304,11 +297,8 @@ sub generate_report {
);
# add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
- my @hidden_variables = qw(accno source reference department description notes project_id datefrom dateto employee_id datesort category l_subtotal);
+ my @hidden_variables = qw(accno source reference description notes project_id datefrom dateto employee_id datesort category l_subtotal);
push @hidden_variables, map { "l_${_}" } @columns;
- foreach ( @hidden_variables ) {
- print URL "$_\n";
- };
my $employee = $form->{employee_id} ? SL::DB::Employee->new(id => $form->{employee_id})->load->name : '';
@@ -325,15 +315,12 @@ sub generate_report {
push @date_options, $locale->text('Bis'), $locale->date(\%myconfig, $form->{dateto}, 1) if ($form->{dateto});
push @options, join(' ', @date_options) if (scalar @date_options);
- if ($form->{department}) {
- my ($department) = split /--/, $form->{department};
- push @options, $locale->text('Department') . " : $department";
+ if ($form->{department_id}) {
+ my $department = SL::DB::Manager::Department->find_by( id => $form->{department_id} );
+ push @options, $locale->text('Department') . " : " . $department->description;
}
-
my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
- print URL $callback;
- close URL;
$form->{l_credit_accno} = 'Y';
$form->{l_debit_accno} = 'Y';
@@ -517,10 +504,16 @@ sub generate_report {
$main::lxdebug->leave_sub();
}
+sub show_draft {
+ $::form->{transdate} = DateTime->today_local->to_kivitendo if !$::form->{transdate};
+ $::form->{gldate} = $::form->{transdate} if !$::form->{gldate};
+ update();
+}
+
sub update {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -535,6 +528,10 @@ sub update {
my $creditcount = 0;
my ($debitcredit, $amount);
+ my $dbh = SL::DB->client->dbh;
+ my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
+ my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
+
my @flds =
qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@ -573,10 +570,10 @@ sub update {
$form->{debitlock} = 1;
}
if ($debitcredit && $credittax) {
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00";
}
if (!$debitcredit && $debittax) {
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00";
}
$amount =
($form->{"debit_$i"} == 0)
@@ -584,11 +581,12 @@ sub update {
: $form->{"debit_$i"};
my $j = $#a;
if (($debitcredit && $credittax) || (!$debitcredit && $debittax)) {
- $form->{"taxchart_$i"} = "0--0.00";
+ $form->{"taxchart_$i"} = "$notax_id--0.00";
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
@@ -623,7 +621,7 @@ sub display_form {
my ($init) = @_;
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -646,12 +644,14 @@ sub display_rows {
my ($init) = @_;
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
my $cgi = $::request->{cgi};
+ my %balances = GL->get_chart_balances(map { $_->{id} } @{ $form->{ALL_CHARTS} });
+
$form->{debit_1} = 0 if !$form->{"debit_1"};
$form->{totaldebit} = 0;
$form->{totalcredit} = 0;
@@ -663,20 +663,9 @@ sub display_rows {
$project_labels{$item->{"id"}} = $item->{"projectnumber"};
}
- my %chart_labels = ();
- my @chart_values = ();
- my %charts = ();
- my $taxchart_init;
- foreach my $item (@{ $form->{ALL_CHARTS} }) {
- if ($item->{charttype} eq 'H'){ #falls ÃÅberschrift
- next; #ÃÅberspringen (Bug 1150)
- }
- my $key = $item->{accno} . "--" . $item->{tax_id};
- $taxchart_init = $item->{tax_id} unless (@chart_values);
- push(@chart_values, $key);
- $chart_labels{$key} = $item->{accno} . "--" . $item->{description};
- $charts{$item->{accno}} = $item;
- }
+ my %charts_by_id = map { ($_->{id} => $_) } @{ $::form->{ALL_CHARTS} };
+ my $default_chart = $::form->{ALL_CHARTS}[0];
+ my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
my ($source, $memo, $source_hidden, $memo_hidden);
for my $i (1 .. $form->{rowcount}) {
@@ -692,49 +681,31 @@ sub display_rows {
|;
}
- my $selected_accno_full;
- my ($accno_row) = split(/--/, $form->{"accno_$i"});
- my $item = $charts{$accno_row};
- $selected_accno_full = "$item->{accno}--$item->{tax_id}";
-
- my $selected_taxchart = $form->{"taxchart_$i"};
- my ($selected_accno, $selected_tax_id) = split(/--/, $selected_accno_full);
- my ($previous_accno, $previous_tax_id) = split(/--/, $form->{"previous_accno_$i"});
-
my %taxchart_labels = ();
my @taxchart_values = ();
- my %taxcharts = ();
- my $filter_accno;
- $filter_accno = $::form->{ALL_CHARTS}[0]->{accno};
- $filter_accno = $selected_accno if (!$init and $i < $form->{rowcount});
- foreach my $item ( GL->get_tax_dropdown($filter_accno) ) {
- my $key = $item->{id} . "--" . $item->{rate};
- $taxchart_init = $key if ($taxchart_init == $item->{id});
- push(@taxchart_values, $key);
- $taxchart_labels{$key} = $item->{taxdescription} . " " . $item->{rate} * 100 . ' %';
- $taxcharts{$item->{id}} = $item;
- }
- if ($previous_accno &&
- ($previous_accno eq $selected_accno) &&
- ($previous_tax_id ne $selected_tax_id)) {
- my $item = $taxcharts{$selected_tax_id};
- $selected_taxchart = "$item->{id}--$item->{rate}";
+ my $accno_id = $::form->{"accno_id_$i"};
+ my $chart = $charts_by_id{$accno_id} // $default_chart;
+ $accno_id = $chart->{id};
+ my $chart_has_changed = $::form->{"previous_accno_id_$i"} && ($accno_id != $::form->{"previous_accno_id_$i"});
+ my ($first_taxchart, $default_taxchart, $taxchart_to_use);
+
+ foreach my $item ( GL->get_active_taxes_for_chart($accno_id, $transdate) ) {
+ my $key = $item->id . "--" . $item->rate;
+ $first_taxchart //= $item;
+ $default_taxchart = $item if $item->{is_default};
+ $taxchart_to_use = $item if $key eq $form->{"taxchart_$i"};
+
+ push(@taxchart_values, $key);
+ $taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
}
- $selected_accno = '' if ($init);
- $selected_taxchart ||= $taxchart_init;
+ $taxchart_to_use = $default_taxchart // $first_taxchart if $chart_has_changed || !$taxchart_to_use;
+ my $selected_taxchart = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
my $accno = qq|| .
- NTI($cgi->popup_menu('-name' => "accno_$i",
- '-id' => "accno_$i",
- '-onChange' => "updateTaxes($i);",
- '-style' => 'width:200px',
- '-values' => \@chart_values,
- '-labels' => \%chart_labels,
- '-default' => $selected_accno_full))
- . $cgi->hidden('-name' => "previous_accno_$i",
- '-default' => $selected_accno_full)
+ $::request->presenter->chart_picker("accno_id_$i", $accno_id, style => "width: 300px") .
+ $::request->presenter->hidden_tag("previous_accno_id_$i", $accno_id)
. qq| |;
my $tax_ddbox = qq|| .
NTI($cgi->popup_menu('-name' => "taxchart_$i",
@@ -810,10 +781,11 @@ sub display_rows {
|;
my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : '';
+ my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR');
print qq|
$accno
-
+ ${balance}
$fx_transaction
@@ -850,19 +822,22 @@ sub _get_radieren {
sub form_header {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger');
+ $::auth->assert('gl_transactions');
my ($init) = @_;
+ $::request->layout->add_javascripts("autocomplete_chart.js", "kivi.GL.js");
+
my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
$::form->get_lists("projects" => { "key" => "ALL_PROJECTS",
"all" => 0,
"old_id" => \@old_project_ids },
+
"charts" => { "key" => "ALL_CHARTS",
"transdate" => $::form->{transdate} });
- GL->get_chart_balances('charts' => $::form->{ALL_CHARTS});
+ $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
my $title = $::form->{title};
$::form->{title} = $::locale->text("$title General Ledger Transaction");
@@ -872,15 +847,11 @@ sub form_header {
map { $::form->{$_} =~ s/\"/"/g }
qw(chart taxchart);
- $::form->{selectdepartment} =~ s/ selected//;
- $::form->{selectdepartment} =~
- s/option>\Q$::form->{department}\E/option selected>$::form->{department}/;
-
if ($init) {
$::request->{layout}->focus("#reference");
$::form->{taxincluded} = "1";
} else {
- $::request->{layout}->focus("#accno_$::form->{rowcount}");
+ $::request->{layout}->focus("#accno_id_$::form->{rowcount}_name");
}
$::form->{previous_id} ||= "--";
@@ -898,12 +869,12 @@ sub form_header {
sub form_footer {
$::lxdebug->enter_sub;
- $::auth->assert('general_ledger');
+ $::auth->assert('gl_transactions');
my ($follow_ups, $follow_ups_due);
if ($::form->{id}) {
- $follow_ups = FU->follow_ups('trans_id' => $::form->{id});
+ $follow_ups = FU->follow_ups('trans_id' => $::form->{id}, 'not_done' => 1);
$follow_ups_due = sum map { $_->{due} * 1 } @{ $follow_ups || [] };
}
@@ -999,9 +970,9 @@ sub post_transaction {
my $debitcredit;
my %split_safety = ();
- my $dbh = $form->dbconnect_noauto(\%myconfig);
+ my $dbh = SL::DB->client->dbh;
my ($notax_id) = selectrow_query($form, $dbh, "SELECT id FROM tax WHERE taxkey = 0 LIMIT 1", );
- $dbh->disconnect;
+ my $zerotaxes = selectall_hashref_query($form, $dbh, "SELECT id FROM tax WHERE rate = 0", );
my @flds = qw(accno debit credit projectnumber fx_transaction source memo tax taxchart);
@@ -1057,7 +1028,8 @@ sub post_transaction {
$form->{"tax_$i"} = 0;
}
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
- if ($taxkey > 1) {
+ my $iswithouttax = grep { $_->{id} == $taxkey } @{ $zerotaxes };
+ if (!$iswithouttax) {
if ($debitcredit) {
$debittax = 1;
} else {
@@ -1148,12 +1120,12 @@ sub post_transaction {
sub post {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my $locale = $main::locale;
- if ($::myconfig{mandatory_departments} && !$form->{department}) {
+ if ($::myconfig{mandatory_departments} && !$form->{department_id}) {
$form->{saved_message} = $::locale->text('You have to specify a department.');
update();
exit;
@@ -1163,11 +1135,14 @@ sub post {
$form->{storno} = 0;
post_transaction();
+ if ($::instance_conf->get_webdav) {
+ SL::Webdav->new(type => 'general_ledger',
+ number => $form->{reference},
+ )->webdav_path;
+ }
- remove_draft() if $form->{remove_draft};
-
- $form->{callback} = build_std_url("action=add&DONT_LOAD_DRAFT=1", "show_details");
- $form->redirect($form->{callback});
+ $form->{callback} = build_std_url("action=add", "show_details");
+ $form->redirect($::locale->text("General ledger transaction '#1' posted", $form->{reference}));
$main::lxdebug->leave_sub();
}
@@ -1175,7 +1150,7 @@ sub post {
sub post_as_new {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
@@ -1188,7 +1163,7 @@ sub post_as_new {
sub storno {
$main::lxdebug->enter_sub();
- $main::auth->assert('general_ledger');
+ $main::auth->assert('gl_transactions');
my $form = $main::form;
my %myconfig = %main::myconfig;
@@ -1221,22 +1196,18 @@ sub continue {
}
sub get_tax_dropdown {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my @tax_accounts = GL->get_tax_dropdown($form->{accno});
-
- foreach my $item (@tax_accounts) {
- $item->{taxdescription} = $::locale->{iconv_utf8}->convert($item->{taxdescription});
- $item->{taxdescription} .= ' ' . $form->round_amount($item->{rate} * 100);
- }
-
- $form->{TAX_ACCOUNTS} = [ @tax_accounts ];
+ my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
+ my @tax_accounts = GL->get_active_taxes_for_chart($::form->{accno_id}, $transdate);
+ my $html = $::form->parse_html_template("gl/update_tax_accounts", { TAX_ACCOUNTS => \@tax_accounts });
- print $form->ajax_response_header, $form->parse_html_template("gl/update_tax_accounts");
+ print $::form->ajax_response_header, $html;
+}
- $main::lxdebug->leave_sub();
+sub get_chart_balance {
+ my %balances = GL->get_chart_balances($::form->{accno_id});
+ my $balance = $::form->format_amount(\%::myconfig, $balances{ $::form->{accno_id} }, 2, 'DRCR');
+ print $::form->ajax_response_header, $balance;
}
1;