X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/3ca78c165eb22113110ab1f1cc716ac7e18cdbdc..6a3494478a287c2820e3f68a09bef700af1f57e0:/SL/IS.pm diff --git a/SL/IS.pm b/SL/IS.pm index 30570c059..7bc724b90 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -1274,8 +1274,6 @@ SQL exporttype => DATEV_ET_BUCHUNGEN, format => DATEV_FORMAT_KNE, dbh => $dbh, - from => $transdate, - to => $transdate, trans_id => $form->{id}, ); @@ -1316,7 +1314,6 @@ sub transfer_out { $form->{"id_$i"}, $form->{"qty_$i"}, $form->{"unit_$i"}); - next if ($err eq 'ignore service'); if (!@{ $err } && $wh_id && $bin_id) { push @transfers, { 'parts_id' => $form->{"id_$i"}, @@ -1353,7 +1350,7 @@ sub _determine_wh_and_bin { # ignore service if they are not configured to be transfered if ($part->is_service && !$conf->get_transfer_default_services) { $::lxdebug->leave_sub(2); - return 'ignore service'; + return (\@errors); } # test negative qty @@ -1377,14 +1374,14 @@ sub _determine_wh_and_bin { parts_id => $part->id, bin_id => $bin_id); if ($error == 1) { - push @errors, $::locale->text("Part \"#1\" has chargenumber or best before date set. So it cannot be transfered automaticaly.", + push @errors, $::locale->text('Part "#1" has chargenumber or best before date set. So it cannot be transfered automaticaly.', $part->description); } my $form_unit_obj = SL::DB::Unit->new(name => $unit)->load; my $part_unit_qty = $form_unit_obj->convert_to($qty, $part->unit_obj); my $diff_qty = $max_qty - $part_unit_qty; if (!@errors && $diff_qty < 0) { - push @errors, $::locale->text("For part \"#1\" there are missing #2 #3 in the default warehouse/bin \"#4/#5\"", + push @errors, $::locale->text('For part "#1" there are missing #2 #3 in the default warehouse/bin "#4/#5".', $part->description, $::form->format_amount(\%::myconfig, -1*$diff_qty), $part->unit_obj->name, @@ -1392,7 +1389,7 @@ sub _determine_wh_and_bin { SL::DB::Bin->new( id => $bin_id)->load->description); } } else { - push @errors, $::locale->text("For part \"#1\" there is no default warehouse and bin defined.", + push @errors, $::locale->text('For part "#1" there is no default warehouse and bin defined.', $part->description); } @@ -1403,7 +1400,7 @@ sub _determine_wh_and_bin { if ($wh_id && $bin_id) { @errors = (); } else { - push @errors, $::locale->text("For part \"#1\" there is no default warehouse and bin for ignoring onhand defined.", + push @errors, $::locale->text('For part "#1" there is no default warehouse and bin for ignoring onhand defined.', $part->description); } }