Bugzilla – Attachment 86649 Details for
Bug 18736
Problems in order calculations (rounding errors)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18736: (follow-up) Add tests and FIXME for GetbudgetsPlanCell
Bug-18736-follow-up-Add-tests-and-FIXME-for-Getbud.patch (text/plain), 5.24 KB, created by
Marcel de Rooy
on 2019-03-15 10:05:31 UTC
(
hide
)
Description:
Bug 18736: (follow-up) Add tests and FIXME for GetbudgetsPlanCell
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2019-03-15 10:05:31 UTC
Size:
5.24 KB
patch
obsolete
>From 7ae6679cf610711df744f1b45d4831a5844db26a Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 17 Apr 2018 14:37:11 +0000 >Subject: [PATCH] Bug 18736: (follow-up) Add tests and FIXME for > GetbudgetsPlanCell >Content-Type: text/plain; charset=utf-8 > >prove t/db_dependent/Budgets.t > >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/Budgets.pm | 4 +++- > t/db_dependent/Budgets.t | 35 +++++++++++++++++++++++++++++++++-- > 2 files changed, 36 insertions(+), 3 deletions(-) > >diff --git a/C4/Budgets.pm b/C4/Budgets.pm >index 4b6cce9a4c..18bb1f846f 100644 >--- a/C4/Budgets.pm >+++ b/C4/Budgets.pm >@@ -208,12 +208,13 @@ sub SetOwnerToFundHierarchy { > > # ------------------------------------------------------------------- > sub GetBudgetsPlanCell { >- my ( $cell, $period, $budget ) = @_; >+ my ( $cell, $period, $budget ) = @_; #FIXME we don't use $period or $budget > my ($actual, $sth); > my $dbh = C4::Context->dbh; > my $roundsql = _get_rounding_sql(qq|ecost_tax_included|); > if ( $cell->{'authcat'} eq 'MONTHS' ) { > # get the actual amount >+ # FIXME we should consider quantity > $sth = $dbh->prepare( qq| > > SELECT SUM(| . $roundsql . qq|) AS actual FROM aqorders >@@ -223,6 +224,7 @@ sub GetBudgetsPlanCell { > $sth->execute( $cell->{'budget_id'} ); > } elsif ( $cell->{'authcat'} eq 'BRANCHES' ) { > # get the actual amount >+ # FIXME we should consider quantity > $sth = $dbh->prepare( qq| > > SELECT SUM(| . $roundsql . qq|) FROM aqorders >diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t >index 8ad0bcea05..cea056ed4b 100755 >--- a/t/db_dependent/Budgets.t >+++ b/t/db_dependent/Budgets.t >@@ -14,6 +14,7 @@ use Koha::Acquisition::Orders; > use Koha::Acquisition::Funds; > use Koha::Patrons; > use Koha::Number::Price; >+use Koha::Items; > > use t::lib::TestBuilder; > use t::lib::Mocks; >@@ -936,11 +937,12 @@ subtest 'GetBudgetSpent and GetBudgetOrdered' => sub { > is( $ordered, 3, "After adding invoice adjustment on a different budget, should still be 3 ordered/budget unaffected"); > }; > >-subtest 'OrderPriceRounding GetBudgetSpent GetBudgetOrdered tests' => sub { >+subtest 'GetBudgetSpent GetBudgetOrdered GetBudgetsPlanCell tests' => sub { > >- plan tests => 8; >+ plan tests => 12; > > #Let's build an order, we need a couple things though >+ t::lib::Mocks::mock_preference('OrderPriceRounding','nearest_cent'); > > my $spent_biblio = $builder->build({ source => 'Biblio' }); > my $spent_basket = $builder->build({ source => 'Aqbasket', value => { is_standing => 0 } }); >@@ -987,6 +989,35 @@ subtest 'OrderPriceRounding GetBudgetSpent GetBudgetOrdered tests' => sub { > $spent_ordered = GetBudgetOrdered( $spent_order->{budget_id} ); > is($spent_ordered,'78.8',"We expect the ordered amount to be equal to the estimated price rounded times quantity"); > >+#Let's test some budget planning >+#Regression tests for bug 18736 >+ #We need an item to test by BRANCHES >+ my $item_1 = $builder->build({ source => 'Item' }); >+ my $order_item_1 = $builder->build({ source => 'AqordersItem', value => { ordernumber => $spent_order->{ordernumber}, itemnumber => $item_1->{itemnumber} } }); >+ my $spent_fund = Koha::Acquisition::Funds->find( $spent_order->{budget_id} ); >+ my $cell = { >+ authcat => 'MONTHS', >+ cell_authvalue => $spent_order->{entrydate}, #normally this is just the year/month but full won't hurt us here >+ budget_id => $spent_order->{budget_id}, >+ budget_period_id => $spent_fund->budget_period_id, >+ }; >+ t::lib::Mocks::mock_preference('OrderPriceRounding',''); >+ my ( $actual ) = GetBudgetsPlanCell( $cell, undef, undef); #we are only testing the actual for now >+ is ( $actual, '9.854200', "We expect this to be an exact order cost"); #really we should expect cost*quantity but we don't >+ t::lib::Mocks::mock_preference('OrderPriceRounding','nearest_cent'); >+ ( $actual ) = GetBudgetsPlanCell( $cell, undef, undef); #we are only testing the actual for now >+ is ( $actual, '9.8500', "We expect this to be a rounded order cost"); #really we should expect cost*quantity but we don't >+ $cell->{authcat} = 'BRANCHES'; >+ $cell->{authvalue} = $item_1->{homebranch}; >+ ( $actual ) = GetBudgetsPlanCell( $cell, undef, undef); #we are only testing the actual for now >+ t::lib::Mocks::mock_preference('OrderPriceRounding',''); >+ ( $actual ) = GetBudgetsPlanCell( $cell, undef, undef); #we are only testing the actual for now >+ is ( $actual, '9.854200', "We expect this to be full cost for items from the branch"); #here we rely on items having been created for each order, again quantity should be considered >+ t::lib::Mocks::mock_preference('OrderPriceRounding','nearest_cent'); >+ ( $actual ) = GetBudgetsPlanCell( $cell, undef, undef); #we are only testing the actual for now >+ is ( $actual, '9.8500', "We expect this to be rounded cost for items from the branch"); #here we rely on items having been created for each order, again quantity should be considered >+ >+ > #Okay, now we can receive the order, giving the price as the user would > > $spent_orderinfo->{unitprice} = 9.85; #we are paying what we expected >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18736
:
64061
|
64065
|
70187
|
70188
|
70189
|
70768
|
71062
|
71063
|
71627
|
71628
|
71629
|
71630
|
71631
|
71632
|
74335
|
74336
|
74337
|
74338
|
74339
|
74340
|
74341
|
74342
|
74370
|
74371
|
74374
|
74397
|
74398
|
74422
|
74427
|
74438
|
76979
|
76980
|
76981
|
76982
|
76983
|
76984
|
76985
|
76986
|
76987
|
76988
|
76989
|
76990
|
76991
|
77614
|
77615
|
77616
|
77617
|
77618
|
78101
|
78120
|
78981
|
78982
|
78983
|
78984
|
78985
|
78986
|
78987
|
78988
|
79087
|
79088
|
79089
|
79090
|
79091
|
79092
|
79093
|
79094
|
79098
|
79099
|
79100
|
79101
|
79102
|
79103
|
79104
|
79105
|
79187
|
79223
|
79562
|
79563
|
82967
|
82968
|
82969
|
82970
|
82971
|
82972
|
82973
|
82974
|
82975
|
82976
|
82977
|
83212
|
83213
|
83214
|
83973
|
83974
|
83975
|
83976
|
83977
|
83978
|
83979
|
83980
|
83981
|
83982
|
83983
|
83984
|
83985
|
86646
|
86647
|
86648
| 86649 |
86650
|
86651
|
86652
|
86653
|
86654
|
86655
|
86656
|
86657
|
86658