use SL::DB::Tax;
use SL::Helper::Flash qw(flash);
use SL::Locale::String qw(t8);
+use SL::Presenter::Tag;
+use SL::Presenter::Chart;
use SL::ReportGenerator;
require "bin/mozilla/common.pl";
# currencies
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
# build the popup menus
$form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
"taxcharts" => { "key" => "ALL_TAXCHARTS",
"module" => "AR" },);
- $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
+ $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
$_->{link_split} = { map { $_ => 1 } split/:/, $_->{link} } for @{ $form->{ALL_CHARTS} };
my $follow_up_vc = $form->{customer_id} ? SL::DB::Customer->load_cached($form->{customer_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.File.js", "kivi.RecordTemplate.js", "kivi.AR.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.File.js", "kivi.RecordTemplate.js", "kivi.AR.js", "kivi.CustomerVendor.js", "kivi.Validator.js");
my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local;
my $first_taxchart;
};
my (%taxchart_labels, @taxchart_values, $default_taxchart, $taxchart_to_use);
- my $amount_chart_id = $form->{"AR_amount_chart_id_$i"} // $default_ar_amount_chart_id;
- my $chart_has_changed = $::form->{"previous_AR_amount_chart_id_$i"} && ($amount_chart_id != $::form->{"previous_AR_amount_chart_id_$i"});
+ my $amount_chart_id = $form->{"AR_amount_chart_id_$i"} // $default_ar_amount_chart_id;
foreach my $item ( GL->get_active_taxes_for_chart($amount_chart_id, $transdate) ) {
my $key = $item->id . "--" . $item->rate;
$taxchart_labels{$key} = $item->taxdescription . " " . $item->rate * 100 . ' %';
}
- $taxchart_to_use = $default_taxchart // $first_taxchart if $chart_has_changed || !$taxchart_to_use;
+ $taxchart_to_use //= $default_taxchart // $first_taxchart;
my $selected_taxchart = $taxchart_to_use->id . '--' . $taxchart_to_use->rate;
$transaction->{selectAR_amount} =
- $::request->presenter->chart_picker("AR_amount_chart_id_$i", $amount_chart_id, style => "width: 400px", type => "AR_amount", class => ($form->{initial_focus} eq "row_$i" ? "initial_focus" : ""))
- . $::request->presenter->hidden_tag("previous_AR_amount_chart_id_$i", $amount_chart_id);
+ SL::Presenter::Chart::picker("AR_amount_chart_id_$i", $amount_chart_id, style => "width: 400px", type => "AR_amount", class => ($form->{initial_focus} eq "row_$i" ? "initial_focus" : ""))
+ . SL::Presenter::Tag::hidden_tag("previous_AR_amount_chart_id_$i", $amount_chart_id);
$transaction->{taxchart} =
NTI($cgi->popup_menu('-name' => "taxchart_$i",
if (($form->{previous_customer_id} || $form->{customer_id}) != $form->{customer_id}) {
IS->get_customer(\%myconfig, $form);
+ if (($form->{rowcount} == 1) && ($form->{amount_1} == 0)) {
+ my $last_used_ar_chart = SL::DB::Customer->load_cached($form->{customer_id})->last_used_ar_chart;
+ $form->{"AR_amount_chart_id_1"} = $last_used_ar_chart->id if $last_used_ar_chart;
+ }
}
$form->{invtotal} =
}
# /saving the history
- $form->redirect($locale->text("AR transaction posted.")) unless $inline;
+ $form->redirect($locale->text('AR transaction posted.') . ' ' . $locale->text('ID') . ': ' . $form->{id}) unless $inline;
$main::lxdebug->leave_sub();
}
action => [
$::locale->text('Search'),
submit => [ '#form' ],
+ checks => [ 'kivi.validate_form' ],
accesskey => 'enter',
],
);
}
+ $::request->layout->add_javascripts('kivi.Validator.js');
}
sub setup_ar_transactions_action_bar {
my $locale = $main::locale;
my $cgi = $::request->{cgi};
- $form->{title} = $locale->text('AR Transactions');
+ $form->{title} = $locale->text('Invoices, Credit Notes & AR Transactions');
$form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
$form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted;
AR->ar_transactions(\%myconfig, \%$form);
- $form->{title} = $locale->text('AR Transactions');
+ $form->{title} = $locale->text('Invoices, Credit Notes & AR Transactions');
my $report = SL::ReportGenerator->new(\%myconfig, $form);
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto duedatefrom duedateto
- employee_id salesman_id business_id parts_partnumber parts_description department_id);
+ employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed);
push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
$href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
my %column_defs = (
- 'ids' => { raw_header_data => $::request->presenter->checkbox_tag("", id => "check_all", checkall => "[data-checkall=1]"), align => 'center' },
+ 'ids' => { raw_header_data => SL::Presenter::Tag::checkbox_tag("", id => "check_all", checkall => "[data-checkall=1]"), align => 'center' },
'transdate' => { 'text' => $locale->text('Date'), },
'id' => { 'text' => $locale->text('ID'), },
'type' => { 'text' => $locale->text('Type'), },
'ustid' => { 'text' => $locale->text('USt-IdNr.'), },
'taxzone' => { 'text' => $locale->text('Steuersatz'), },
'payment_terms' => { 'text' => $locale->text('Payment Terms'), },
- 'charts' => { 'text' => $locale->text('Buchungskonto'), },
+ 'charts' => { 'text' => $locale->text('Chart'), },
'customertype' => { 'text' => $locale->text('Customer type'), },
'direct_debit' => { 'text' => $locale->text('direct debit'), },
'department' => { 'text' => $locale->text('Department'), },
. "&id=" . E($ar->{id}) . "&callback=${callback}";
$row->{ids} = {
- raw_data => $::request->presenter->checkbox_tag("id[]", value => $ar->{id}, "data-checkall" => 1),
+ raw_data => SL::Presenter::Tag::checkbox_tag("id[]", value => $ar->{id}, "data-checkall" => 1),
valign => 'center',
align => 'center',
};
$::request->layout->add_javascripts('kivi.MassInvoiceCreatePrint.js');
setup_ar_transactions_action_bar(num_rows => scalar(@{ $form->{AR} }));
- $report->generate_with_headers(action_bar => 1);
+ $report->generate_with_headers();
$main::lxdebug->leave_sub();
}
t8('Update'),
submit => [ '#form', { action => "update" } ],
id => 'update_button',
+ checks => [ 'kivi.validate_form' ],
accesskey => 'enter',
],
action => [
t8('Post'),
submit => [ '#form', { action => "post" } ],
- checks => [ 'kivi.AR.check_fields_before_posting' ],
+ checks => [ 'kivi.validate_form', 'kivi.AR.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.')
combobox => [
action => [ t8('Storno'),
submit => [ '#form', { action => "storno" } ],
- checks => [ 'kivi.AR.check_fields_before_posting' ],
+ checks => [ 'kivi.validate_form', 'kivi.AR.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');
}
1;