projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2714604
)
SL::Form->prepare_for_printing: Variablen aus %::myconfig sowie output_*format zur...
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Mon, 17 Feb 2014 13:16:01 +0000
(14:16 +0100)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Mon, 24 Feb 2014 13:40:01 +0000
(14:40 +0100)
SL/Form.pm
patch
|
blob
|
history
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
2181724
..
0c532ce
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-3326,6
+3326,13
@@
sub prepare_for_printing {
# compatibility.
$self->{$_} = $defaults->$_ for qw(company address taxnumber co_ustid duns sepa_creditor_id);
# compatibility.
$self->{$_} = $defaults->$_ for qw(company address taxnumber co_ustid duns sepa_creditor_id);
+ $self->{"myconfig_${_}"} = $::myconfig{$_} for grep { $_ ne 'dbpasswd' } keys %::myconfig;
+
+ if (!$self->{employee_id}) {
+ $self->{"employee_${_}"} = $::myconfig{$_} for qw(email tel fax name signature);
+ $self->{"employee_${_}"} = $defaults->$_ for qw(address businessnumber co_ustid company duns sepa_creditor_id taxnumber);
+ }
+
# set shipto from billto unless set
my $has_shipto = any { $self->{"shipto$_"} } qw(name street zipcode city country contact);
if (!$has_shipto && ($self->{type} =~ m/^(?:purchase_order|request_quotation)$/)) {
# set shipto from billto unless set
my $has_shipto = any { $self->{"shipto$_"} } qw(name street zipcode city country contact);
if (!$has_shipto && ($self->{type} =~ m/^(?:purchase_order|request_quotation)$/)) {
@@
-3344,6
+3351,10
@@
sub prepare_for_printing {
$output_longdates = 1;
}
$output_longdates = 1;
}
+ $self->{myconfig_output_dateformat} = $output_dateformat;
+ $self->{myconfig_output_longdates} = $output_longdates;
+ $self->{myconfig_output_numberformat} = $output_numberformat;
+
# Retrieve accounts for tax calculation.
IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});
# Retrieve accounts for tax calculation.
IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});