X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=c6c520e66d980764deca4738480215f7a88f635c;hb=a6cf76a2874a723b04d508c99b30f7fd5a4f6573;hp=6b2cad0e66848a91aae829ff28866750c7615319;hpb=ece6d2120748f389bf6efb934cc46666aa5a2667;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 6b2cad0e6..c6c520e66 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -24,7 +24,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # Dunning process module @@ -34,8 +35,11 @@ use POSIX qw(strftime); use SL::IS; -use SL::PE; use SL::DN; +use SL::DB::Department; +use SL::DB::Dunning; +use SL::Helper::Flash qw(flash); +use SL::Locale::String qw(t8); use SL::ReportGenerator; require "bin/mozilla/common.pl"; @@ -95,12 +99,8 @@ sub add { $main::auth->assert('dunning_edit'); - # setup customer selection - $form->all_vc(\%myconfig, "customer", "AR"); - DN->get_config(\%myconfig, \%$form); - $form->{SHOW_CUSTOMER_SELECTION} = $form->{all_customer} && scalar @{ $form->{all_customer} }; $form->{SHOW_DUNNING_LEVEL_SELECTION} = $form->{DUNNING} && scalar @{ $form->{DUNNING} }; $form->{SHOW_DEPARTMENT_SELECTION} = $form->{all_departments} && scalar @{ $form->{all_departments} || [] }; @@ -130,7 +130,7 @@ sub show_invoices { if ($row->{next_dunning_config_id}) { map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } }; } - map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount open_amount fee interest); + map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, 2) } qw(amount open_amount fee interest); if ($row->{'language_id'}) { $row->{language} = SL::DB::Manager::Language->find_by_or_create('id' => $row->{'language_id'})->{'description'}; @@ -150,6 +150,7 @@ sub show_invoices { 'no_html' => 1, 'no_opendocument' => 1,); + $::request->layout->add_javascripts("kivi.Dunning.js"); $form->header(); print $form->parse_html_template("dunning/show_invoices"); @@ -302,8 +303,6 @@ sub search { DN->get_config(\%myconfig, \%$form); - $form->{SHOW_CUSTOMER_DDBOX} = scalar @{ $form->{ALL_CUSTOMERS} } <= $myconfig{vclimit}; - $form->{SHOW_DEPARTMENT_DDBOX} = scalar @{ $form->{ALL_CUSTOMERS} }; $form->{SHOW_DUNNING_LEVELS} = scalar @{ $form->{DUNNING} }; $form->{title} = $locale->text('Dunnings'); @@ -450,6 +449,7 @@ sub show_dunning { $report->set_options_from_form(); + $::request->layout->add_javascripts("kivi.Dunning.js"); $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -473,6 +473,29 @@ sub print_dunning { $main::lxdebug->leave_sub(); } +sub delete { + $main::auth->assert('dunning_edit'); + + my @dunning_ids = map { $::form->{"dunning_id_$_"} } grep { $::form->{"selected_$_"} } (1..$::form->{rowcount}); + + if (!scalar @dunning_ids) { + $::form->error($::locale->text('No dunnings have been selected for printing.')); + } + + my $dunnings = SL::DB::Manager::Dunning->get_all(query => [ dunning_id => \@dunning_ids ]); + + SL::DB::Dunning->new->db->with_transaction(sub { + for my $dunning (@$dunnings) { + SL::DB::Manager::Invoice->find_by(id => $dunning->trans_id)->update_attributes(dunning_config_id => undef); + $dunning->delete; + } + }); + + flash('info', t8('#1 dunnings have been deleted', scalar @$dunnings)); + + search(); +} + sub print_multiple { $main::lxdebug->enter_sub(); @@ -526,4 +549,14 @@ sub continue { call_sub($main::form->{nextsub}); } +sub dispatcher { + foreach my $action (qw(delete print_multiple)) { + if ($::form->{"action_${action}"}) { + call_sub($action); + return; + } + } + + $::form->error($::locale->text('No action defined.')); +} # end of main