X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fap.pl;h=0e3048ab6dc3bed4c71e63322106b9be65bb3c67;hb=5a1856a8dc3dfc32759713c23ac40c93fe8ae598;hp=c993d9ed7ec415eac6c70fe19204916e3374d843;hpb=457c1bb063d985acdd97f31d450fc58437595e45;p=kivitendo-erp.git diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index c993d9ed7..0e3048ab6 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -39,7 +39,7 @@ 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; @@ -136,12 +136,12 @@ sub load_record_template { $::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; @@ -206,21 +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, - payment_id => $::form->{payment_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 { @@ -493,6 +494,17 @@ sub form_header { $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 { @@ -798,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; } } @@ -857,13 +876,30 @@ sub post { $form->{what_done} = "invoice"; $form->save_history; } - # 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}; + + 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!')); @@ -954,6 +990,8 @@ sub search { $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}" }; @@ -1006,11 +1044,12 @@ sub ap_transactions { my @columns = qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid due duedate transaction_description notes employee globalprojectnumber department - vendornumber country ustid taxzone payment_terms charts direct_debit); + 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 department_id); + parts_partnumber parts_description department_id taxzone_id); my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables); @@ -1039,10 +1078,12 @@ sub ap_transactions { 'taxzone' => { 'text' => $locale->text('Tax rate'), }, 'payment_terms' => { 'text' => $locale->text('Payment Terms'), }, '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 department)) { + 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"; } @@ -1205,20 +1246,21 @@ sub add_from_purchase_order { 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->{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; + $::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; @@ -1328,6 +1370,38 @@ sub setup_ap_display_form_action_bar { $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( @@ -1339,20 +1413,8 @@ sub setup_ap_display_form_action_bar { accesskey => 'enter', disabled => !$may_edit_create ? t8('You must not change this AP transaction.') : undef, ], - combobox => [ - action => [ - t8('Post'), - submit => [ '#form', { action => "post" } ], - 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, - ], + @post_entries, action => [ t8('Post Payment'), submit => [ '#form', { action => "post_payment" } ], @@ -1383,6 +1445,7 @@ sub setup_ap_display_form_action_bar { : $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'), @@ -1390,12 +1453,13 @@ sub setup_ap_display_form_action_bar { 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.') - : $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.') : $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"