X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=0e3048ab6dc3bed4c71e63322106b9be65bb3c67;hb=5a1856a8dc3dfc32759713c23ac40c93fe8ae598;hp=23d1b0a5c8325f19c9c0a7b786ec37abc591feca;hpb=101b9705bda052abb1237c92d3920f6ddbf12d04;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 23d1b0a5c..0e3048ab6 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -39,12 +39,16 @@ use List::UtilsBy qw(sort_by); use SL::AP; use SL::FU; use SL::GL; -use SL::Helper::Flash qw(flash); +use SL::Helper::Flash qw(flash flash_later); use SL::IR; use SL::IS; use SL::ReportGenerator; +use SL::DB::BankTransactionAccTrans; +use SL::DB::Chart; use SL::DB::Currency; use SL::DB::Default; +use SL::DB::Order; +use SL::DB::PaymentTerm; use SL::DB::PurchaseInvoice; use SL::DB::RecordTemplate; use SL::DB::Tax; @@ -88,6 +92,20 @@ use strict; # $locale->text('Nov') # $locale->text('Dec') +sub _may_view_or_edit_this_invoice { + return 1 if $::auth->assert('ap_transactions', 1); # may edit all invoices + return 0 if !$::form->{id}; # creating new invoices isn't allowed without invoice_edit + return 0 if !$::form->{globalproject_id}; # existing records without a project ID are not allowed + return SL::DB::Project->new(id => $::form->{globalproject_id})->load->may_employee_view_project_invoices(SL::DB::Manager::Employee->current); +} + +sub _assert_access { + my $cache = $::request->cache('ap.pl::_assert_access'); + + $cache->{_may_view_or_edit_this_invoice} = _may_view_or_edit_this_invoice() if !exists $cache->{_may_view_or_edit_this_invoice}; + $::form->show_generic_error($::locale->text("You do not have the permissions to access this function.")) if ! $cache->{_may_view_or_edit_this_invoice}; +} + sub load_record_template { $::auth->assert('ap_transactions'); @@ -103,6 +121,7 @@ sub load_record_template { $template->substitute_variables; # Clean the current $::form before rebuilding it from the template. + my $form_defaults = delete $::form->{form_defaults}; delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } }; # Fill $::form from the template. @@ -111,17 +130,18 @@ sub load_record_template { $::form->{currency} = $template->currency->name; $::form->{direct_debit} = $template->direct_debit; $::form->{globalproject_id} = $template->project_id; + $::form->{payment_id} = $template->payment_id; $::form->{AP_chart_id} = $template->ar_ap_chart_id; $::form->{transdate} = $today->to_kivitendo; $::form->{duedate} = $today->to_kivitendo; $::form->{rowcount} = @{ $template->items }; $::form->{paidaccounts} = 1; - $::form->{$_} = $template->$_ for qw(department_id ordnumber taxincluded notes); + $::form->{$_} = $template->$_ for qw(department_id ordnumber taxincluded notes transaction_description); if ($template->vendor) { $::form->{vendor_id} = $template->vendor_id; $::form->{vendor} = $template->vendor->name; - $::form->{duedate} = $template->vendor->payment->calc_date(reference_date => $today)->to_kivitendo if $template->vendor->payment; + $::form->{duedate} = $template->vendor->payment->calc_date(reference_date => $today)->to_kivitendo if $template->vendor->payment; } my $row = 0; @@ -150,7 +170,15 @@ sub load_record_template { $::form->{"project_id_${row}"} = $item->project_id; } + $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} }; + flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name)); + flash('info', $::locale->text("Payment bookings disallowed. After the booking this record may be " . + "suggested with the amount of '#1' or otherwise has to be choosen manually." . + " No automatic payment booking will be done to chart '#2'.", + $form_defaults->{paid_1_suggestion}, + $form_defaults->{AP_paid_1_suggestion}, + )) if $::form->{no_payment_bookings}; update( keep_rows_without_amount => 1, @@ -178,20 +206,22 @@ sub save_record_template { } (1..($::form->{rowcount} || 1)); $template->assign_attributes( - template_type => 'ap_transaction', - template_name => $new_name, - - currency_id => SL::DB::Manager::Currency->find_by(name => $::form->{currency})->id, - ar_ap_chart_id => $::form->{AP_chart_id} || undef, - vendor_id => $::form->{vendor_id} || undef, - department_id => $::form->{department_id} || undef, - project_id => $::form->{globalproject_id} || undef, - taxincluded => $::form->{taxincluded} ? 1 : 0, - direct_debit => $::form->{direct_debit} ? 1 : 0, - ordnumber => $::form->{ordnumber}, - notes => $::form->{notes}, - - items => \@items, + template_type => 'ap_transaction', + template_name => $new_name, + + currency_id => SL::DB::Manager::Currency->find_by(name => $::form->{currency})->id, + ar_ap_chart_id => $::form->{AP_chart_id} || undef, + vendor_id => $::form->{vendor_id} || undef, + department_id => $::form->{department_id} || undef, + project_id => $::form->{globalproject_id} || undef, + payment_id => $::form->{payment_id} || undef, + taxincluded => $::form->{taxincluded} ? 1 : 0, + direct_debit => $::form->{direct_debit} ? 1 : 0, + ordnumber => $::form->{ordnumber}, + notes => $::form->{notes}, + transaction_description => $::form->{transaction_description}, + + items => \@items, ); eval { @@ -226,7 +256,12 @@ sub add { $form->{transdate} = $form->{initial_transdate}; if ($form->{vendor_id}) { - my $last_used_ap_chart = SL::DB::Vendor->load_cached($form->{vendor_id})->last_used_ap_chart; + my $vendor = SL::DB::Vendor->load_cached($form->{vendor_id}); + + # set initial payment terms + $form->{payment_id} = $vendor->payment_id; + + my $last_used_ap_chart = $vendor->last_used_ap_chart; $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart; } @@ -238,9 +273,11 @@ sub add { sub edit { $main::lxdebug->enter_sub(); - my $form = $main::form; + # Delay access check to after the invoice's been loaded in + # "create_links" so that project-specific invoice rights can be + # evaluated. - $main::auth->assert('ap_transactions'); + my $form = $main::form; $form->{title} = "Edit"; @@ -253,9 +290,9 @@ sub edit { sub display_form { $main::lxdebug->enter_sub(); - my $form = $main::form; + _assert_access(); - $main::auth->assert('ap_transactions'); + my $form = $main::form; # get all files stored in the webdav folder if ($form->{invnumber} && $::instance_conf->get_webdav) { @@ -263,7 +300,6 @@ sub display_form { type => 'accounts_payable', number => $form->{invnumber}, ); - my $webdav_path = $webdav->webdav_path; my @all_objects = $webdav->get_all_objects; @{ $form->{WEBDAV} } = map { { name => $_->filename, type => t8('File'), @@ -279,14 +315,18 @@ sub display_form { sub create_links { $main::lxdebug->enter_sub(); + # Delay access check to after the invoice's been loaded so that + # project-specific invoice rights can be evaluated. + my %params = @_; my $form = $main::form; my %myconfig = %main::myconfig; - $main::auth->assert('ap_transactions'); - $form->create_links("AP", \%myconfig, "vendor"); + + _assert_access(); + my %saved; if (!$params{dont_save}) { %saved = map { ($_ => $form->{$_}) } qw(direct_debit taxincluded); @@ -299,7 +339,7 @@ sub create_links { $form->{$_} = $saved{$_} for keys %saved; $form->{rowcount} = 1; - $form->{AP_chart_id} = $form->{acc_trans} && $form->{acc_trans}->{AP} ? $form->{acc_trans}->{AP}->[0]->{chart_id} : $form->{AP_links}->{AP}->[0]->{chart_id}; + $form->{AP_chart_id} = $form->{acc_trans} && $form->{acc_trans}->{AP} ? $form->{acc_trans}->{AP}->[0]->{chart_id} : $::instance_conf->get_ap_chart_id || $form->{AP_links}->{AP}->[0]->{chart_id}; # build the popup menus $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked"; @@ -313,10 +353,6 @@ sub create_links { AP->setup_form($form); - $form->{locked} = - ($form->datetonum($form->{transdate}, \%myconfig) <= - $form->datetonum($form->{closedto}, \%myconfig)); - $main::lxdebug->leave_sub(); } @@ -342,13 +378,13 @@ sub _sort_payments { sub form_header { $main::lxdebug->enter_sub(); + _assert_access(); + my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; my $cgi = $::request->{cgi}; - $main::auth->assert('ap_transactions'); - $::form->{invoice_obj} = SL::DB::PurchaseInvoice->new(id => $::form->{id})->load if $::form->{id}; $form->{initial_focus} = !($form->{amount_1} * 1) ? 'vendor_id' : 'row_' . $form->{rowcount}; @@ -386,35 +422,18 @@ sub form_header { $form->{creditremaining_plus} = ($form->{creditremaining} =~ /-/) ? "0" : "1"; - my @old_project_ids = (); - map( - { - if ($form->{"project_id_$_"}) { - push(@old_project_ids, $form->{"project_id_$_"}); - } - } - (1..$form->{"rowcount"}) - ); - - $form->get_lists("projects" => { "key" => "ALL_PROJECTS", - "all" => 0, - "old_id" => \@old_project_ids }, - "charts" => { "key" => "ALL_CHARTS", + $form->get_lists("charts" => { "key" => "ALL_CHARTS", "transdate" => $form->{transdate} }, - "taxcharts" => { "key" => "ALL_TAXCHARTS", - "module" => "AP" },); + ); map( { $_->{link_split} = [ split(/:/, $_->{link}) ]; } @{ $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"} }) { - $project_labels{$item->{id}} = $item->{projectnumber}; - } + my %project_labels = map { $_->id => $_->projectnumber } @{ SL::DB::Manager::Project->get_all }; my %charts; my $default_ap_amount_chart_id; @@ -433,11 +452,21 @@ sub form_header { 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"); - my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local; - my $first_taxchart; + $::request->layout->add_javascripts("autocomplete_chart.js", "show_vc_details.js", "show_history.js", "follow_up.js", "kivi.Draft.js", "kivi.SalesPurchase.js", "kivi.GL.js", "kivi.RecordTemplate.js", "kivi.File.js", "kivi.AP.js", "kivi.CustomerVendor.js", "kivi.Validator.js", "autocomplete_project.js"); + # $form->{totalpaid} is used by the action bar setup to determine + # whether or not canceling is allowed. Therefore it must be + # calculated prior to the action bar setup. + $form->{totalpaid} = sum map { $form->{"paid_${_}"} } (1..$form->{paidaccounts}); + + setup_ap_display_form_action_bar(); $form->header(); + # get the correct date for tax + my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local; + my $deliverydate = $::form->{deliverydate} ? DateTime->from_kivitendo($::form->{deliverydate}) : undef; + my $taxdate = $deliverydate ? $deliverydate : $transdate; + # helper for loop + my $first_taxchart; for my $i (1 .. $form->{rowcount}) { @@ -446,10 +475,13 @@ sub form_header { $form->{"tax_$i"} = $form->format_amount(\%myconfig, $form->{"tax_$i"}, 2); my ($default_taxchart, $taxchart_to_use); - my $amount_chart_id = $form->{"AP_amount_chart_id_$i"} || $default_ap_amount_chart_id; - my $chart_has_changed = $::form->{"previous_AP_amount_chart_id_$i"} && ($amount_chart_id != $::form->{"previous_AP_amount_chart_id_$i"}); - my @taxcharts = GL->get_active_taxes_for_chart($amount_chart_id, $transdate); + my $used_tax_id; + if ( $form->{"taxchart_$i"} ) { + ($used_tax_id) = split(/--/, $form->{"taxchart_$i"}); + } + my $amount_chart_id = $form->{"AP_amount_chart_id_$i"} || $default_ap_amount_chart_id; + my @taxcharts = GL->get_active_taxes_for_chart($amount_chart_id, $taxdate, $used_tax_id); foreach my $item (@taxcharts) { my $key = $item->id . "--" . $item->rate; $first_taxchart //= $item; @@ -457,18 +489,29 @@ sub form_header { $taxchart_to_use = $item if $key eq $form->{"taxchart_$i"}; } - $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; $form->{"selected_taxchart_$i"} = $selected_taxchart; $form->{"AP_amount_chart_id_$i"} = $amount_chart_id; $form->{"taxcharts_$i"} = \@taxcharts; + + # reverse charge hack for template, display two taxes + if ($taxchart_to_use->reverse_charge_chart_id) { + my $tmpnetamount; + ($tmpnetamount, $form->{"tax_reverse_$i"}) = $form->calculate_tax($form->parse_amount(\%myconfig, $form->{"amount_$i"}), + $taxchart_to_use->rate, $form->{taxincluded}, 2 ); + + $form->{"tax_charge_$i"} = $form->{"tax_reverse_$i"} * -1; + $form->{"tax_reverse_$i"} = $form->format_amount(\%myconfig, $form->{"tax_reverse_$i"}, 2); + $form->{"tax_charge_$i"} = $form->format_amount(\%myconfig, $form->{"tax_charge_$i"}, 2); + } } $form->{taxchart_value_title_sub} = sub { my $item = shift; return [ $item->{id} .'--'. $item->{rate}, - $item->{taxdescription} .' '. ($item->{rate} * 100) .' %', + $item->{taxkey} . ' - ' . $item->{taxdescription} .' '. ($item->{rate} * 100) .' %', ]; }; @@ -483,8 +526,6 @@ sub form_header { $form->{invtotal_unformatted} = $form->{invtotal}; $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2); - $form->{totalpaid} = 0; - _sort_payments(); if ( $form->{'paid_'. $form->{paidaccounts}} ) { @@ -495,8 +536,6 @@ sub form_header { $form->{accno_arap} = IS->get_standard_accno_current_assets(\%myconfig, \%$form); for my $i (1 .. $form->{paidaccounts}) { - $form->{totalpaid} += $form->{"paid_$i"}; - # format amounts if ($form->{"paid_$i"}) { $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); @@ -526,13 +565,19 @@ sub form_header { $form->{'paidaccount_changeable_'. $i} = $changeable; $form->{'labelpaid_project_id_'. $i} = $project_labels{$form->{'paid_project_id_'. $i}}; + # accno and description as info text + $form->{'AP_paid_readonly_desc_' . $i} = $form->{'AP_paid_' . $i} ? + $form->{'AP_paid_' . $i} . " " . SL::DB::Manager::Chart->find_by(accno => $form->{'AP_paid_' . $i})->description + : ''; } $form->{paid_missing} = $form->{invtotal_unformatted} - $form->{totalpaid}; + $form->{payment_id} = $form->{invoice_obj}->{payment_id} // $form->{payment_id}; print $form->parse_html_template('ap/form_header', { today => DateTime->today, currencies => SL::DB::Manager::Currency->get_all_sorted, + payment_terms => SL::DB::Manager::PaymentTerm->get_all_sorted(query => [ or => [ obsolete => 0, id => $form->{payment_id}*1 ]]), }); $main::lxdebug->leave_sub(); @@ -540,7 +585,8 @@ sub form_header { sub form_footer { $::lxdebug->enter_sub; - $::auth->assert('ap_transactions'); + + _assert_access(); my $num_due; my $num_follow_ups; @@ -565,8 +611,6 @@ sub form_footer { print $::form->parse_html_template('ap/form_footer', { num_due => $num_due, num_follow_ups => $num_follow_ups, - show_post_draft => ($transdate > $closedto) && !$::form->{id}, - show_storno => $storno, }); $::lxdebug->leave_sub; @@ -605,7 +649,7 @@ sub update { map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining); - my @flds = qw(amount AP_amount projectnumber oldprojectnumber project_id taxchart); + my @flds = qw(amount AP_amount_chart_id projectnumber oldprojectnumber project_id taxchart tax); my $count = 0; my (@a, $j, $totaltax); for my $i (1 .. $form->{rowcount}) { @@ -618,7 +662,6 @@ sub update { # calculate tax exactly the same way as AP in post_transaction via form->calculate_tax my $tmpnetamount; ($tmpnetamount,$form->{"tax_$i"}) = $form->calculate_tax($form->{"amount_$i"},$rate,$form->{taxincluded},2); - $totaltax += $form->{"tax_$i"}; map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; $count++; @@ -635,6 +678,16 @@ sub update { if (($form->{previous_vendor_id} || $form->{vendor_id}) != $form->{vendor_id}) { IR->get_vendor(\%::myconfig, $form); + + my $vendor = SL::DB::Vendor->load_cached($form->{vendor_id}); + + # reset payment to new vendor + $form->{payment_id} = $vendor->payment_id; + + if (($form->{rowcount} == 1) && ($form->{amount_1} == 0)) { + my $last_used_ap_chart = $vendor->last_used_ap_chart; + $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart; + } } $form->{rowcount} = $count + ($params{dont_add_new_row} ? 0 : 1); @@ -736,10 +789,11 @@ sub post { 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.'); @@ -756,9 +810,16 @@ sub post { my $zero_amount_posting = 1; for my $i (1 .. $form->{rowcount}) { + + # no taxincluded for reverse charge + my ($used_tax_id) = split(/--/, $form->{"taxchart_$i"}); + my $tax = SL::DB::Manager::Tax->find_by(id => $used_tax_id); + if ($tax->reverse_charge_chart_id && $form->{taxincluded}) { + $form->error($locale->text('Cannot Post AP transaction with tax included!')); + } + if ($form->parse_amount(\%myconfig, $form->{"amount_$i"})) { $zero_amount_posting = 0; - last; } } @@ -815,9 +876,31 @@ sub post { $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; + + if (!$inline) { + my $msg = $locale->text("AP transaction '#1' posted (ID: #2)", $form->{invnumber}, $form->{id}); + if ($form->{callback} =~ /BankTransaction/) { + # no restore_from_session_id needed. we like to have a newly generated + # list of invoices for bank transactions + SL::Helper::Flash::flash_later('info', $msg); + print $form->redirect_header($form->{callback}); + $::dispatcher->end_request; + + } 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=ap.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->redirect($msg); + } + } + } else { $form->error($locale->text('Cannot post transaction!')); } @@ -858,57 +941,25 @@ sub use_as_new { $main::auth->assert('ap_transactions'); - map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno); + map { delete $form->{$_} } qw(printed emailed queued invnumber deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno convert_from_oe_id); $form->{paidaccounts} = 1; $form->{rowcount}--; - $form->{invdate} = $form->current_date(\%myconfig); - &update; - $main::lxdebug->leave_sub(); -} - -sub delete { - $main::lxdebug->enter_sub(); - - my $form = $main::form; - my $locale = $main::locale; - - $main::auth->assert('ap_transactions'); - - $form->{title} = $locale->text('Confirm!'); - - $form->header; + my $today = DateTime->today_local; + $form->{transdate} = $today->to_kivitendo; + $form->{duedate} = $form->{transdate}; - delete $form->{header}; - - print qq| -
{script}> -|; - - foreach my $key (keys %$form) { - next if (($key eq 'login') || ($key eq 'password') || ('' ne ref $form->{$key})); - $form->{$key} =~ s/\"/"/g; - print qq|\n|; + if ($form->{vendor_id}) { + my $payment_terms = SL::DB::Vendor->load_cached($form->{vendor_id})->payment; + $form->{duedate} = $payment_terms->calc_date(reference_date => $today)->to_kivitendo if $payment_terms; } - print qq| -

$form->{title}

- -

| - . $locale->text('Are you sure you want to delete Transaction') - . qq| $form->{invnumber}

- - -
-|; + &update; $main::lxdebug->leave_sub(); } -sub yes { - $main::lxdebug->enter_sub(); - +sub delete { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; @@ -927,29 +978,27 @@ sub yes { $form->redirect($locale->text('Transaction deleted!')); } $form->error($locale->text('Cannot delete transaction!')); - - $main::lxdebug->leave_sub(); } sub search { $main::lxdebug->enter_sub(); - $main::auth->assert('vendor_invoice_edit'); - my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - $form->{title} = $locale->text('AP Transactions'); - - $form->get_lists(projects => { "key" => "ALL_PROJECTS", "all" => 1 }); + $form->{title} = $locale->text('Vendor Invoices & AP Transactions'); $::form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all_sorted; + $::form->{ALL_TAXZONES} = SL::DB::Manager::TaxZone ->get_all_sorted; + # constants and subs for template $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $::request->layout->add_javascripts("autocomplete_project.js"); + setup_ap_search_action_bar(); + $form->header; print $form->parse_html_template('ap/search', { %myconfig }); @@ -984,24 +1033,23 @@ sub ap_transactions { my %myconfig = %main::myconfig; my $locale = $main::locale; - $main::auth->assert('vendor_invoice_edit'); - report_generator_set_default_sort('transdate', 1); AP->ap_transactions(\%myconfig, \%$form); - $form->{title} = $locale->text('AP Transactions'); + $form->{title} = $locale->text('Vendor Invoices & AP Transactions'); my $report = SL::ReportGenerator->new(\%myconfig, $form); my @columns = qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid - due duedate transaction_description notes employee globalprojectnumber - vendornumber country ustid taxzone payment_terms charts direct_debit); + due duedate transaction_description notes employee globalprojectnumber department + vendornumber country ustid taxzone payment_terms charts debit_chart direct_debit + insertdate); my @hidden_variables = map { "l_${_}" } @columns; push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto - parts_partnumber parts_description); + parts_partnumber parts_description department_id taxzone_id); my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables); @@ -1023,16 +1071,19 @@ sub ap_transactions { 'notes' => { 'text' => $locale->text('Notes'), }, 'employee' => { 'text' => $locale->text('Employee'), }, 'globalprojectnumber' => { 'text' => $locale->text('Document Project Number'), }, + 'department' => { 'text' => $locale->text('Department'), }, 'vendornumber' => { 'text' => $locale->text('Vendor Number'), }, 'country' => { 'text' => $locale->text('Country'), }, 'ustid' => { 'text' => $locale->text('USt-IdNr.'), }, 'taxzone' => { 'text' => $locale->text('Tax rate'), }, 'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, - 'charts' => { 'text' => $locale->text('Buchungskonto'), }, + 'charts' => { 'text' => $locale->text('Chart'), }, + 'debit_chart' => { 'text' => $locale->text('Debit Account'), }, 'direct_debit' => { 'text' => $locale->text('direct debit'), }, + 'insertdate' => { 'text' => $locale->text('Insert Date'), }, ); - foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit)) { + foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone)) { my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir}; $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir"; } @@ -1049,10 +1100,16 @@ sub ap_transactions { $report->set_sort_indicator($form->{sort}, $form->{sortdir}); + my $department_description; + $department_description = SL::DB::Manager::Department->find_by(id => $form->{department_id})->description if $form->{department_id}; + my $project_description; + $project_description = SL::DB::Manager::Project->find_by(id => $form->{project_id})->description if $form->{project_id}; + my @options; push @options, $locale->text('Vendor') . " : $form->{vendor}" if ($form->{vendor}); push @options, $locale->text('Contact Person') . " : $form->{cp_name}" if ($form->{cp_name}); - push @options, $locale->text('Department') . " : $form->{department}" if ($form->{department}); + push @options, $locale->text('Department') . " : $department_description" if ($form->{department_id}); + push @options, $locale->text('Project') . " : $project_description" if ($project_description); push @options, $locale->text('Invoice Number') . " : $form->{invnumber}" if ($form->{invnumber}); push @options, $locale->text('Order Number') . " : $form->{ordnumber}" if ($form->{ordnumber}); push @options, $locale->text('Notes') . " : $form->{notes}" if ($form->{notes}); @@ -1065,7 +1122,6 @@ sub ap_transactions { push @options, $locale->text('Closed') if ($form->{closed}); $report->set_options('top_info_text' => join("\n", @options), - 'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $locale->text('vendor_invoice_list') . strftime('_%Y%m%d', localtime time), @@ -1140,6 +1196,7 @@ sub ap_transactions { $report->add_separator(); $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); + setup_ap_transactions_action_bar(); $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -1177,3 +1234,277 @@ sub storno { $main::lxdebug->leave_sub(); } + +sub add_from_purchase_order { + $main::auth->assert('ap_transactions'); + + return if !$::form->{id}; + + my $order_id = delete $::form->{id}; + my $order = SL::DB::Order->new(id => $order_id)->load(with => [ 'vendor', 'currency', 'payment_terms' ]); + + return if $order->type ne 'purchase_order'; + + my $today = DateTime->today_local; + $::form->{title} = "Add"; + $::form->{vc} = 'vendor'; + $::form->{vendor_id} = $order->customervendor->id; + $::form->{vendor} = $order->vendor->name; + $::form->{convert_from_oe_id} = $order->id; + $::form->{globalproject_id} = $order->globalproject_id; + $::form->{ordnumber} = $order->number; + $::form->{department_id} = $order->department_id; + $::form->{transaction_description} = $order->transaction_description; + $::form->{currency} = $order->currency->name; + $::form->{taxincluded} = 1; # we use amount below, so tax is included + $::form->{transdate} = $today->to_kivitendo; + $::form->{duedate} = $today->to_kivitendo; + $::form->{duedate} = $order->payment_terms->calc_date(reference_date => $today)->to_kivitendo if $order->payment_terms; + $::form->{deliverydate} = $order->reqdate->to_kivitendo if $order->reqdate; + create_links(); + + my $config_po_ap_workflow_chart_id = $::instance_conf->get_workflow_po_ap_chart_id; + + my ($first_taxchart, $default_taxchart, $taxchart_to_use); + my @taxcharts = (); + @taxcharts = GL->get_active_taxes_for_chart($config_po_ap_workflow_chart_id, $::form->{transdate}) if (defined $config_po_ap_workflow_chart_id); + foreach my $item (@taxcharts) { + $first_taxchart //= $item; + $default_taxchart = $item if $item->{is_default}; + } + $taxchart_to_use = $default_taxchart // $first_taxchart; + + my %pat = $order->calculate_prices_and_taxes; + my $row = 1; + foreach my $amount_chart (keys %{$pat{amounts}}) { + my $tax = SL::DB::Manager::Tax->find_by(id => $pat{amounts}->{$amount_chart}->{tax_id}); + # If tax chart from order for this amount is active, use it. Use default or first tax chart for selected chart else. + if (defined $config_po_ap_workflow_chart_id) { + $taxchart_to_use = (first {$_->{id} == $tax->id} @taxcharts) // $taxchart_to_use; + } else { + $taxchart_to_use = $tax; + } + + $::form->{"AP_amount_chart_id_$row"} = $config_po_ap_workflow_chart_id // $amount_chart; + $::form->{"previous_AP_amount_chart_id_$row"} = $::form->{"AP_amount_chart_id_$row"}; + $::form->{"amount_$row"} = $::form->format_amount(\%::myconfig, $pat{amounts}->{$amount_chart}->{amount} * (1 + $tax->rate), 2); + $::form->{"taxchart_$row"} = $taxchart_to_use->id . '--' . $taxchart_to_use->rate; + $::form->{"project_id_$row"} = $order->globalproject_id; + + $row++; + } + + my $last_used_ap_chart = SL::DB::Vendor->load_cached($::form->{vendor_id})->last_used_ap_chart; + $::form->{"AP_amount_chart_id_$row"} = $last_used_ap_chart->id if $last_used_ap_chart; + $::form->{rowcount} = $row; + + update( + keep_rows_without_amount => 1, + dont_add_new_row => 1, + ); +} + +sub setup_ap_search_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + 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 %params = @_; + my $may_edit_create = $::auth->assert('ap_transactions', 1); + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + combobox => [ + action => [ t8('Add') ], + link => [ + t8('Purchase Invoice'), + link => [ 'ir.pl?action=add' ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, + + ], + link => [ + t8('AP Transaction'), + link => [ 'ap.pl?action=add' ], + disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef, + ], + ], # end of combobox "Add" + ); + } +} + +sub setup_ap_display_form_action_bar { + my $transdate = $::form->datetonum($::form->{transdate}, \%::myconfig); + my $closedto = $::form->datetonum($::form->{closedto}, \%::myconfig); + my $is_closed = $transdate <= $closedto; + + 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'); + + my $may_edit_create = $::auth->assert('ap_transactions', 1); + + my $has_sepa_exports; + if ($::form->{id}) { + my $invoice = SL::DB::Manager::PurchaseInvoice->find_by(id => $::form->{id}); + $has_sepa_exports = 1 if ($invoice->find_sepa_export_items()->[0]); + } + + my $is_linked_bank_transaction; + if ($::form->{id} + && SL::DB::Default->get->payments_changeable != 0 + && SL::DB::Manager::BankTransactionAccTrans->find_by(ap_id => $::form->{id})) { + + $is_linked_bank_transaction = 1; + } + my $is_linked_gl_transaction; + if ($::form->{id} && SL::DB::Manager::ApGl->find_by(ap_id => $::form->{id})) { + $is_linked_gl_transaction = 1; + } + + my $create_post_action = sub { + # $_[0]: description + # $_[1]: after_action + action => [ + $_[0], + submit => [ '#form', { action => "post", after_action => $_[1] } ], + checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ], + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : $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.') + : ($::form->{id} && $change_on_same_day_only) ? t8('Invoices 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_entries; + if ($::instance_conf->get_ap_add_doc && $::instance_conf->get_doc_storage) { + @post_entries = ( $create_post_action->(t8('Post'), 'doc-tab'), + $create_post_action->(t8('Post and new booking')) ); + } elsif ($::instance_conf->get_doc_storage) { + @post_entries = ( $create_post_action->(t8('Post')), + $create_post_action->(t8('Post and upload document'), 'doc-tab') ); + } else { + @post_entries = ( $create_post_action->(t8('Post')) ); + } + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Update'), + submit => [ '#form', { action => "update" } ], + id => 'update_button', + checks => [ 'kivi.validate_form' ], + accesskey => 'enter', + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') : undef, + ], + combobox => [ + @post_entries, + action => [ + t8('Post Payment'), + submit => [ '#form', { action => "post_payment" } ], + checks => [ 'kivi.validate_form' ], + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : !$::form->{id} ? t8('This invoice has not been posted yet.') + : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.') + : undef, + ], + action => [ t8('Mark as paid'), + submit => [ '#form', { action => "mark_as_paid" } ], + confirm => t8('This will remove the invoice from showing as unpaid even if the unpaid amount does not match the amount. Proceed?'), + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : !$::form->{id} ? t8('This invoice has not been posted yet.') + : undef, + only_if => $::instance_conf->get_is_show_mark_as_paid, + ], + ], # end of combobox "Post" + + combobox => [ + action => [ t8('Storno'), + submit => [ '#form', { action => "storno" } ], + checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting' ], + confirm => t8('Do you really want to cancel this invoice?'), + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : !$::form->{id} ? t8('This invoice has not been posted yet.') + : $has_storno ? t8('This invoice has been canceled already.') + : $is_storno ? t8('Reversal invoices cannot be canceled.') + : $::form->{totalpaid} ? t8('Invoices with payments cannot be canceled.') + : $has_sepa_exports ? t8('This invoice has been linked with a sepa export, undo this first.') + : $is_linked_gl_transaction ? t8('This transaction is linked with a gl transaction. Please delete the ap transaction booking if needed.') + : undef, + ], + action => [ t8('Delete'), + submit => [ '#form', { action => "delete" } ], + confirm => t8('Do you really want to delete this object?'), + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : !$::form->{id} ? t8('This invoice has not been posted yet.') + : $is_closed ? t8('The billing period has already been locked.') + : $has_sepa_exports ? t8('This invoice has been linked with a sepa export, undo this first.') + : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.') + : $is_linked_gl_transaction ? undef # linked transactions can be deleted, if period is not closed + : $change_never ? t8('Changing invoices has been disabled in the configuration.') + : $change_on_same_day_only ? t8('Invoices can only be changed on the day they are posted.') + : $has_storno ? t8('This invoice has been canceled already.') + : undef, + ], + ], # end of combobox "Storno" + + 'separator', + + combobox => [ + action => [ t8('Workflow') ], + action => [ + t8('Use As New'), + submit => [ '#form', { action => "use_as_new" } ], + checks => [ 'kivi.validate_form' ], + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : !$::form->{id} ? t8('This invoice has not been posted yet.') + : undef, + ], + ], # end of combobox "Workflow" + + combobox => [ + action => [ t8('more') ], + action => [ + t8('History'), + call => [ 'set_history_window', $::form->{id} * 1, 'glid' ], + disabled => !$::form->{id} ? t8('This invoice has not been posted yet.') : undef, + ], + action => [ + t8('Follow-Up'), + call => [ 'follow_up_window' ], + disabled => !$::form->{id} ? t8('This invoice has not been posted yet.') : undef, + ], + action => [ + t8('Record templates'), + call => [ 'kivi.RecordTemplate.popup', 'ap_transaction' ], + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') : undef, + ], + action => [ + t8('Drafts'), + call => [ 'kivi.Draft.popup', 'ap', 'invoice', $::form->{draft_id}, $::form->{draft_description} ], + disabled => !$may_edit_create ? t8('You must not change this AP transaction.') + : $::form->{id} ? t8('This invoice has already been posted.') + : $is_closed ? t8('The billing period has already been locked.') + : undef, + ], + ], # end of combobox "more" + ); + } + $::request->layout->add_javascripts('kivi.Validator.js'); +}