From 061f4d6d32ed95055114582ede45e8387b302a53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Mon, 4 Apr 2016 13:38:54 +0200 Subject: [PATCH] Revert "Form: round_amount precision support" Originalcommit: 73a78da630ce363f70062447dd82a8a0ece8cd89 --- SL/DB/MetaSetup/Default.pm | 1 - SL/Form.pm | 7 +------ sql/Pg-upgrade2/defaults_add_precision.sql | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 sql/Pg-upgrade2/defaults_add_precision.sql diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm index 96c4b0f1f..4f0fcf058 100644 --- a/SL/DB/MetaSetup/Default.pm +++ b/SL/DB/MetaSetup/Default.pm @@ -78,7 +78,6 @@ __PACKAGE__->meta->columns( payments_changeable => { type => 'integer', default => '0', not_null => 1 }, pdonumber => { type => 'text' }, ponumber => { type => 'text' }, - precision => { type => 'numeric', default => '0.01', not_null => 1, precision => 15, scale => 5 }, profit_determination => { type => 'text' }, project_status_id => { type => 'integer' }, project_type_id => { type => 'integer' }, diff --git a/SL/Form.pm b/SL/Form.pm index 98bb4dbe2..9dbe7a784 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -948,17 +948,12 @@ sub parse_amount { } sub round_amount { - my ($self, $amount, $places, $adjust) = @_; + my ($self, $amount, $places) = @_; return 0 if !defined $amount; $places //= 0; - if ($adjust) { - my $precision = $::instance_conf->get_precision || 0.01; - return $self->round_amount( $self->round_amount($amount / $precision, 0) * $precision, $places); - } - # 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 diff --git a/sql/Pg-upgrade2/defaults_add_precision.sql b/sql/Pg-upgrade2/defaults_add_precision.sql deleted file mode 100644 index 88f854cab..000000000 --- a/sql/Pg-upgrade2/defaults_add_precision.sql +++ /dev/null @@ -1,5 +0,0 @@ --- @tag: defaults_add_precision --- @description: adds new column 'precision' in table defaults, used to round amounts --- @depends: release_3_0_0 -ALTER TABLE defaults ADD COLUMN precision NUMERIC(15,5) NOT NULL DEFAULT(0.01); - -- 2.20.1