use SL::Menu;
use SL::MoreCommon qw(uri_encode uri_decode);
use SL::OE;
+use SL::PrefixedNumber;
use SL::Request;
use SL::Template;
use SL::User;
my $self = shift;
return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
+ return URI->new if !$ENV{REQUEST_URI}; # for testing
my $scheme = $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
- my $port = $ENV{SERVER_PORT} || '';
+ my $port = $ENV{SERVER_PORT};
$port = undef if (($scheme eq 'http' ) && ($port == 80))
|| (($scheme eq 'https') && ($port == 443));
# standard css for all
# this should gradually move to the layouts that need it
$layout->use_stylesheet("$_.css") for qw(
- main menu tabcontent list_accounts jquery.autocomplete
+ main menu list_accounts jquery.autocomplete
jquery.multiselect2side frame_header/header
- ui-lightness/jquery-ui-1.8.12.custom
- js/jscalendar/calendar-win2k-1
+ ui-lightness/jquery-ui
+ jquery-ui.custom jqModal
);
- $layout->use_javascript("$_.js") for qw(
- jquery common jscalendar/calendar jscalendar/lang/calendar-de
- jscalendar/calendar-setup part_selection jquery-ui jquery.cookie jqModal
- switchmenuframe
- );
+ $layout->use_javascript("$_.js") for (qw(
+ jquery jquery-ui jquery.cookie jqModal jquery.checkall jquery.download
+ common part_selection switchmenuframe
+ ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
$self->{favicon} ||= "favicon.ico";
- $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title};
+ $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title} || !$self->{titlebar};
# build includes
if ($self->{refresh_url} || $self->{refresh_time}) {
push @header, "<meta http-equiv='refresh' content='$refresh_time;$refresh_url'>";
}
- push @header, map { qq|<link rel="stylesheet" href="$_" type="text/css" title="Stylesheet">| } $layout->stylesheets;
+ my $auto_reload_resources_param = $layout->auto_reload_resources_param;
+
+ push @header, map { qq|<link rel="stylesheet" href="${_}${auto_reload_resources_param}" type="text/css" title="Stylesheet">| } $layout->stylesheets;
push @header, "<style type='text/css'>\@page { size:landscape; }</style> " if $self->{landscape};
push @header, "<link rel='shortcut icon' href='$self->{favicon}' type='image/x-icon'>" if -f $self->{favicon};
- push @header, map { qq|<script type="text/javascript" src="$_"></script>| } $layout->javascripts;
+ push @header, map { qq|<script type="text/javascript" src="${_}${auto_reload_resources_param}"></script>| } $layout->javascripts;
push @header, $self->{javascript} if $self->{javascript};
push @header, map { $_->show_javascript } @{ $self->{AJAX} || [] };
print " $_\n" for @header;
print <<EOT;
<meta name="robots" content="noindex,nofollow">
- <script type="text/javascript" src="js/tabcontent.js">
-
- /***********************************************
- * 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>
</head>
<body>
return;
}
+ if ($::request->is_ajax) {
+ $::lxdebug->message(0, "trying to render AJAX response...");
+ SL::ClientJS->new
+ ->error($error)
+ ->render(SL::Controller::Base->new);
+ ::end_of_request();
+ }
+
my $add_params = {
'title_error' => $params{title},
'label_error' => $error,
::end_of_request();
}
-# write Trigger JavaScript-Code ($qty = quantity of Triggers)
-# changed it to accept an arbitrary number of triggers - sschoeling
-sub write_trigger {
- $main::lxdebug->enter_sub();
-
- my $self = shift;
- my $myconfig = shift;
- my $qty = shift;
-
- # set dateform for jsscript
- # default
- my %dateformats = (
- "dd.mm.yy" => "%d.%m.%Y",
- "dd/mm/yy" => "%d/%m/%Y",
- "mm/dd/yy" => "%m/%d/%Y",
- "yyyy-mm-dd" => "%Y-%m-%d",
- );
-
- my $ifFormat = defined($dateformats{$myconfig->{"dateformat"}}) ?
- $dateformats{$myconfig->{"dateformat"}} : "%d.%m.%Y";
-
- my @triggers;
- while ($#_ >= 2) {
- push @triggers, qq|
- Calendar.setup(
- {
- inputField : "| . (shift) . qq|",
- ifFormat :"$ifFormat",
- align : "| . (shift) . qq|",
- button : "| . (shift) . qq|"
- }
- );
- |;
- }
- my $jsscript = qq|
- <script type="text/javascript">
- <!--| . join("", @triggers) . qq|//-->
- </script>
- |;
-
- $main::lxdebug->leave_sub();
-
- return $jsscript;
-} #end sub write_trigger
-
sub _store_redirect_info_in_session {
my ($self) = @_;
my ($self, $myconfig, $amount) = @_;
+ if (!defined($amount) || ($amount eq '')) {
+ $main::lxdebug->leave_sub(2);
+ return 0;
+ }
+
if ( ($myconfig->{numberformat} eq '1.000,00')
|| ($myconfig->{numberformat} eq '1000,00')) {
$amount =~ s/\.//g;
$ext_for_format = $self->{"format"} =~ m/pdf/ ? 'pdf' : 'odt';
} elsif ($self->{"format"} =~ /(postscript|pdf)/i) {
- $ENV{"TEXINPUTS"} = ".:" . getcwd() . "/" . $myconfig->{"templates"} . ":" . $ENV{"TEXINPUTS"};
$template_type = 'LaTeX';
$ext_for_format = 'pdf';
# Database routines used throughout
-sub _dbconnect_options {
- my $self = shift;
- my $options = { pg_enable_utf8 => $::locale->is_utf8,
- @_ };
-
- return $options;
-}
-
sub dbconnect {
$main::lxdebug->enter_sub(2);
my ($self, $myconfig) = @_;
# connect to database
- my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, $self->_dbconnect_options)
+ my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, SL::DBConnect->get_options)
or $self->dberror;
# set db options
my ($self, $myconfig) = @_;
# connect to database
- my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, $self->_dbconnect_options(AutoCommit => 0))
+ my $dbh = SL::DBConnect->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, $myconfig->{dbpasswd}, SL::DBConnect->get_options(AutoCommit => 0))
or $self->dberror;
# set db options
my $where = @where ? ' WHERE ' . join(' AND ', map { "($_)" } @where) : '';
- my $query = qq|SELECT * FROM tax $where ORDER BY taxkey|;
+ my $query = qq|SELECT * FROM tax $where ORDER BY taxkey, rate|;
$self->{$key} = selectall_hashref_query($self, $dbh, $query);
# Hotfix für Bug 1837 - Besser wäre es alte Buchungsbelege
# OHNE Auswahlliste (reines Textfeld) zu laden. Hilft aber auch
# nicht für veränderbare Belege (oe, do, ...)
- my $obsolete = "WHERE NOT obsolete" unless $self->{id};
+ my $obsolete = $self->{id} ? '' : "WHERE NOT obsolete";
my $query = qq|SELECT count(*) FROM $table $obsolete|;
my ($count) = selectrow_query($self, $dbh, $query);
$self->{TAX} = selectall_hashref_query($self, $dbh, $query);
}
+ my $extra_columns = '';
+ $extra_columns .= 'a.direct_debit, ' if ($module eq 'AR') || ($module eq 'AP');
+
if ($self->{id}) {
$query =
qq|SELECT
a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
a.intnotes, a.department_id, a.amount AS oldinvtotal,
a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
- a.globalproject_id,
+ a.globalproject_id, ${extra_columns}
c.name AS $table,
d.description AS department,
e.name AS employee
FROM acc_trans a
LEFT JOIN chart c ON (c.id = a.chart_id)
LEFT JOIN project p ON (p.id = a.project_id)
- LEFT JOIN tax t ON (t.id= a.tax_id)
+ LEFT JOIN tax t ON (t.id= (SELECT tk.tax_id FROM taxkeys tk
+ WHERE (tk.taxkey_id=a.taxkey) AND
+ ((CASE WHEN a.chart_id IN (SELECT chart_id FROM taxkeys WHERE taxkey_id = a.taxkey)
+ THEN tk.chart_id = a.chart_id
+ ELSE 1 = 1
+ END)
+ OR (c.link='%tax%')) AND
+ (startdate <= a.transdate) ORDER BY startdate DESC LIMIT 1))
WHERE a.trans_id = ?
AND a.fx_transaction = '0'
ORDER BY a.acc_trans_id, a.transdate|;
my ($var) = $sth->fetchrow_array;
$sth->finish;
- if ($var =~ m/\d+$/) {
- my $new_var = (substr $var, $-[0]) * 1 + 1;
- my $len_diff = length($var) - $-[0] - length($new_var);
- $var = substr($var, 0, $-[0]) . ($len_diff > 0 ? '0' x $len_diff : '') . $new_var;
-
- } else {
- $var = $var . '1';
- }
-
+ $var = 0 if !defined($var) || ($var eq '');
+ $var = SL::PrefixedNumber->new(number => $var)->get_next;
$query = qq|UPDATE defaults SET $fld = ?|;
do_query($self, $dbh, $query, $var);
IC->retrieve_accounts(\%::myconfig, $self, map { $_ => $self->{"id_$_"} } 1 .. $self->{rowcount});
if ($self->{type} =~ /_delivery_order$/) {
- DO->order_details();
+ DO->order_details(\%::myconfig, $self);
} elsif ($self->{type} =~ /sales_order|sales_quotation|request_quotation|purchase_order/) {
OE->order_details(\%::myconfig, $self);
} else {
projects / kivitendo-erp.git / blobdiff