use SL::DB::Tax;
use SL::FU;
use SL::GL;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash qw(flash flash_later);
use SL::IS;
use SL::ReportGenerator;
use SL::DBUtils qw(selectrow_query selectall_hashref_query);
my $template = $::form->{record_template_id} ? SL::DB::RecordTemplate->new(id => $::form->{record_template_id})->load : SL::DB::RecordTemplate->new;
my $js = SL::ClientJS->new(controller => SL::Controller::Base->new);
my $new_name = $template->template_name_to_use($::form->{record_template_new_template_name});
-
$js->dialog->close('#record_template_dialog');
+
+ # bank transactions need amounts for assignment
+ my $can_save = 0;
+ $can_save = 1 if ($::form->{credit_1} > 0 && $::form->{debit_2} > 0 && $::form->{credit_2} == 0 && $::form->{debit_1} == 0);
+ $can_save = 1 if ($::form->{credit_2} > 0 && $::form->{debit_1} > 0 && $::form->{credit_1} == 0 && $::form->{debit_2} == 0);
+ return $js->flash('error', t8('Can only save template if amounts,i.e. 1 for debit and credit are set.'))->render unless $can_save;
+
my @items = grep {
$_->{chart_id} && (($_->{tax_id} // '') ne '')
} map {
transdate gldate id reference description
notes source doccnt debit debit_accno
credit credit_accno debit_tax debit_tax_accno
- credit_tax credit_tax_accno projectnumbers balance employee
+ credit_tax credit_tax_accno balance projectnumbers
+ department employee
);
# add employee here, so that variable is still known and passed in url when choosing a different sort order in resulting table
'credit_tax_accno' => { 'text' => $locale->text('Credit Tax Account'), },
'balance' => { 'text' => $locale->text('Balance'), },
'projectnumbers' => { 'text' => $locale->text('Project Numbers'), },
+ 'department' => { 'text' => $locale->text('Department'), },
'employee' => { 'text' => $locale->text('Employee'), },
);
- foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
+ foreach my $name (qw(id transdate gldate reference description debit_accno credit_accno debit_tax_accno credit_tax_accno department)) {
my $sortname = $name =~ m/accno/ ? 'accno' : $name;
my $sortdir = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
$row->{balance}->{data} = $data;
$row->{projectnumbers}->{data} = join ", ", sort { lc($a) cmp lc($b) } keys %{ $ref->{projectnumbers} };
- map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee);
+ map { $row->{$_}->{data} = $ref->{$_} } qw(id reference description notes gldate employee department);
map { $row->{$_}->{data} = \@{ $rows{$_} }; } qw(transdate debit credit debit_accno credit_accno debit_tax_accno credit_tax_accno source);
$report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
- setup_gl_transactions_action_bar(num_rows => scalar(@{$form->{GL}}));
+ setup_gl_transactions_action_bar();
$report->generate_with_headers();
$form->{totaldebit} = 0;
$form->{totalcredit} = 0;
- my %project_labels = ();
- my @project_values = ("");
- foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
- push(@project_values, $item->{"id"});
- $project_labels{$item->{"id"}} = $item->{"projectnumber"};
- }
-
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 $projectnumber =
- NTI($cgi->popup_menu('-name' => "project_id_$i",
- '-values' => \@project_values,
- '-labels' => \%project_labels,
- '-default' => $form->{"project_id_$i"} ));
- my $projectnumber_hidden = qq|
- <input type="hidden" name="project_id_$i" value="$form->{"project_id_$i"}">|;
+ my $projectnumber = SL::Presenter::Project::picker("project_id_$i", $form->{"project_id_$i"});
+ my $projectnumber_hidden = SL::Presenter::Tag::hidden_tag("project_id_$i", $form->{"project_id_$i"});
my $copy2credit = $i == 1 ? 'onkeyup="copy_debit_to_credit()"' : '';
my $balance = $form->format_amount(\%::myconfig, $balances{$accno_id} // 0, 2, 'DRCR');
$is_linked_bank_transaction = 1;
}
+ my $create_post_action = sub {
+ # $_[0]: description
+ # $_[1]: after_action
+ action => [
+ $_[0],
+ submit => [ '#form', { action => 'post', after_action => $_[1] } ],
+ disabled => $form->{locked} ? t8('The billing period has already been locked.')
+ : $form->{storno} ? t8('A canceled general ledger transaction cannot be posted.')
+ : ($form->{id} && $change_never) ? t8('Changing general ledger transaction has been disabled in the configuration.')
+ : ($form->{id} && $change_on_same_day_only) ? t8('General ledger transactions can only be changed on the day they are posted.')
+ : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
+ : undef,
+ ],
+ };
+
+ my %post_entry;
+ if ($::instance_conf->get_gl_add_doc && $::instance_conf->get_doc_storage) {
+ %post_entry = (combobox => [ $create_post_action->(t8('Post'), 'doc-tab'),
+ $create_post_action->(t8('Post and new booking')) ]);
+ } elsif ($::instance_conf->get_doc_storage) {
+ %post_entry = (combobox => [ $create_post_action->(t8('Post')),
+ $create_post_action->(t8('Post and upload document'), 'doc-tab') ]);
+ } else {
+ %post_entry = $create_post_action->(t8('Post'));
+ }
+
for my $bar ($::request->layout->get('actionbar')) {
$bar->add(
action => [
id => 'update_button',
accesskey => 'enter',
],
- action => [
- t8('Post'),
- submit => [ '#form', { action => 'post' } ],
- disabled => $form->{locked} ? t8('The billing period has already been locked.')
- : $form->{storno} ? t8('A canceled general ledger transaction cannot be posted.')
- : ($form->{id} && $change_never) ? t8('Changing general ledger transaction has been disabled in the configuration.')
- : ($form->{id} && $change_on_same_day_only) ? t8('General ledger transactions can only be changed on the day they are posted.')
- : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.')
- : undef,
- ],
+ %post_entry,
combobox => [
action => [ t8('Storno'),
submit => [ '#form', { action => 'storno' } ],
my ($init) = @_;
- $::request->layout->add_javascripts("autocomplete_chart.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js");
+ $::request->layout->add_javascripts("autocomplete_chart.js", "autocomplete_project.js", "kivi.File.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.Validator.js");
- my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
+ my @old_project_ids = grep { $_ } map{ $::form->{"project_id_$_"} } 1..$::form->{rowcount};
+ my @conditions = @old_project_ids ? (id => \@old_project_ids) : ();
+ $::form->{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => [ or => [ active => 1, @conditions ]]);
- $::form->get_lists("projects" => { "key" => "ALL_PROJECTS",
- "all" => 0,
- "old_id" => \@old_project_ids },
-
- "charts" => { "key" => "ALL_CHARTS",
- "transdate" => $::form->{transdate} });
+ $::form->get_lists(
+ "charts" => { "key" => "ALL_CHARTS", "transdate" => $::form->{transdate} },
+ );
# we cannot book on charttype header
@{ $::form->{ALL_CHARTS} } = grep { $_->{charttype} ne 'H' } @{ $::form->{ALL_CHARTS} };
die "No bank transaction found" unless $bt;
$chart_id = SL::DB::Manager::BankAccount->find_by(id => $bt->local_bank_account_id)->chart_id;
- die "no chart id:" unless $chart_id;
+ die "no chart id" unless $chart_id;
$payment = SL::DB::Manager::AccTransaction->get_all(where => [ trans_id => $::form->{id},
chart_link => { like => '%_paid%' },
die "guru meditation error: Can only assign amount to one bank account booking" if scalar @{ $payment } > 1;
# credit/debit * -1 matches the sign for bt.amount and bt.invoice_amount
- die "Can only assign the full (partial) bank amount to a single general ledger booking"
- unless $bt->not_assigned_amount == $payment->[0]->amount * -1;
+
+ die "Can only assign the full (partial) bank amount to a single general ledger booking: " . $bt->not_assigned_amount . " " . ($payment->[0]->amount * -1)
+ unless (abs($bt->not_assigned_amount - ($payment->[0]->amount * -1)) < 0.001);
$bt->update_attributes(invoice_amount => $bt->invoice_amount + ($payment->[0]->amount * -1));
1;
}) or do { die SL::DB->client->error };
- if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
- print $form->redirect_header($form->{callback});
- $form->redirect($locale->text('GL transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id});
- }
-
- # remove or clarify
- undef($form->{callback});
$main::lxdebug->leave_sub();
}
)->webdav_path;
}
- $form->{callback} = build_std_url("action=add", "show_details");
- $form->redirect($::locale->text("General ledger transaction '#1' posted", $form->{reference}));
+ my $msg = $::locale->text("General ledger transaction '#1' posted (ID: #2)", $form->{reference}, $form->{id});
+ if ($form->{callback} =~ /BankTransaction/ && $form->{bt_id}) {
+ $form->redirect($msg);
+
+ } elsif ('doc-tab' eq $form->{after_action}) {
+ # Redirect with callback containing a fragment does not work (by now)
+ # because the callback info is stored in the session an parsing the
+ # callback parameters does not support fragments (see SL::Form::redirect).
+ # So use flash_later for the message and redirect_headers for redirecting.
+ my $add_doc_url = build_std_url("script=gl.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs');
+ SL::Helper::Flash::flash_later('info', $msg);
+ print $form->redirect_header($add_doc_url);
+ $::dispatcher->end_request;
+
+ } else {
+ $form->{callback} = build_std_url("action=add", "show_details");
+ $form->redirect($msg);
+ }
$main::lxdebug->leave_sub();
}
projects / kivitendo-erp.git / blobdiff