X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1cd85a06d6541f15f8f080c215ae46d39d19a2db..e20f3f0dac8c4b362af0e6594de9581d05d0f6c4:/bin/mozilla/ar.pl diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index b8aa128a9..c0052bd5e 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -843,7 +843,7 @@ $follow_ups_block # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it print qq| | - if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar')); + if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && (($total_paid == 0) || ($total_paid eq ""))); if ($form->{id}) { if ($form->{radier}) { @@ -1507,7 +1507,7 @@ sub ar_transactions { $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options('ar_transactions', @hidden_variables); + $report->set_export_options('ar_transactions', @hidden_variables, qw(sort sortdir)); $report->set_sort_indicator($form->{sort}, $form->{sortdir}); @@ -1620,41 +1620,6 @@ sub ar_transactions { $lxdebug->leave_sub(); } -sub sales_invoice { - $lxdebug->enter_sub(); - - $auth->assert('invoice_edit'); - - - $form->{script} = 'is.pl'; - $script = "is"; - $form->{type} = "invoice"; - $locale = new Locale "$myconfig{countrycode}", "$script"; - - require "bin/mozilla/$form->{script}"; - &add; - - $lxdebug->leave_sub(); -} - -sub ar_transaction { - $lxdebug->enter_sub(); - - $auth->assert('general_ledger'); - - - $form->{script} = 'ar.pl'; - $script = "ar"; - $locale = new Locale "$myconfig{countrycode}", "$script"; - - require "bin/mozilla/$form->{script}"; - &add; - - $lxdebug->leave_sub(); -} - - - sub storno { $lxdebug->enter_sub();