@where
],
);
-
# credit notes have a negative amount, treat differently
my $all_open_ar_invoices = SL::DB::Manager::Invoice ->get_all(where => [ or => [ amount => { gt => \'paid' },
and => [ type => 'credit_note',
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
$open_invoice->{skonto_type} = 'without_skonto';
foreach ( @{$all_open_sepa_export_items}) {
- if ( $_->ap_id == $open_invoice->id || $_->ar_id == $open_invoice->id ) {
+ if (($_->ap_id && $_->ap_id == $open_invoice->id) || ($_->ar_id && $_->ar_id == $open_invoice->id)) {
my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1);
#$main::lxdebug->message(LXDebug->DEBUG2(),"sepa_exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);
$open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
- push @{$open_invoice->{sepa_export_item}}, $_;
$open_invoice->{skonto_type} = $_->payment_type;
$sepa_exports{$_->sepa_export_id} ||= { count => 0, is_ar => 0, amount => 0, proposed => 0, invoices => [], item => $_ };
$sepa_exports{$_->sepa_export_id}->{count}++;
: abs(@{ $_->{proposals} }[0]->amount + $_->amount) < 0.01)
} @{ $bank_transactions };
- push @proposals, @otherproposals;
+ push @proposals, @otherproposals;
# sort bank transaction proposals by quality (score) of proposal
- $bank_transactions = [ sort { $a->{agreement} <=> $b->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 1;
- $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 0;
+ if ($::form->{sort_by} && $::form->{sort_by} eq 'proposal') {
+ if ($::form->{sort_dir}) {
+ $bank_transactions = [ sort { $a->{agreement} <=> $b->{agreement} } @{ $bank_transactions } ];
+ } else {
+ $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ];
+ }
+ }
# for testing with t/bank/banktransaction.t :
if ( $::form->{dont_render_for_test} ) {
my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(iban => $self->transaction->{remote_account_number});
my $use_vendor_filter = $self->transaction->{remote_account_number} && $vendor_of_transaction;
- my $templates = SL::DB::Manager::RecordTemplate->get_all(
+ my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
where => [ template_type => 'ap_transaction' ],
with_objects => [ qw(employee vendor) ],
);
+ my $templates_gl = SL::DB::Manager::RecordTemplate->get_all(
+ query => [ template_type => 'gl_transaction',
+ chart_id => SL::DB::Manager::BankAccount->find_by(id => $self->transaction->local_bank_account_id)->chart_id,
+ ],
+ with_objects => [ qw(employee record_template_items) ],
+ );
- #Filter templates
- $templates = [ grep { $_->vendor_id == $vendor_of_transaction->id } @{ $templates } ] if $use_vendor_filter;
+ # pre filter templates_ap, if we have a vendor match (IBAN eq IBAN) - show and allow user to edit this via gui!
+ $templates_ap = [ grep { $_->vendor_id == $vendor_of_transaction->id } @{ $templates_ap } ] if $use_vendor_filter;
$self->callback($self->url_for(
action => 'list',
$self->render(
'bank_transactions/create_invoice',
{ layout => 0 },
- title => t8('Create invoice'),
- TEMPLATES => $templates,
- vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
+ title => t8('Create invoice'),
+ TEMPLATES_GL => $use_vendor_filter && @{ $templates_ap } ? undef : $templates_gl,
+ TEMPLATES_AP => $templates_ap,
+ vendor_name => $use_vendor_filter && @{ $templates_ap } ? $vendor_of_transaction->name : undef,
);
}
my ($self) = @_;
$self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
- my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
- my @filter;
- push @filter, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};
+ my (@filter, @filter_ap);
+
+ # filter => gl and ap | filter_ap = ap (i.e. vendorname)
+ push @filter, ('template_name' => { ilike => '%' . $::form->{template} . '%' }) if $::form->{template};
+ push @filter, ('reference' => { ilike => '%' . $::form->{reference} . '%' }) if $::form->{reference};
+ push @filter_ap, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};
+ push @filter_ap, @filter;
+ my $templates_gl = SL::DB::Manager::RecordTemplate->get_all(
+ query => [ template_type => 'gl_transaction',
+ chart_id => SL::DB::Manager::BankAccount->find_by(id => $self->transaction->local_bank_account_id)->chart_id,
+ (and => \@filter) x !!@filter
+ ],
+ with_objects => [ qw(employee record_template_items) ],
+ );
- my $templates = SL::DB::Manager::RecordTemplate->get_all(
- where => [ template_type => 'ap_transaction', (or => \@filter) x !!@filter ],
+ my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
+ where => [ template_type => 'ap_transaction', (and => \@filter_ap) x !!@filter_ap ],
with_objects => [ qw(employee vendor) ],
);
-
$::form->{filter} //= {};
$self->callback($self->url_for(
my $output = $self->render(
'bank_transactions/_template_list',
{ output => 0 },
- TEMPLATES => $templates,
+ TEMPLATES_AP => $templates_ap,
+ TEMPLATES_GL => $templates_gl,
);
$self->render(\to_json({ html => $output }), { type => 'json', process => 0 });
# so $amount_of_transaction is negative but needs positive
$amount_of_transaction *= -1;
- } elsif (!$invoice->is_sales && $invoice->invoice_type eq 'ap_transaction' ) {
+ } elsif (!$invoice->is_sales && $invoice->invoice_type =~ m/ap_transaction|purchase_invoice/) {
# $invoice->open_amount may be negative for ap_transaction but may be positiv for negativ ap_transaction
# if $invoice->open_amount is negative $bank_transaction->amount is positve
# if $invoice->open_amount is positive $bank_transaction->amount is negative
);
}
+sub load_gl_record_template_url {
+ my ($self, $template) = @_;
+
+ return $self->url_for(
+ controller => 'gl.pl',
+ action => 'load_record_template',
+ id => $template->id,
+ 'form_defaults.amount_1' => abs($self->transaction->amount), # always positive
+ 'form_defaults.transdate' => $self->transaction->transdate_as_date,
+ 'form_defaults.callback' => $self->callback,
+ );
+}
+
sub setup_search_action_bar {
my ($self, %params) = @_;
projects / kivitendo-erp.git / blobdiff