projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Anpassungen an neues SL::File::Object Interface"
[kivitendo-erp.git]
/
SL
/
AP.pm
diff --git
a/SL/AP.pm
b/SL/AP.pm
index
4145251
..
2d232a2
100644
(file)
--- a/
SL/AP.pm
+++ b/
SL/AP.pm
@@
-40,6
+40,7
@@
use SL::DBUtils;
use SL::IO;
use SL::MoreCommon;
use SL::DB::Default;
use SL::IO;
use SL::MoreCommon;
use SL::DB::Default;
+use SL::DB::Draft;
use SL::Util qw(trim);
use SL::DB;
use Data::Dumper;
use SL::Util qw(trim);
use SL::DB;
use Data::Dumper;
@@
-361,6
+362,10
@@
sub _post_transaction {
IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
+ if ($form->{draft_id}) {
+ SL::DB::Manager::Draft->delete_all(where => [ id => delete($form->{draft_id}) ]);
+ }
+
# safety check datev export
if ($::instance_conf->get_datev_check_on_ap_transaction) {
my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
# safety check datev export
if ($::instance_conf->get_datev_check_on_ap_transaction) {
my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
@@
-439,10
+444,7
@@
sub ap_transactions {
my @values;
my @values;
- if ($form->{vendor_id}) {
- $where .= " AND a.vendor_id = ?";
- push(@values, $form->{vendor_id});
- } elsif ($form->{vendor}) {
+ if ($form->{vendor}) {
$where .= " AND v.name ILIKE ?";
push(@values, like($form->{vendor}));
}
$where .= " AND v.name ILIKE ?";
push(@values, like($form->{vendor}));
}