projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auftragsimport: Artikel auch nach Beschreibung suchen können.
[kivitendo-erp.git]
/
SL
/
BackgroundJob
/
CreatePeriodicInvoices.pm
diff --git
a/SL/BackgroundJob/CreatePeriodicInvoices.pm
b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index
1abe8c3
..
ce89577
100644
(file)
--- a/
SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/
SL/BackgroundJob/CreatePeriodicInvoices.pm
@@
-105,29
+105,41
@@
sub _generate_time_period_variables {
}
sub _replace_vars {
}
sub _replace_vars {
- my
$object = shift
;
- my $
vars = shift
;
- my $s
ub = shift
;
- my $s
tr = $object->$sub
;
+ my
(%params) = @_
;
+ my $
sub = $params{attribute}
;
+ my $s
tr = $params{object}->$sub
;
+ my $s
ub_fmt = lc($params{attribute_format} // 'text')
;
- $str =~ s{ <\% ([a-z0-9_]+) ( \s+ format \s*=\s* (.*?) \s* )? \%>}{
+ my ($start_tag, $end_tag) = $sub_fmt eq 'html' ? ('<%', '%>') : ('<%', '%>');
+
+ $str =~ s{ ${start_tag} ([a-z0-9_]+) ( \s+ format \s*=\s* (.*?) \s* )? ${end_tag} }{
my ($key, $format) = ($1, $3);
my ($key, $format) = ($1, $3);
- if (!$vars->{$key}) {
- '';
+ $key = $::locale->unquote_special_chars('html', $key) if $sub_fmt eq 'html';
+ my $new_value;
+
+ if (!$params{vars}->{$key}) {
+ $new_value = '';
} elsif ($format) {
} elsif ($format) {
- DateTime::Format::Strptime->new(
+ $format = $::locale->unquote_special_chars('html', $format) if $sub_fmt eq 'html';
+
+ $new_value = DateTime::Format::Strptime->new(
pattern => $format,
locale => 'de_DE',
time_zone => 'local',
pattern => $format,
locale => 'de_DE',
time_zone => 'local',
- )->format_datetime($
vars
->{$key}->[0]);
+ )->format_datetime($
params{vars}
->{$key}->[0]);
} else {
} else {
- $
vars->{$1}->[1]->($vars
->{$1}->[0]);
+ $
new_value = $params{vars}->{$1}->[1]->($params{vars}
->{$1}->[0]);
}
}
+
+ $new_value = $::locale->quote_special_chars('html', $new_value) if $sub_fmt eq 'html';
+
+ $new_value;
+
}eigx;
}eigx;
- $
object
->$sub($str);
+ $
params{object}
->$sub($str);
}
sub _create_periodic_invoice {
}
sub _create_periodic_invoice {
@@
-154,10
+166,10
@@
sub _create_periodic_invoice {
employee => $order->employee, # new_from sets employee to import user
);
employee => $order->employee, # new_from sets employee to import user
);
- _replace_vars(
$invoice, $time_period_vars,
$_) for qw(notes intnotes transaction_description);
+ _replace_vars(
object => $invoice, vars => $time_period_vars, attribute =>
$_) for qw(notes intnotes transaction_description);
foreach my $item (@{ $invoice->items }) {
foreach my $item (@{ $invoice->items }) {
- _replace_vars(
$item, $time_period_vars, $_
) for qw(description longdescription);
+ _replace_vars(
object => $item, vars => $time_period_vars, attribute => $_, attribute_format => ($_ eq 'longdescription' ? 'html' : 'text')
) for qw(description longdescription);
}
$invoice->post(ar_id => $config->ar_chart_id) || die;
}
$invoice->post(ar_id => $config->ar_chart_id) || die;