projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Preise incl/excl
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
5fcd09e
..
0ec6b8a
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-36,6
+36,9
@@
#======================================================================
package Form;
#======================================================================
package Form;
+
+#use strict;
+
use Data::Dumper;
use CGI;
use Data::Dumper;
use CGI;
@@
-57,7
+60,7
@@
use List::Util qw(first max min sum);
my $standard_dbh;
my $standard_dbh;
-
sub DESTROY
{
+
END
{
if ($standard_dbh) {
$standard_dbh->disconnect();
undef $standard_dbh;
if ($standard_dbh) {
$standard_dbh->disconnect();
undef $standard_dbh;
@@
-222,7
+225,7
@@
sub new {
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
- $self->{version} = "2.
4.3
";
+ $self->{version} = "2.
6.0 beta 1
";
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
@@
-533,7
+536,7
@@
sub header {
return;
}
return;
}
- my ($stylesheet, $favicon);
+ my ($stylesheet, $favicon
, $pagelayout
);
if ($ENV{HTTP_USER_AGENT}) {
my $doctype;
if ($ENV{HTTP_USER_AGENT}) {
my $doctype;
@@
-591,7
+594,7
@@
sub header {
? "$self->{title} - $self->{titlebar}"
: $self->{titlebar};
my $ajax = "";
? "$self->{title} - $self->{titlebar}"
: $self->{titlebar};
my $ajax = "";
- foreach $item (@ { $self->{AJAX} }) {
+ foreach
my
$item (@ { $self->{AJAX} }) {
$ajax .= $item->show_javascript();
}
$ajax .= $item->show_javascript();
}
@@
-609,7
+612,7
@@
sub header {
<script type="text/javascript">
<!--
<script type="text/javascript">
<!--
- function fo
k
us() {
+ function fo
c
us() {
$fokus
}
//-->
$fokus
}
//-->
@@
-617,15
+620,15
@@
sub header {
<meta name="robots" content="noindex,nofollow" />
<script type="text/javascript" src="js/highlight_input.js"></script>
<meta name="robots" content="noindex,nofollow" />
<script type="text/javascript" src="js/highlight_input.js"></script>
- <link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
+ <link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
<script type="text/javascript" src="js/tabcontent.js">
/***********************************************
<script type="text/javascript" src="js/tabcontent.js">
/***********************************************
-
* Tab Content script-
Dynamic Drive DHTML code library (www.dynamicdrive.com)
- * This notice MUST stay intact for legal use
- * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
- ***********************************************/
+
* Tab Content script v2.2- ©
Dynamic Drive DHTML code library (www.dynamicdrive.com)
+
* This notice MUST stay intact for legal use
+
* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
+
***********************************************/
</script>
</script>
@@
-771,6
+774,8
@@
sub parse_html_template {
}
sub show_generic_error {
}
sub show_generic_error {
+ $main::lxdebug->enter_sub();
+
my ($self, $error, %params) = @_;
my $add_params = {
my ($self, $error, %params) = @_;
my $add_params = {
@@
-792,15
+797,19
@@
sub show_generic_error {
$add_params->{SHOW_BACK_BUTTON} = 1;
}
$add_params->{SHOW_BACK_BUTTON} = 1;
}
- $self->{title} = $
title if ($title)
;
+ $self->{title} = $
params{title} if $params{title}
;
$self->header();
print $self->parse_html_template("generic/error", $add_params);
$self->header();
print $self->parse_html_template("generic/error", $add_params);
+ $main::lxdebug->leave_sub();
+
die("Error: $error\n");
}
sub show_generic_information {
die("Error: $error\n");
}
sub show_generic_information {
+ $main::lxdebug->enter_sub();
+
my ($self, $text, $title) = @_;
my $add_params = {
my ($self, $text, $title) = @_;
my $add_params = {
@@
-813,7
+822,9
@@
sub show_generic_information {
$self->header();
print $self->parse_html_template("generic/information", $add_params);
$self->header();
print $self->parse_html_template("generic/information", $add_params);
- die("Information: $error\n");
+ $main::lxdebug->leave_sub();
+
+ die("Information: $text\n");
}
# write Trigger JavaScript-Code ($qty = quantity of Triggers)
}
# write Trigger JavaScript-Code ($qty = quantity of Triggers)
@@
-836,8
+847,8
@@
sub write_trigger {
"yyyy-mm-dd" => "%Y-%m-%d",
);
"yyyy-mm-dd" => "%Y-%m-%d",
);
- my $ifFormat = defined($dateformats{$myconfig{"dateformat"}}) ?
- $dateformats{$myconfig{"dateformat"}} : "%d.%m.%Y";
+ my $ifFormat = defined($dateformats{$myconfig
->
{"dateformat"}}) ?
+ $dateformats{$myconfig
->
{"dateformat"}} : "%d.%m.%Y";
my @triggers;
while ($#_ >= 2) {
my @triggers;
while ($#_ >= 2) {
@@
-870,7
+881,7
@@
sub redirect {
if ($self->{callback}) {
if ($self->{callback}) {
- ($script, $argv) = split(/\?/, $self->{callback}, 2);
+
my
($script, $argv) = split(/\?/, $self->{callback}, 2);
$script =~ s|.*/||;
$script =~ s|[^a-zA-Z0-9_\.]||g;
exec("perl", "$script", $argv);
$script =~ s|.*/||;
$script =~ s|[^a-zA-Z0-9_\.]||g;
exec("perl", "$script", $argv);
@@
-980,6
+991,7
@@
sub format_amount_units {
$amount *= $conv_unit->{factor};
my @values;
$amount *= $conv_unit->{factor};
my @values;
+ my $num;
foreach my $unit (@$conv_units) {
my $last = $unit->{name} eq $part_unit->{name};
foreach my $unit (@$conv_units) {
my $last = $unit->{name} eq $part_unit->{name};
@@
-1107,13
+1119,11
@@
sub parse_template {
# Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
$self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
# Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
$self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
- map({ $self->{"employee_${_}"} = $myconfig->{$_}; }
- qw(email tel fax name signature company address businessnumber
- co_ustid taxnumber duns));
+ if (!$self->{employee_id}) {
+ map { $self->{"employee_${_}"} = $myconfig->{$_}; } qw(email tel fax name signature company address businessnumber co_ustid taxnumber duns);
+ }
- map({ $self->{"${_}"} = $myconfig->{$_}; }
- qw(co_ustid));
-
+ map { $self->{"${_}"} = $myconfig->{$_}; } qw(co_ustid);
$self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
$self->{copies} = 1 if (($self->{copies} *= 1) <= 0);
@@
-1308,14
+1318,19
@@
sub generate_attachment_filename {
my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
my $prefix = $self->get_number_prefix_for_type();
my $attachment_filename = $main::locale->unquote_special_chars('HTML', $self->get_formname_translation());
my $prefix = $self->get_number_prefix_for_type();
- if ($attachment_filename && $self->{"${prefix}number"}) {
+ if ($self->{preview} && (first { $self->{type} eq $_ } qw(invoice credit_note))) {
+ $attachment_filename .= ' (' . $main::locale->text('Preview') . ')' . $self->get_extension_for_format();
+
+ } elsif ($attachment_filename && $self->{"${prefix}number"}) {
$attachment_filename .= "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
$attachment_filename .= "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
- $attachment_filename = $main::locale->quote_special_chars('filenames', $attachment_filename);
- $attachment_filename =~ s|[\s/\\]+|_|g;
+
} else {
$attachment_filename = "";
}
} else {
$attachment_filename = "";
}
+ $attachment_filename = $main::locale->quote_special_chars('filenames', $attachment_filename);
+ $attachment_filename =~ s|[\s/\\]+|_|g;
+
return $attachment_filename;
}
return $attachment_filename;
}
@@
-1365,6
+1380,7
@@
sub datetonum {
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
$main::lxdebug->enter_sub();
my ($self, $date, $myconfig) = @_;
+ my ($yy, $mm, $dd);
if ($date && $date =~ /\D/) {
if ($date && $date =~ /\D/) {
@@
-1423,7
+1439,7
@@
sub dbconnect_noauto {
my ($self, $myconfig) = @_;
# connect to database
my ($self, $myconfig) = @_;
# connect to database
- $dbh =
+
my
$dbh =
DBI->connect($myconfig->{dbconnect}, $myconfig->{dbuser},
$myconfig->{dbpasswd}, { AutoCommit => 0 })
or $self->dberror;
DBI->connect($myconfig->{dbconnect}, $myconfig->{dbuser},
$myconfig->{dbpasswd}, { AutoCommit => 0 })
or $self->dberror;
@@
-1883,28
+1899,31
@@
sub get_employee {
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
-sub get_
salesman
{
+sub get_
employee_data
{
$main::lxdebug->enter_sub();
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $salesman_id) = @_;
+ my $self = shift;
+ my %params = @_;
+
+ Common::check_params(\%params, qw(prefix));
+ Common::check_params_x(\%params, qw(id));
- $main::lxdebug->leave_sub() and return unless $salesman_id;
+ if (!$params{id}) {
+ $main::lxdebug->leave_sub();
+ return;
+ }
- my $dbh = $self->get_standard_dbh($myconfig);
+ my $myconfig = \%main::myconfig;
+ my $dbh = $params{dbh} || $self->get_standard_dbh($myconfig);
- my ($login) =
- selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|,
- $salesman_id);
+ my ($login) = selectrow_query($self, $dbh, qq|SELECT login FROM employee WHERE id = ?|, conv_i($params{id}));
if ($login) {
if ($login) {
- my $user = new User($main::memberfile, $login);
- map({ $self->{"salesman_$_"} = $user->{$_}; }
- qw(address businessnumber co_ustid company duns email fax name
- taxnumber tel));
- $self->{salesman_login} = $login;
+ my $user = User->new($login);
+ map { $self->{$params{prefix} . "_${_}"} = $user->{$_}; } qw(address businessnumber co_ustid company duns email fax name signature taxnumber tel);
- $self->{
salesman_name} = $login
-
if ($self->{salesman_name} eq "")
;
+ $self->{
$params{prefix} . '_login'} = $login;
+
$self->{$params{prefix} . '_name'} ||= $login
;
}
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
@@
-2034,6
+2053,7
@@
sub _get_charts {
$main::lxdebug->enter_sub();
my ($self, $dbh, $params) = @_;
$main::lxdebug->enter_sub();
my ($self, $dbh, $params) = @_;
+ my ($key);
$key = $params->{key};
$key = "all_charts" unless ($key);
$key = $params->{key};
$key = "all_charts" unless ($key);
@@
-2057,11
+2077,27
@@
sub _get_charts {
sub _get_taxcharts {
$main::lxdebug->enter_sub();
sub _get_taxcharts {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $key) = @_;
+ my ($self, $dbh, $params) = @_;
+
+ my $key = "all_taxcharts";
+ my @where;
+
+ if (ref $params eq 'HASH') {
+ $key = $params->{key} if ($params->{key});
+ if ($params->{module} eq 'AR') {
+ push @where, 'taxkey NOT IN (8, 9, 18, 19)';
- $key = "all_taxcharts" unless ($key);
+ } elsif ($params->{module} eq 'AP') {
+ push @where, 'taxkey NOT IN (1, 2, 3, 12, 13)';
+ }
+
+ } elsif ($params) {
+ $key = $params;
+ }
- my $query = qq|SELECT * FROM tax ORDER BY taxkey|;
+ my $where = ' WHERE ' . join(' AND ', map { "($_)" } @where) if (@where);
+
+ my $query = qq|SELECT * FROM tax $where ORDER BY taxkey|;
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
@@
-2167,7
+2203,7
@@
sub _get_customers {
my ($self, $dbh, $key, $limit) = @_;
$key = "all_customers" unless ($key);
my ($self, $dbh, $key, $limit) = @_;
$key = "all_customers" unless ($key);
- $limit_clause = "LIMIT $limit" if $limit;
+
my
$limit_clause = "LIMIT $limit" if $limit;
my $query = qq|SELECT * FROM customer WHERE NOT obsolete ORDER BY name $limit_clause|;
my $query = qq|SELECT * FROM customer WHERE NOT obsolete ORDER BY name $limit_clause|;
@@
-2257,19
+2293,19
@@
sub _get_simple {
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}
-sub _get_groups {
- $main::lxdebug->enter_sub();
-
- my ($self, $dbh, $key) = @_;
-
- $key ||= "all_groups";
-
- my $groups = $main::auth->read_groups();
-
- $self->{$key} = selectall_hashref_query($self, $dbh, $query);
-
- $main::lxdebug->leave_sub();
-}
+
#
sub _get_groups {
+
#
$main::lxdebug->enter_sub();
+#
+
#
my ($self, $dbh, $key) = @_;
+#
+
#
$key ||= "all_groups";
+#
+
#
my $groups = $main::auth->read_groups();
+#
+
#
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
+#
+
#
$main::lxdebug->leave_sub();
+
#
}
sub get_lists {
$main::lxdebug->enter_sub();
sub get_lists {
$main::lxdebug->enter_sub();
@@
-2369,9
+2405,10
@@
sub get_lists {
$self->_get_warehouses($dbh, $params{warehouses});
}
$self->_get_warehouses($dbh, $params{warehouses});
}
- if ($params{groups}) {
- $self->_get_groups($dbh, $params{groups});
- }
+# if ($params{groups}) {
+# $self->_get_groups($dbh, $params{groups});
+# }
+
if ($params{partsgroup}) {
$self->get_partsgroup(\%main::myconfig, { all => 1, target => $params{partsgroup} });
}
if ($params{partsgroup}) {
$self->get_partsgroup(\%main::myconfig, { all => 1, target => $params{partsgroup} });
}
@@
-2610,7
+2647,7
@@
sub create_links {
do_statement($self, $sth, $query, '%' . $module . '%');
$self->{accounts} = "";
do_statement($self, $sth, $query, '%' . $module . '%');
$self->{accounts} = "";
- while ($ref = $sth->fetchrow_hashref(
NAME_lc
)) {
+ while ($ref = $sth->fetchrow_hashref(
"NAME_lc"
)) {
foreach my $key (split(/:/, $ref->{link})) {
if ($key =~ /\Q$module\E/) {
foreach my $key (split(/:/, $ref->{link})) {
if ($key =~ /\Q$module\E/) {
@@
-2657,7
+2694,7
@@
sub create_links {
WHERE a.id = ?|;
$ref = selectfirst_hashref_query($self, $dbh, $query, $self->{id});
WHERE a.id = ?|;
$ref = selectfirst_hashref_query($self, $dbh, $query, $self->{id});
- foreach $key (keys %$ref) {
+ foreach
my
$key (keys %$ref) {
$self->{$key} = $ref->{$key};
}
$self->{$key} = $ref->{$key};
}
@@
-2679,7
+2716,7
@@
sub create_links {
do_statement($self, $sth, $query, "%$module%");
$self->{accounts} = "";
do_statement($self, $sth, $query, "%$module%");
$self->{accounts} = "";
- while ($ref = $sth->fetchrow_hashref(
NAME_lc
)) {
+ while ($ref = $sth->fetchrow_hashref(
"NAME_lc"
)) {
foreach my $key (split(/:/, $ref->{link})) {
if ($key =~ /\Q$module\E/) {
foreach my $key (split(/:/, $ref->{link})) {
if ($key =~ /\Q$module\E/) {
@@
-2729,7
+2766,7
@@
sub create_links {
my $index = 0;
# store amounts in {acc_trans}{$key} for multiple accounts
my $index = 0;
# store amounts in {acc_trans}{$key} for multiple accounts
- while (my $ref = $sth->fetchrow_hashref(
NAME_lc
)) {
+ while (my $ref = $sth->fetchrow_hashref(
"NAME_lc"
)) {
$ref->{exchangerate} =
$self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate}, $fld);
if (!($xkeyref{ $ref->{accno} } =~ /tax/)) {
$ref->{exchangerate} =
$self->get_exchangerate($dbh, $self->{currency}, $ref->{transdate}, $fld);
if (!($xkeyref{ $ref->{accno} } =~ /tax/)) {
@@
-2895,7
+2932,7
@@
sub redo_rows {
# fill rows
foreach my $item (sort { $a->{num} <=> $b->{num} } @ndx) {
$i++;
# fill rows
foreach my $item (sort { $a->{num} <=> $b->{num} } @ndx) {
$i++;
- $j = $item->{ndx} - 1;
+
my
$j = $item->{ndx} - 1;
map { $self->{"${_}_$i"} = $new->[$j]->{$_} } @{$flds};
}
map { $self->{"${_}_$i"} = $new->[$j]->{$_} } @{$flds};
}