X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Far.pl;h=9d1784f78f2d3d6d70a073959a9ed854e0435afc;hb=61a56bb4796ca9edb098541c55a00c990a9f227c;hp=969d73d2afab50506cea37cf9b333080f2a391d3;hpb=ee56f1b20ab915671ded297f593c0e2e245bad70;p=kivitendo-erp.git diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 969d73d2a..9d1784f78 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -37,14 +37,20 @@ use List::Util qw(sum first max); use List::UtilsBy qw(sort_by); use SL::AR; +use SL::Controller::Base; use SL::FU; use SL::GL; use SL::IS; use SL::DB::Business; +use SL::DB::Chart; use SL::DB::Currency; use SL::DB::Default; use SL::DB::Employee; use SL::DB::Invoice; +use SL::DB::RecordTemplate; +use SL::DB::Tax; +use SL::Helper::Flash qw(flash); +use SL::Locale::String qw(t8); use SL::ReportGenerator; require "bin/mozilla/common.pl"; @@ -81,6 +87,130 @@ use strict; # $locale->text('Nov') # $locale->text('Dec') +sub load_record_template { + $::auth->assert('ar_transactions'); + + # Load existing template and verify that its one for this module. + my $template = SL::DB::RecordTemplate + ->new(id => $::form->{id}) + ->load( + with_object => [ qw(customer payment currency record_items record_items.chart) ], + ); + + die "invalid template type" unless $template->template_type eq 'ar_transaction'; + + $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. + my $today = DateTime->today_local; + $::form->{title} = "Add"; + $::form->{currency} = $template->currency->name; + $::form->{direct_debit} = $template->direct_debit; + $::form->{globalproject_id} = $template->project_id; + $::form->{AR_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 employee_id notes); + + if ($template->customer) { + $::form->{customer_id} = $template->customer_id; + $::form->{customer} = $template->customer->name; + $::form->{duedate} = $template->customer->payment->calc_date(reference_date => $today)->to_kivitendo if $template->customer->payment; + } + + my $row = 0; + foreach my $item (@{ $template->items }) { + $row++; + + my $active_taxkey = $item->chart->get_active_taxkey; + my $taxes = SL::DB::Manager::Tax->get_all( + where => [ chart_categories => { like => '%' . $item->chart->category . '%' }], + sort_by => 'taxkey, rate', + ); + + my $tax = first { $item->tax_id == $_->id } @{ $taxes }; + $tax //= first { $active_taxkey->tax_id == $_->id } @{ $taxes }; + $tax //= $taxes->[0]; + + if (!$tax) { + $row--; + next; + } + + $::form->{"AR_amount_chart_id_${row}"} = $item->chart_id; + $::form->{"previous_AR_amount_chart_id_${row}"} = $item->chart_id; + $::form->{"amount_${row}"} = $::form->format_amount(\%::myconfig, $item->amount1, 2); + $::form->{"taxchart_${row}"} = $item->tax_id . '--' . $tax->rate; + $::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)); + + update( + keep_rows_without_amount => 1, + dont_add_new_row => 1, + ); +} + +sub save_record_template { + $::auth->assert('ar_transactions'); + + 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'); + + my @items = grep { + $_->{chart_id} && (($_->{tax_id} // '') ne '') + } map { + +{ chart_id => $::form->{"AR_amount_chart_id_${_}"}, + amount1 => $::form->parse_amount(\%::myconfig, $::form->{"amount_${_}"}), + tax_id => (split m{--}, $::form->{"taxchart_${_}"})[0], + project_id => $::form->{"project_id_${_}"} || undef, + } + } (1..($::form->{rowcount} || 1)); + + $template->assign_attributes( + template_type => 'ar_transaction', + template_name => $new_name, + + currency_id => SL::DB::Manager::Currency->find_by(name => $::form->{currency})->id, + ar_ap_chart_id => $::form->{AR_chart_id} || undef, + customer_id => $::form->{customer_id} || undef, + department_id => $::form->{department_id} || undef, + project_id => $::form->{globalproject_id} || undef, + employee_id => $::form->{employee_id} || undef, + taxincluded => $::form->{taxincluded} ? 1 : 0, + direct_debit => $::form->{direct_debit} ? 1 : 0, + ordnumber => $::form->{ordnumber}, + notes => $::form->{notes}, + + items => \@items, + ); + + eval { + $template->save; + 1; + } or do { + return $js + ->flash('error', $::locale->text("Saving the record template '#1' failed.", $new_name)) + ->render; + }; + + return $js + ->flash('info', $::locale->text("The record template '#1' has been saved.", $new_name)) + ->render; +} + sub add { $main::lxdebug->enter_sub(); @@ -263,7 +393,7 @@ sub form_header { 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"); + $::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"); my $transdate = $::form->{transdate} ? DateTime->from_kivitendo($::form->{transdate}) : DateTime->today_local; my $first_taxchart; @@ -277,8 +407,7 @@ sub form_header { }; 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; @@ -290,7 +419,7 @@ sub form_header { $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} = @@ -373,6 +502,8 @@ sub form_header { ], ); + setup_ar_form_header_action_bar(); + $form->header; print $::form->parse_html_template('ar/form_header', { paid_missing => $::form->{invtotal} - $::form->{totalpaid}, @@ -410,20 +541,6 @@ sub form_footer { } } - my $transdate = $form->datetonum($form->{transdate}, \%myconfig); - my $closedto = $form->datetonum($form->{closedto}, \%myconfig); - - $form->{is_closed} = $transdate <= $closedto; - - # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it - $form->{show_storno_button} = - $form->{id} && - !IS->has_storno(\%myconfig, $form, 'ar') && - !IS->is_storno(\%myconfig, $form, 'ar') && - ($form->{totalpaid} == 0 || $form->{totalpaid} eq ""); - - $form->{show_mark_as_paid_button} = $form->{id} && $::instance_conf->get_ar_show_mark_as_paid(); - print $::form->parse_html_template('ar/form_footer'); $main::lxdebug->leave_sub(); @@ -433,7 +550,6 @@ sub mark_as_paid { $::auth->assert('ar_transactions'); SL::DB::Invoice->new(id => $::form->{id})->load->mark_as_paid; - $::form->redirect($::locale->text("Marked as paid")); } @@ -444,6 +560,7 @@ sub show_draft { } sub update { + my %params = @_; $main::lxdebug->enter_sub(); $main::auth->assert('ar_transactions'); @@ -468,7 +585,7 @@ sub update { for my $i (1 .. $form->{rowcount}) { $form->{"amount_$i"} = $form->parse_amount(\%myconfig, $form->{"amount_$i"}); - if ($form->{"amount_$i"}) { + if ($form->{"amount_$i"} || $params{keep_rows_without_amount}) { push @a, {}; my $j = $#a; my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"}); @@ -483,7 +600,7 @@ sub update { } $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count + 1; + $form->{rowcount} = $count + ($params{dont_add_new_row} ? 0 : 1); map { $form->{invtotal} += $form->{"amount_$_"} } (1 .. $form->{rowcount}); $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{transdate}, 'buy'); @@ -493,6 +610,10 @@ sub update { 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} = @@ -518,7 +639,7 @@ sub update { $form->{oldinvtotal} = $form->{invtotal}; $form->{oldtotalpaid} = $form->{totalpaid}; - &display_form; + display_form(); $main::lxdebug->leave_sub(); } @@ -706,58 +827,26 @@ sub use_as_new { my $form = $main::form; my %myconfig = %main::myconfig; - 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); $form->{paidaccounts} = 1; $form->{rowcount}--; - $form->{invdate} = $form->current_date(\%myconfig); - &update; - - $main::lxdebug->leave_sub(); -} - -sub delete { - $main::lxdebug->enter_sub(); - - $main::auth->assert('ar_transactions'); - - my $form = $main::form; - my $locale = $main::locale; - $form->{title} = $locale->text('Confirm!'); + my $today = DateTime->today_local; + $form->{transdate} = $today->to_kivitendo; + $form->{duedate} = $form->{transdate}; - $form->header; - - 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->{customer_id}) { + my $payment_terms = SL::DB::Customer->load_cached($form->{customer_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(); - - $main::auth->assert('ar_transactions'); +sub delete { + $::auth->assert('ar_transactions'); my $form = $main::form; my %myconfig = %main::myconfig; @@ -775,8 +864,46 @@ sub yes { $form->redirect($locale->text('Transaction deleted!')); } $form->error($locale->text('Cannot delete transaction!')); +} - $main::lxdebug->leave_sub(); +sub setup_ar_search_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + $::locale->text('Search'), + submit => [ '#form' ], + accesskey => 'enter', + ], + ); + } +} + +sub setup_ar_transactions_action_bar { + my %params = @_; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + $::locale->text('Print'), + call => [ 'kivi.MassInvoiceCreatePrint.showMassPrintOptionsOrDownloadDirectly' ], + disabled => !$params{num_rows} ? $::locale->text('The report doesn\'t contain entries.') : undef, + ], + + combobox => [ + action => [ $::locale->text('Create new') ], + action => [ + $::locale->text('AR Transaction'), + submit => [ '#create_new_form', { action => 'ar_transaction' } ], + ], + action => [ + $::locale->text('Sales Invoice'), + submit => [ '#create_new_form', { action => 'sales_invoice' } ], + ], + ], # end of combobox "Create new" + ); + } } sub search { @@ -789,7 +916,7 @@ sub search { 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; @@ -806,6 +933,8 @@ sub search { $::request->layout->add_javascripts("autocomplete_project.js"); + setup_ar_search_action_bar(); + $form->header; print $form->parse_html_template('ar/search', { %myconfig }); @@ -848,7 +977,7 @@ sub ar_transactions { 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); @@ -902,7 +1031,7 @@ sub ar_transactions { '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'), }, @@ -1072,6 +1201,9 @@ sub ar_transactions { $report->add_separator(); $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal')); + $::request->layout->add_javascripts('kivi.MassInvoiceCreatePrint.js'); + setup_ar_transactions_action_bar(num_rows => scalar(@{ $form->{AR} })); + $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -1108,4 +1240,109 @@ sub storno { $main::lxdebug->leave_sub(); } +sub setup_ar_form_header_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_ar_changeable == 0; + my $change_on_same_day_only = $::instance_conf->get_ar_changeable == 2 && ($::form->current_date(\%::myconfig) ne $::form->{gldate}); + + my $is_storno = IS->is_storno(\%::myconfig, $::form, 'ar', $::form->{id}); + my $has_storno = IS->has_storno(\%::myconfig, $::form, 'ar'); + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Update'), + submit => [ '#form', { action => "update" } ], + id => 'update_button', + accesskey => 'enter', + ], + + combobox => [ + action => [ + t8('Post'), + submit => [ '#form', { action => "post" } ], + checks => [ '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.') + : ($::form->{id} && $change_on_same_day_only) ? t8('Invoices can only be changed on the day they are posted.') + : undef, + ], + action => [ + t8('Post Payment'), + submit => [ '#form', { action => "post_payment" } ], + disabled => !$::form->{id} ? t8('This invoice has not been posted yet.') : 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 => !$::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.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.') + : $is_storno ? t8('Reversal invoices cannot be canceled.') + : $::form->{totalpaid} ? t8('Invoices with payments cannot be canceled.') + : undef, + ], + action => [ t8('Delete'), + submit => [ '#form', { action => "delete" } ], + confirm => t8('Do you really want to delete this object?'), + disabled => !$::form->{id} ? t8('This invoice has not been posted yet.') + : $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.') + : $is_closed ? t8('The billing period has already been locked.') + : undef, + ], + ], # end of combobox "Storno" + + 'separator', + + combobox => [ + action => [ t8('Workflow') ], + action => [ + t8('Use As New'), + submit => [ '#form', { action => "use_as_new" } ], + disabled => !$::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', 'ar_transaction' ], + ], + action => [ + t8('Drafts'), + call => [ 'kivi.Draft.popup', 'ar', 'invoice', $::form->{draft_id}, $::form->{draft_description} ], + disabled => $::form->{id} ? t8('This invoice has already been posted.') + : $is_closed ? t8('The billing period has already been locked.') + : undef, + ], + ], # end of combobox "more" + ); + } +} + 1;