X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=ee040b5e70d59e7fae69044c2a71fa4bd07e9efa;hb=f7399fa8ecb63d8cc0f34c7d1adf3930400edda5;hp=e597786ecf6395747e426e28824f4ed34dd5e639;hpb=53d05e1f806b560e2ed3bed2cc540310aaed7d47;p=kivitendo-erp.git
diff --git a/SL/Form.pm b/SL/Form.pm
index e597786ec..ee040b5e7 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);
@@ -91,7 +92,8 @@ END {
sub disconnect_standard_dbh {
return unless $standard_dbh;
- $standard_dbh->disconnect();
+
+ $standard_dbh->rollback();
undef $standard_dbh;
}
@@ -467,15 +469,17 @@ 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
+ tooltipster themes/tooltipster-light
);
$layout->use_javascript("$_.js") for (qw(
jquery jquery-ui jquery.cookie jquery.checkall jquery.download
jquery/jquery.form jquery/fixes client_js
+ jquery/jquery.tooltipster.min
common part_selection switchmenuframe
), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
@@ -536,7 +540,7 @@ sub footer {
print $::request->{layout}->post_content;
if (my @inline_scripts = $::request->{layout}->javascripts_inline) {
- print "\n";
+ print "\n";
}
print <leave_sub;
}
+sub prepare_global_vars {
+ my ($self) = @_;
+
+ $self->{AUTH} = $::auth;
+ $self->{INSTANCE_CONF} = $::instance_conf;
+ $self->{LOCALE} = $::locale;
+ $self->{LXCONFIG} = $::lx_office_conf;
+ $self->{LXDEBUG} = $::lxdebug;
+ $self->{MYCONFIG} = \%::myconfig;
+}
+
sub _prepare_html_template {
$main::lxdebug->enter_sub();
@@ -606,15 +621,6 @@ 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;
@@ -807,6 +813,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
@@ -823,7 +830,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 {
@@ -957,6 +964,8 @@ sub parse_amount {
sub round_amount {
my ($self, $amount, $places) = @_;
+ return 0 if !defined $amount;
+
# We use Perl's knowledge of string representation for
# rounding. First, convert the floating point number to a string
# with a high number of places. Then split the string on the decimal
@@ -964,7 +973,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+)$};
@@ -1123,7 +1134,7 @@ sub parse_template {
if ($self->{media} eq 'email') {
- my $mail = new Mailer;
+ my $mail = Mailer->new;
map { $mail->{$_} = $self->{$_} }
qw(cc bcc subject message version format);
@@ -1296,6 +1307,9 @@ sub generate_attachment_filename {
} elsif ($attachment_filename && $self->{"${prefix}number"}) {
$attachment_filename .= "_" . $self->{"${prefix}number"} . $self->get_extension_for_format();
+ } elsif ($attachment_filename) {
+ $attachment_filename .= $self->get_extension_for_format();
+
} else {
$attachment_filename = "";
}
@@ -1700,36 +1714,19 @@ sub get_default_currency {
}
sub set_payment_options {
- $main::lxdebug->enter_sub();
-
my ($self, $myconfig, $transdate) = @_;
- return $main::lxdebug->leave_sub() unless ($self->{payment_id});
+ my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id})->load : undef;
+ return if !$terms;
- my $dbh = $self->get_standard_dbh($myconfig);
+ $transdate ||= $self->{invdate} || $self->{transdate};
+ my $due_date = $self->{duedate} || $self->{reqdate};
- my $query =
- qq|SELECT p.terms_netto, p.terms_skonto, p.percent_skonto, p.description_long , p.description | .
- qq|FROM payment_terms p | .
- qq|WHERE p.id = ?|;
-
- ($self->{terms_netto}, $self->{terms_skonto}, $self->{percent_skonto},
- $self->{payment_terms}, $self->{payment_description}) =
- selectrow_query($self, $dbh, $query, $self->{payment_id});
-
- if ($transdate eq "") {
- if ($self->{invdate}) {
- $transdate = $self->{invdate};
- } else {
- $transdate = $self->{transdate};
- }
- }
-
- $query =
- qq|SELECT ?::date + ?::integer AS netto_date, ?::date + ?::integer AS skonto_date | .
- qq|FROM payment_terms|;
- ($self->{netto_date}, $self->{skonto_date}) =
- selectrow_query($self, $dbh, $query, $transdate, $self->{terms_netto}, $transdate, $self->{terms_skonto});
+ $self->{$_} = $terms->$_ for qw(terms_netto terms_skonto percent_skonto);
+ $self->{payment_terms} = $terms->description_long;
+ $self->{payment_description} = $terms->description;
+ $self->{netto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'net')->to_kivitendo;
+ $self->{skonto_date} = $terms->calc_date(reference_date => $transdate, due_date => $due_date, terms => 'discount')->to_kivitendo;
my ($invtotal, $total);
my (%amounts, %formatted_amounts);
@@ -1759,7 +1756,8 @@ sub set_payment_options {
}
if ($self->{"language_id"}) {
- $query =
+ my $dbh = $self->get_standard_dbh($myconfig);
+ my $query =
qq|SELECT t.translation, l.output_numberformat, l.output_dateformat, l.output_longdates | .
qq|FROM generic_translations t | .
qq|LEFT JOIN language l ON t.language_id = l.id | .
@@ -1798,13 +1796,15 @@ sub set_payment_options {
$self->{payment_terms} =~ s/<%account_number%>/$self->{account_number}/g;
$self->{payment_terms} =~ s/<%bank%>/$self->{bank}/g;
$self->{payment_terms} =~ s/<%bank_code%>/$self->{bank_code}/g;
+ $self->{payment_terms} =~ s/<\%bic\%>/$self->{bic}/g;
+ $self->{payment_terms} =~ s/<\%iban\%>/$self->{iban}/g;
+ $self->{payment_terms} =~ s/<\%mandate_date_of_signature\%>/$self->{mandate_date_of_signature}/g;
+ $self->{payment_terms} =~ s/<\%mandator_id\%>/$self->{mandator_id}/g;
map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
$self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
- $main::lxdebug->leave_sub();
-
}
sub get_template_language {
@@ -1977,23 +1977,6 @@ sub get_employee_data {
$main::lxdebug->leave_sub();
}
-sub get_duedate {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $reference_date) = @_;
-
- my $terms = $self->{payment_id} ? SL::DB::PaymentTerm->new(id => $self->{payment_id}) ->load
- : $self->{customer_id} ? SL::DB::Customer ->new(id => $self->{customer_id})->load->payment
- : $self->{vendor_id} ? SL::DB::Vendor ->new(id => $self->{vendor_id}) ->load->payment
- : $self->{invdate} ? undef # no payment terms, therefore invdate == duedate
- : croak("Missing field in \$::form: payment_id, customer_id, vendor_id or invdate");
- my $duedate = $terms ? $terms->calc_date(reference_date => $reference_date)->to_kivitendo : undef;
-
- $main::lxdebug->leave_sub();
-
- return $duedate;
-}
-
sub _get_contacts {
$main::lxdebug->enter_sub();
@@ -2615,6 +2598,25 @@ sub all_vc {
$main::lxdebug->leave_sub();
}
+sub mtime_ischanged {
+ my ($self, $table, $option) = @_;
+
+ 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 " . $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} ) {
+ $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();
+ }
+}
+
sub language_payment {
$main::lxdebug->enter_sub();
@@ -2766,6 +2768,7 @@ sub create_links {
qq|SELECT
a.cp_id, a.invnumber, a.transdate, a.${table}_id, a.datepaid,
a.duedate, a.ordnumber, a.taxincluded, (SELECT cu.name FROM currencies cu WHERE cu.id=a.currency_id) AS currency, a.notes,
+ a.mtime, a.itime,
a.intnotes, a.department_id, a.amount AS oldinvtotal,
a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
a.globalproject_id, ${extra_columns}
@@ -2782,7 +2785,8 @@ sub create_links {
foreach my $key (keys %$ref) {
$self->{$key} = $ref->{$key};
}
-
+ $self->{mtime} ||= $self->{itime};
+ $self->{lastmtime} = $self->{mtime};
my $transdate = "current_date";
if ($self->{transdate}) {
$transdate = $dbh->quote($self->{transdate});
@@ -2916,7 +2920,6 @@ sub lastname_used {
"d.description" => "department",
"ct.name" => $table,
"cu.name" => "currency",
- "current_date + ct.terms" => "duedate",
);
if ($self->{type} =~ /delivery_order/) {
@@ -3505,9 +3508,9 @@ sub calculate_arap {
if ( $selected_tax ) {
if ( $buysell eq 'sell' ) {
- $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno unless $selected_tax->taxkey == 0;
+ $self->{AR_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;
} else {
- $self->{AP_amounts}{"tax_$i"} = $selected_tax->chart->accno unless $selected_tax->taxkey == 0;
+ $self->{AP_amounts}{"tax_$i"} = $selected_tax->chart->accno if defined $selected_tax->chart;
};
$self->{"taxkey_$i"} = $selected_tax->taxkey;
@@ -3749,6 +3752,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