X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=b0df30c44a13fc6e43e4123e64f439e525090c55;hb=94f5cb152afa9210162295b6727801c296af0631;hp=6d157fc8f7d5c5863b8effd529207c6c340bdccb;hpb=acbd9d0f24ae02d58ca34d480d84886b75ff7017;p=kivitendo-erp.git diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 6d157fc8f..b0df30c44 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -33,12 +33,17 @@ #====================================================================== use SL::FU; +use SL::Helper::Flash qw(flash_later); +use SL::Helper::UserPreferences::DisplayPreferences; use SL::IR; use SL::IS; +use SL::DB::BankTransactionAccTrans; use SL::DB::Default; use SL::DB::Department; +use SL::DB::Project; use SL::DB::PurchaseInvoice; use SL::DB::Vendor; +use List::MoreUtils qw(uniq); use List::Util qw(max sum); use List::UtilsBy qw(sort_by); @@ -51,6 +56,21 @@ use strict; # end of main +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 1 if $::auth->assert('purchase_invoice_view', 1); # viewing is allowed with this right + 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 add { $main::lxdebug->enter_sub(); @@ -77,11 +97,13 @@ sub add { sub edit { $main::lxdebug->enter_sub(); + # Delay access check to after the invoice's been loaded in + # "create_links" so that project-specific invoice rights can be + # evaluated. + my $form = $main::form; my $locale = $main::locale; - $main::auth->assert('vendor_invoice_edit'); - $form->{show_details} = $::myconfig{show_form_details}; # show history button @@ -100,16 +122,19 @@ sub edit { sub invoice_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 $form = $main::form; my %myconfig = %main::myconfig; - $main::auth->assert('vendor_invoice_edit'); - $form->{vc} = 'vendor'; # create links $form->create_links("AP", \%myconfig, "vendor"); + _assert_access(); + $form->backup_vars(qw(payment_id language_id taxzone_id currency delivery_term_id intnotes cp_id)); @@ -173,11 +198,11 @@ sub invoice_links { sub prepare_invoice { $main::lxdebug->enter_sub(); + _assert_access(); + my $form = $main::form; my %myconfig = %main::myconfig; - $main::auth->assert('vendor_invoice_edit'); - $form->{type} = "purchase_invoice"; if ($form->{id}) { @@ -222,49 +247,78 @@ sub setup_ir_action_bar { my $change_on_same_day_only = $::instance_conf->get_ir_changeable == 2 && ($form->current_date(\%::myconfig) ne $form->{gldate}); my $has_storno = ($::form->{storno} && !$::form->{storno_id}); my $payments_balanced = ($::form->{oldtotalpaid} == 0); + my $may_edit_create = $::auth->assert('vendor_invoice_edit', 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 $create_post_action = sub { + # $_[0]: description + # $_[1]: after_action + action => [ + $_[0], + submit => [ '#form', { action => "post", after_action => $_[1] } ], + checks => [ 'kivi.validate_form' ], + 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 invoice.') + : $form->{locked} ? t8('The billing period has already been locked.') + : $form->{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_ir_add_doc && $::instance_conf->get_doc_storage) { + @post_entries = ( $create_post_action->(t8('Post'), 'doc-tab') ); + } 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" } ], - checks => [ 'kivi.validate_form' ], id => 'update_button', accesskey => 'enter', + disabled => !$may_edit_create ? t8('You must not change this invoice.') : undef, ], - combobox => [ - action => [ - t8('Post'), - submit => [ '#form', { action => "post" } ], - checks => [ 'kivi.validate_form' ], - checks => [ 'kivi.validate_form', 'kivi.AP.check_fields_before_posting', 'kivi.AP.check_duplicate_invnumber' ], - - disabled => $form->{locked} ? t8('The billing period has already been locked.') - : $form->{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, - ], + @post_entries, 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, + disabled => !$may_edit_create ? t8('You must not change this invoice.') + : !$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" } ], checks => [ 'kivi.validate_form' ], 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, + disabled => !$may_edit_create ? t8('You must not change this invoice.') + : !$form->{id} ? t8('This invoice has not been posted yet.') + : undef, only_if => $::instance_conf->get_ir_show_mark_as_paid, ], ], # end of combobox "Post" @@ -274,21 +328,24 @@ sub setup_ir_action_bar { submit => [ '#form', { action => "storno" } ], checks => [ 'kivi.validate_form' ], confirm => t8('Do you really want to cancel this invoice?'), - disabled => !$form->{id} ? t8('This invoice has not been posted yet.') - : $has_sepa_exports ? t8('This invoice has been linked with a sepa export, undo this first.') - : !$payments_balanced ? t8('Cancelling is disallowed. Either undo or balance the current payments until the open amount matches the invoice amount') - : undef, + disabled => !$may_edit_create ? t8('You must not change this invoice.') + : !$form->{id} ? t8('This invoice has not been posted yet.') + : $has_sepa_exports ? t8('This invoice has been linked with a sepa export, undo this first.') + : !$payments_balanced ? t8('Cancelling is disallowed. Either undo or balance the current payments until the open amount matches the invoice amount') + : undef, ], action => [ t8('Delete'), submit => [ '#form', { action => "delete" } ], checks => [ 'kivi.validate_form' ], confirm => t8('Do you really want to delete this object?'), - disabled => !$form->{id} ? t8('This invoice has not been posted yet.') - : $form->{locked} ? t8('The billing period has already been locked.') - : $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_sepa_exports ? t8('This invoice has been linked with a sepa export, undo this first.') - : $has_storno ? t8('Can only delete the "Storno zu" part of the cancellation pair.') + disabled => !$may_edit_create ? t8('You must not change this invoice.') + : !$form->{id} ? t8('This invoice has not been posted yet.') + : $form->{locked} ? t8('The billing period has already been locked.') + : $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_sepa_exports ? t8('This invoice has been linked with a sepa export, undo this first.') + : $has_storno ? t8('Can only delete the "Storno zu" part of the cancellation pair.') + : $is_linked_bank_transaction ? t8('This transaction is linked with a bank transaction. Please undo and redo the bank transaction booking if needed.') : undef, ], ], # end of combobox "Storno" @@ -301,7 +358,9 @@ sub setup_ir_action_bar { 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, + disabled => !$may_edit_create ? t8('You must not change this invoice.') + : !$form->{id} ? t8('This invoice has not been posted yet.') + : undef, ], ], # end of combobox "Workflow" @@ -309,7 +368,7 @@ sub setup_ir_action_bar { action => [ t8('more') ], action => [ t8('History'), - call => [ 'set_history_window', $::form->{id} * 1, 'id', 'glid' ], + call => [ 'set_history_window', $::form->{id} * 1, 'glid' ], disabled => !$form->{id} ? t8('This invoice has not been posted yet.') : undef, ], action => [ @@ -320,9 +379,10 @@ sub setup_ir_action_bar { action => [ t8('Drafts'), call => [ 'kivi.Draft.popup', 'ir', 'invoice', $::form->{draft_id}, $::form->{draft_description} ], - disabled => $form->{id} ? t8('This invoice has already been posted.') - : $form->{locked} ? t8('The billing period has already been locked.') - : undef, + disabled => !$may_edit_create ? t8('You must not change this invoice.') + : $form->{id} ? t8('This invoice has already been posted.') + : $form->{locked} ? t8('The billing period has already been locked.') + : undef, ], ], # end of combobox "more" ); @@ -334,13 +394,13 @@ sub setup_ir_action_bar { 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('vendor_invoice_edit'); - my %TMPL_VAR = (); my @custom_hiddens; @@ -354,8 +414,10 @@ sub form_header { $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); - my @old_project_ids = ($form->{"globalproject_id"}); - map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"}; + my @old_project_ids = uniq grep { $_ } map { $_ * 1 } ($form->{"globalproject_id"}, map { $form->{"project_id_$_"} } 1..$form->{"rowcount"}); + my @conditions = @old_project_ids ? (id => \@old_project_ids) : (); + $TMPL_VAR{ALL_PROJECTS} = SL::DB::Manager::Project->get_all_sorted(query => [ or => [ active => 1, @conditions ]]); + $form->{ALL_PROJECTS} = $TMPL_VAR{ALL_PROJECTS}; # make projects available for second row drop-down in io.pl $form->get_lists("taxzones" => ($form->{id} ? "ALL_TAXZONES" : "ALL_ACTIVE_TAXZONES"), "currencies" => "ALL_CURRENCIES", @@ -395,9 +457,10 @@ sub form_header { $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } - $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; - $TMPL_VAR{dateformat} = $myconfig{dateformat}; - $TMPL_VAR{numberformat} = $myconfig{numberformat}; + $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; + $TMPL_VAR{dateformat} = $myconfig{dateformat}; + $TMPL_VAR{numberformat} = $myconfig{numberformat}; + $TMPL_VAR{longdescription_dialog_size_percentage} = SL::Helper::UserPreferences::DisplayPreferences->new()->get_longdescription_dialog_size_percentage(); # hiddens $TMPL_VAR{HIDDENS} = [qw( @@ -408,7 +471,7 @@ sub form_header { shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus convert_from_do_ids convert_from_oe_ids convert_from_ap_ids show_details gldate useasnew ), @custom_hiddens, - map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; + map { $_.'_rate', $_.'_description', $_.'_taxnumber', $_.'_tax_id' } split / /, $form->{taxaccounts}]; $TMPL_VAR{payment_terms_obj} = get_payment_terms_for_invoice(); $form->{duedate} = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{duedate})->to_kivitendo if $TMPL_VAR{payment_terms_obj}; @@ -446,21 +509,15 @@ sub _sort_payments { sub form_footer { $main::lxdebug->enter_sub(); + _assert_access(); + my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - $main::auth->assert('vendor_invoice_edit'); - $form->{invtotal} = $form->{invsubtotal}; $form->{oldinvtotal} = $form->{invtotal}; - # note rows - $form->{rows} = max 2, - $form->numtextrows($form->{notes}, 26, 8), - $form->numtextrows($form->{intnotes}, 35, 8); - - # tax, total and subtotal calculations my ($tax, $subtotal); $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ]; @@ -898,12 +955,21 @@ sub post { $form->save_history; } # /saving the history - $form->{callback} = 'ir.pl?action=add'; - $form->redirect( $locale->text('Invoice') - . " $form->{invnumber} " - . ", " . $locale->text('ID') - . ': ' . $form->{id} . ' ' - . $locale->text('posted!')); + + my $redirect_url; + if ('doc-tab' eq $form->{after_action}) { + $redirect_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id}), 'fragment=ui-tabs-docs'); + } else { + $redirect_url = build_std_url("script=ir.pl", 'action=edit', 'id=' . E($form->{id})); + } + SL::Helper::Flash::flash_later('info', + $locale->text('Invoice') + . " $form->{invnumber} " + . ", " . $locale->text('ID') + . ': ' . $form->{id} . ' ' + . $locale->text('posted!')); + print $form->redirect_header($redirect_url); + $::dispatcher->end_request; } $form->error($locale->text('Cannot post invoice!')); @@ -950,7 +1016,7 @@ sub delete { sub display_form { $::lxdebug->enter_sub; - $::auth->assert('vendor_invoice_edit'); + _assert_access(); relink_accounts();