X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=69db0053fe41befdedb6d5520459b94e60e4eae7;hb=723a11583380d2cef883c12f654d6a35bffee83b;hp=8191c5c19857048a7d9322afc71a5f81ba0a200f;hpb=64a301e55d72df9005e35647a2f166d978c1d8de;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index 8191c5c19..69db0053f 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -292,6 +292,10 @@ sub save_dunning { $main::lxdebug->enter_sub(); my $rc = SL::DB->client->with_transaction(\&_save_dunning, $self, $myconfig, $form, $rows); + + if (!$rc) { + die SL::DB->client->error + } $::lxdebug->leave_sub; return $rc; @@ -471,11 +475,11 @@ sub set_template_options { # prepare meta information for template introspection $form->{template_meta} = { formname => $form->{formname}, - language => SL::DB::Manager::Language->find_by_or_create(id => $form->{language_id}), + language => SL::DB::Manager::Language->find_by_or_create(id => $form->{language_id} || undef), format => $form->{format}, media => $form->{media}, extension => $extension, - printer => SL::DB::Manager::Printer->find_by_or_create(id => $form->{printer_id}), + printer => SL::DB::Manager::Printer->find_by_or_create(id => $form->{printer_id} || undef), today => DateTime->today, }; @@ -799,7 +803,8 @@ sub print_dunning { ar.transdate, ar.duedate, ar.customer_id, ar.invnumber, ar.ordnumber, ar.cp_id, ar.amount, ar.netamount, ar.paid, - (SELECT cu.name FROM currencies cu WHERE cu.id=ar.currency_id) AS curr, + (SELECT cu.name FROM currencies cu WHERE cu.id = ar.currency_id) AS curr, + (SELECT description from department WHERE id = ar.department_id) AS department, ar.amount - ar.paid AS open_amount, ar.amount - ar.paid + da.fee + da.interest AS linetotal