X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/d2af074aaff9dc869be9fa766a796f1642e8ba54..c6dd542b51ae9549ad42a54f9023b905412bbab9:/SL/Form.pm
diff --git a/SL/Form.pm b/SL/Form.pm
index 645544eec..32064f3c0 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -66,6 +66,7 @@ use SL::IC;
use SL::IS;
use SL::Layout::Dispatcher;
use SL::Locale;
+use SL::Locale::String;
use SL::Mailer;
use SL::Menu;
use SL::MoreCommon qw(uri_encode uri_decode);
@@ -468,7 +469,7 @@ sub header {
# standard css for all
# this should gradually move to the layouts that need it
$layout->use_stylesheet("$_.css") for qw(
- main menu common list_accounts jquery.autocomplete
+ common main menu list_accounts jquery.autocomplete
jquery.multiselect2side
ui-lightness/jquery-ui
jquery-ui.custom
@@ -620,36 +621,12 @@ sub _prepare_html_template {
::end_of_request();
}
- if ($self->{"DEBUG"}) {
- $additional_params->{"DEBUG"} = $self->{"DEBUG"};
- }
-
- if ($additional_params->{"DEBUG"}) {
- $additional_params->{"DEBUG"} =
- " DEBUG INFORMATION:
" . $additional_params->{"DEBUG"} . "
";
- }
-
- if (%main::myconfig) {
- $::myconfig{jsc_dateformat} = apply {
- s/d+/\%d/gi;
- s/m+/\%m/gi;
- s/y+/\%Y/gi;
- } $::myconfig{"dateformat"};
- $additional_params->{"myconfig"} ||= \%::myconfig;
- map { $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys %::myconfig;
- }
-
+ $additional_params->{AUTH} = $::auth;
$additional_params->{INSTANCE_CONF} = $::instance_conf;
-
- if (my $debug_options = $::lx_office_conf{debug}{options}) {
- map { $additional_params->{'DEBUG_' . uc($_)} = $debug_options->{$_} } keys %$debug_options;
- }
-
- if ($main::auth && $main::auth->{RIGHTS} && $main::auth->{RIGHTS}->{$self->{login}}) {
- while (my ($key, $value) = each %{ $main::auth->{RIGHTS}->{$self->{login}} }) {
- $additional_params->{"AUTH_RIGHTS_" . uc($key)} = $value;
- }
- }
+ $additional_params->{LOCALE} = $::locale;
+ $additional_params->{LXCONFIG} = \%::lx_office_conf;
+ $additional_params->{LXDEBUG} = $::lxdebug;
+ $additional_params->{MYCONFIG} = \%::myconfig;
$main::lxdebug->leave_sub();
@@ -821,6 +798,7 @@ sub format_amount {
my $force_places = defined $places && $places >= 0;
$amount = $self->round_amount($amount, abs $places) if $force_places;
+ $neg = 0 if $amount == 0; # don't show negative zero
$amount = sprintf "%.*f", ($force_places ? $places : 10), abs $amount; # 6 is default for %fa
# before the sprintf amount was a number, afterwards it's a string. because of the dynamic nature of perl
@@ -837,7 +815,7 @@ sub format_amount {
if ($places || $p[1]) {
$amount .= $d[0]
. ( $p[1] || '' )
- . (0 x (abs($places || 0) - length ($p[1]||''))); # pad the fraction
+ . (0 x max(abs($places || 0) - length ($p[1]||''), 0)); # pad the fraction
}
$amount = do {
@@ -980,7 +958,9 @@ sub round_amount {
# part. If an overflow occurs then apply that overflow to the part
# before the decimal sign as well using integer arithmetic again.
- my $amount_str = sprintf '%.*f', $places + 10, abs($amount);
+ my $int_amount = int(abs $amount);
+ my $str_places = max(min(10, 16 - length("$int_amount") - $places), $places);
+ my $amount_str = sprintf '%.*f', $places + $str_places, abs($amount);
return $amount unless $amount_str =~ m{^(\d+)\.(\d+)$};
@@ -2604,22 +2584,20 @@ sub all_vc {
}
sub mtime_ischanged {
- my ($self, $relation, $option) = @_;
+ my ($self, $table, $option) = @_;
- return unless $self->{id}; # maybe better croak, but i have no api doc to refer to ...
+ return unless $self->{id};
+ croak ("wrong call, no valid table defined") unless $table =~ /^(oe|ar|ap|delivery_orders|parts)$/;
- my $query = "SELECT mtime, itime FROM " . $relation . " WHERE id = ?";
- my $ref = selectfirst_hashref_query($self, $self->get_standard_dbh, $query, $self->{id});
- $ref->{mtime} = $ref->{itime} if !$ref->{mtime};
+ my $query = "SELECT mtime, itime FROM " . $table . " WHERE id = ?";
+ my $ref = selectfirst_hashref_query($self, $self->get_standard_dbh, $query, $self->{id});
+ $ref->{mtime} ||= $ref->{itime};
if ($self->{lastmtime} && $self->{lastmtime} ne $ref->{mtime} ) {
- my $etxt = $main::locale->text("The document has been changed from other user. Please reopen it in another window and copy the changes to the new window");
-
- $etxt = $main::locale->text("The document has been changed from other user. No mail was sent. Please reopen it in another window and copy the changes to the new window")
- if ($option eq 'mail');
- # ^^ I prefer:
- # my $etxt = ($option eq 'mail') ? locale1 : locale2;
- $self->error($main::locale->text($etxt));
+ $self->error(($option eq 'mail') ?
+ t8("The document has been changed by another user. No mail was sent. Please reopen it in another window and copy the changes to the new window") :
+ t8("The document has been changed by another user. Please reopen it in another window and copy the changes to the new window")
+ );
::end_of_request();
}
}
@@ -2792,7 +2770,7 @@ sub create_links {
foreach my $key (keys %$ref) {
$self->{$key} = $ref->{$key};
}
- $self->{mtime} ||= $self->{itime};
+ $self->{mtime} ||= $self->{itime};
$self->{lastmtime} = $self->{mtime};
my $transdate = "current_date";
if ($self->{transdate}) {
@@ -3759,6 +3737,17 @@ Used to override the default favicon.
A html page title will be generated from this
+=item mtime_ischanged
+
+Tries to avoid concurrent write operations to records by checking the database mtime with a fetched one.
+
+Can be used / called with any table, that has itime and mtime attributes.
+Valid C
names are: oe, ar, ap, delivery_orders, parts.
+Can be called wit C