projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Überreste von CT_tax entfernt
[kivitendo-erp.git]
/
SL
/
AM.pm
diff --git
a/SL/AM.pm
b/SL/AM.pm
index
ab983b7
..
f6c93ad
100644
(file)
--- a/
SL/AM.pm
+++ b/
SL/AM.pm
@@
-210,7
+210,7
@@
sub save_account {
# sanity check, can't have AR with AR_...
if ($form->{AR} || $form->{AP} || $form->{IC}) {
map { delete $form->{$_} }
# sanity check, can't have AR with AR_...
if ($form->{AR} || $form->{AP} || $form->{IC}) {
map { delete $form->{$_} }
- qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice
CT_tax
);
+ qw(AR_amount AR_tax AR_paid AP_amount AP_tax AP_paid IC_sale IC_cogs IC_taxpart IC_income IC_expense IC_taxservice);
}
$form->{link} = "";
}
$form->{link} = "";
@@
-221,7
+221,7
@@
sub save_account {
$form->{IC}, $form->{IC_sale},
$form->{IC_cogs}, $form->{IC_taxpart},
$form->{IC_income}, $form->{IC_expense},
$form->{IC}, $form->{IC_sale},
$form->{IC_cogs}, $form->{IC_taxpart},
$form->{IC_income}, $form->{IC_expense},
- $form->{IC_taxservice}
, $form->{CT_tax}
+ $form->{IC_taxservice}
) {
$form->{link} .= "${item}:" if ($item);
}
) {
$form->{link} .= "${item}:" if ($item);
}
@@
-965,7
+965,9
@@
sub prepare_template_filename {
}
$filename .= "." . ($form->{format} eq "html" ? "html" : "tex");
}
$filename .= "." . ($form->{format} eq "html" ? "html" : "tex");
- $filename =~ s|.*/||;
+ if ($form->{"formname"} =~ m|\.\.| || $form->{"formname"} =~ m|^/|) {
+ $filename =~ s|.*/||;
+ }
$display_filename = $filename;
$filename = "$myconfig->{templates}/$filename";
}
$display_filename = $filename;
$filename = "$myconfig->{templates}/$filename";
}
@@
-1009,7
+1011,7
@@
sub save_template {
my $error = "";
my $error = "";
- if (open(TEMPLATE, ">
$filename"
)) {
+ if (open(TEMPLATE, ">
", $filename
)) {
$content = Encode::encode('utf-8-strict', $content) if $::locale->is_utf8;
$content =~ s/\r\n/\n/g;
print(TEMPLATE $content);
$content = Encode::encode('utf-8-strict', $content) if $::locale->is_utf8;
$content =~ s/\r\n/\n/g;
print(TEMPLATE $content);
@@
-1077,7
+1079,7
@@
sub save_defaults {
$form->{sdonumber}, $form->{pdonumber},
$currency,
$form->{businessnumber}, $form->{weightunit},
$form->{sdonumber}, $form->{pdonumber},
$currency,
$form->{businessnumber}, $form->{weightunit},
-
$form->{language_id}
);
+
conv_i($form->{language_id})
);
do_query($form, $dbh, $query, @values);
$dbh->commit();
do_query($form, $dbh, $query, @values);
$dbh->commit();
@@
-1333,6
+1335,7
@@
sub retrieve_units {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form, $prefix) = @_;
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form, $prefix) = @_;
+ $prefix ||= '';
my $dbh = $form->get_standard_dbh;
my $dbh = $form->get_standard_dbh;
@@
-1386,13
+1389,13
@@
sub retrieve_all_units {
my $self = shift;
my $self = shift;
- if (!$
main::all_units
) {
- $
main::all_units
= $self->retrieve_units(\%main::myconfig, $main::form);
+ if (!$
::request->{cache}{all_units}
) {
+ $
::request->{cache}{all_units}
= $self->retrieve_units(\%main::myconfig, $main::form);
}
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
- return $
main::all_units
;
+ return $
::request->{cache}{all_units}
;
}
}