$::lxdebug->leave_sub;
}
-sub prepare_global_vars {
- my ($self) = @_;
-
- $self->{AUTH} = $::auth;
- $self->{INSTANCE_CONF} = $::instance_conf;
- $self->{LOCALE} = $::locale;
- $self->{LXCONFIG} = $::lx_office_conf;
- $self->{LXDEBUG} = $::lxdebug;
- $self->{MYCONFIG} = \%::myconfig;
-}
-
sub _prepare_html_template {
$main::lxdebug->enter_sub();
my $info = "Web page template '${file}' not found.\n";
$::form->header;
print qq|<pre>$info</pre>|;
- ::end_of_request();
+ $::dispatcher->end_request;
}
$additional_params->{AUTH} = $::auth;
SL::ClientJS->new
->error($error)
->render(SL::Controller::Base->new);
- ::end_of_request();
+ $::dispatcher->end_request;
}
my $add_params = {
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
sub show_generic_information {
$main::lxdebug->leave_sub();
- ::end_of_request();
+ $::dispatcher->end_request;
}
sub _store_redirect_info_in_session {
print $::form->redirect_header($self->{callback});
}
- ::end_of_request();
+ $::dispatcher->end_request;
$main::lxdebug->leave_sub();
}
sales_delivery_order => $main::locale->text('Delivery Order'),
purchase_delivery_order => $main::locale->text('Delivery Order'),
dunning => $main::locale->text('Dunning'),
- letter => $main::locale->text('Letter')
+ letter => $main::locale->text('Letter'),
+ ic_supply => $main::locale->text('Intra-Community supply'),
);
$main::lxdebug->leave_sub();
}
sub set_payment_options {
- my ($self, $myconfig, $transdate) = @_;
+ my ($self, $myconfig, $transdate, $type) = @_;
my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id})->load : undef;
return if !$terms;
+ my $is_invoice = $type =~ m{invoice}i;
+
$transdate ||= $self->{invdate} || $self->{transdate};
my $due_date = $self->{duedate} || $self->{reqdate};
$self->{$_} = $terms->$_ for qw(terms_netto terms_skonto percent_skonto);
- $self->{payment_terms} = $terms->description_long;
$self->{payment_description} = $terms->description;
$self->{netto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'net')->to_kivitendo;
$self->{skonto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'discount')->to_kivitendo;
}
if ($self->{"language_id"}) {
- my $dbh = $self->get_standard_dbh($myconfig);
- my $query =
- qq|SELECT t.translation, l.output_numberformat, l.output_dateformat, l.output_longdates | .
- qq|FROM generic_translations t | .
- qq|LEFT JOIN language l ON t.language_id = l.id | .
- qq|WHERE (t.language_id = ?)
- AND (t.translation_id = ?)
- AND (t.translation_type = 'SL::DB::PaymentTerm/description_long')|;
- my ($description_long, $output_numberformat, $output_dateformat,
- $output_longdates) =
- selectrow_query($self, $dbh, $query,
- $self->{"language_id"}, $self->{"payment_id"});
-
- $self->{payment_terms} = $description_long if ($description_long);
-
- if ($output_dateformat) {
+ my $language = SL::DB::Language->new(id => $self->{language_id})->load;
+
+ $self->{payment_terms} = $type =~ m{invoice}i ? $terms->translated_attribute('description_long_invoice', $language->id) : undef;
+ $self->{payment_terms} ||= $terms->translated_attribute('description_long', $language->id);
+
+ if ($language->output_dateformat) {
foreach my $key (qw(netto_date skonto_date)) {
- $self->{$key} =
- $main::locale->reformat_date($myconfig, $self->{$key},
- $output_dateformat,
- $output_longdates);
+ $self->{$key} = $::locale->reformat_date($myconfig, $self->{$key}, $language->output_dateformat, $language->output_longdates);
}
}
- if ($output_numberformat &&
- ($output_numberformat ne $myconfig->{"numberformat"})) {
- my $saved_numberformat = $myconfig->{"numberformat"};
- $myconfig->{"numberformat"} = $output_numberformat;
- map { $formatted_amounts{$_} = $self->format_amount($myconfig, $amounts{$_}) } keys %amounts;
- $myconfig->{"numberformat"} = $saved_numberformat;
+ if ($language->output_numberformat && ($language->output_numberformat ne $myconfig->{numberformat})) {
+ local $myconfig->{numberformat};
+ $myconfig->{"numberformat"} = $language->output_numberformat;
+ $formatted_amounts{$_} = $self->format_amount($myconfig, $amounts{$_}) for keys %amounts;
}
}
+ $self->{payment_terms} = $self->{payment_terms} || ($is_invoice ? $terms->description_long_invoice : undef) || $terms->description_long;
+
$self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
$self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
$self->{payment_terms} =~ s/<%currency%>/$self->{currency}/g;
my $where;
if ($self->{customernumber} ne "") {
$where = qq|(vc.customernumber ILIKE ?)|;
- push(@values, '%' . $self->{customernumber} . '%');
+ push(@values, like($self->{customernumber}));
} else {
$where = qq|(vc.name ILIKE ?)|;
- push(@values, '%' . $self->{$table} . '%');
+ push(@values, like($self->{$table}));
}
$query =
JOIN $table vc ON (a.${table}_id = vc.id)
WHERE NOT (a.amount = a.paid) AND (vc.name ILIKE ?)
ORDER BY vc.name~;
- push(@values, '%' . $self->{$table} . '%');
+ push(@values, like($self->{$table}));
}
$self->{name_list} = selectall_hashref_query($self, $dbh, $query, @values);
t8("The document has been changed by another user. No mail was sent. Please reopen it in another window and copy the changes to the new window") :
t8("The document has been changed by another user. Please reopen it in another window and copy the changes to the new window")
);
- ::end_of_request();
+ $::dispatcher->end_request;
}
}
$sth = $dbh->prepare($query);
- do_statement($self, $sth, $query, '%' . $module . '%');
+ do_statement($self, $sth, $query, like($module));
$self->{accounts} = "";
while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
ORDER BY c.accno|;
$sth = $dbh->prepare($query);
- do_statement($self, $sth, $query, "%$module%");
+ do_statement($self, $sth, $query, like($module));
$self->{accounts} = "";
while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
return $thisdate;
}
-sub like {
- my ($self, $string) = @_;
-
- return "%" . SL::Util::trim($string // '') . "%";
-}
-
sub redo_rows {
$main::lxdebug->enter_sub();