@{ $form->{ALL_CHARTS} }
);
- $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
my %project_labels = ();
foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
my $follow_up_vc = $form->{vendor_id} ? SL::DB::Vendor->load_cached($form->{vendor_id})->name : '';
my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)";
- $::request->layout->add_javascripts("autocomplete_chart.js", "autocomplete_customer.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js");
+ $::request->layout->add_javascripts("autocomplete_chart.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js", "kivi.CustomerVendor.js", "kivi.Validator.js");
my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
my $first_taxchart;
my ($inline) = @_;
# check if there is a vendor, invoice, due date and invnumber
- $form->isblank("transdate", $locale->text("Invoice Date missing!"));
- $form->isblank("duedate", $locale->text("Due Date missing!"));
- $form->isblank("vendor_id", $locale->text('Vendor missing!'));
- $form->isblank("invnumber", $locale->text('Invoice Number missing!'));
+ $form->isblank("transdate", $locale->text("Invoice Date missing!"));
+ $form->isblank("duedate", $locale->text("Due Date missing!"));
+ $form->isblank("vendor_id", $locale->text('Vendor missing!'));
+ $form->isblank("invnumber", $locale->text('Invoice Number missing!'));
+ $form->isblank("AP_chart_id", $locale->text('No contra account selected!'));
if ($myconfig{mandatory_departments} && !$form->{department_id}) {
$form->{saved_message} = $::locale->text('You have to specify a department.');
$form->{what_done} = "invoice";
$form->save_history;
}
- # /saving the history
- # Dieser Text wird niemals ausgegeben: Probleme beim redirect?
- $form->redirect($locale->text('AP transaction posted.')) unless $inline;
+ # no restore_from_session_id needed. we like to have a newly generated
+ # list of invoices for bank transactions
+ print $form->redirect_header($form->{callback}) if ($form->{callback} =~ /BankTransaction/);
+ $form->redirect($locale->text('AP transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}) unless $inline;
+ # TODO Add callback/return flag in myconfig
+ # With version 3.5 we can add documents, but only after posting. there should be a flag in myconfig for the user
+ # $form->{callback} ||= 'ap.pl?action=edit&id=' . $form->{id} if $myconfig{no_reset_arap};
+
} else {
$form->error($locale->text('Cannot post transaction!'));
}
action => [
$::locale->text('Search'),
submit => [ '#form', { action => "ap_transactions" } ],
+ checks => [ 'kivi.validate_form' ],
accesskey => 'enter',
],
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}
sub setup_ap_transactions_action_bar {
my $closedto = $::form->datetonum($::form->{closedto}, \%::myconfig);
my $is_closed = $transdate <= $closedto;
- my $change_never = $::instance_conf->get_ar_changeable == 0;
- my $change_on_same_day_only = $::instance_conf->get_ar_changeable == 2 && ($::form->current_date(\%::myconfig) ne $::form->{gldate});
+ my $change_never = $::instance_conf->get_ap_changeable == 0;
+ my $change_on_same_day_only = $::instance_conf->get_ap_changeable == 2 && ($::form->current_date(\%::myconfig) ne $::form->{gldate});
my $is_storno = IS->is_storno(\%::myconfig, $::form, 'ap', $::form->{id});
my $has_storno = IS->has_storno(\%::myconfig, $::form, 'ap');
t8('Update'),
submit => [ '#form', { action => "update" } ],
id => 'update_button',
+ checks => [ 'kivi.validate_form' ],
accesskey => 'enter',
],
action => [
t8('Post'),
submit => [ '#form', { action => "post" } ],
- checks => [ 'kivi.AP.check_fields_before_posting' ],
+ checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting' ],
disabled => $is_closed ? t8('The billing period has already been locked.')
: $is_storno ? t8('A canceled invoice cannot be posted.')
: ($::form->{id} && $change_never) ? t8('Changing invoices has been disabled in the configuration.')
action => [
t8('Post Payment'),
submit => [ '#form', { action => "post_payment" } ],
+ checks => [ 'kivi.validate_form' ],
disabled => !$::form->{id} ? t8('This invoice has not been posted yet.') : undef,
],
action => [ t8('Mark as paid'),
combobox => [
action => [ t8('Storno'),
submit => [ '#form', { action => "storno" } ],
- checks => [ 'kivi.AP.check_fields_before_posting' ],
+ checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting' ],
confirm => t8('Do you really want to cancel this invoice?'),
disabled => !$::form->{id} ? t8('This invoice has not been posted yet.')
: $has_storno ? t8('This invoice has been canceled already.')
action => [
t8('Use As New'),
submit => [ '#form', { action => "use_as_new" } ],
+ checks => [ 'kivi.validate_form' ],
disabled => !$::form->{id} ? t8('This invoice has not been posted yet.') : undef,
],
], # end of combobox "Workflow"
], # end of combobox "more"
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}