Bugzilla – Attachment 47497 Details for
Bug 13324
[DEPENDS_ON_13321] The fund values must be based on tax included values
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13324: The fund values should be based on tax included values
Bug-13324-The-fund-values-should-be-based-on-tax-i.patch (text/plain), 3.36 KB, created by
Julian Maurice
on 2016-02-01 09:36:04 UTC
(
hide
)
Description:
Bug 13324: The fund values should be based on tax included values
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2016-02-01 09:36:04 UTC
Size:
3.36 KB
patch
obsolete
>From ff93522a6be2270d04a183461e5a943588ba4813 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Tue, 18 Nov 2014 17:07:45 +0100 >Subject: [PATCH] Bug 13324: The fund values should be based on tax included > values > >Now we have a column in DB to easily retrieve the tax included values. >So the sum must be done this the _tax_included DB field and not on the >"old" field. >The old field can be tax excluded or tax included depending the supplier >configuration. > >Test plan: >Verify that the values in the acqui home and budgets page are the tax >included values. >--- > C4/Budgets.pm | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > >diff --git a/C4/Budgets.pm b/C4/Budgets.pm >index 1c30e1b..e2edf8b 100644 >--- a/C4/Budgets.pm >+++ b/C4/Budgets.pm >@@ -216,7 +216,7 @@ sub GetBudgetsPlanCell { > # get the actual amount > $sth = $dbh->prepare( qq| > >- SELECT SUM(ecost) AS actual FROM aqorders >+ SELECT SUM(ecost_tax_included) AS actual FROM aqorders > WHERE budget_id = ? AND > entrydate like "$cell->{'authvalue'}%" | > ); >@@ -225,7 +225,7 @@ sub GetBudgetsPlanCell { > # get the actual amount > $sth = $dbh->prepare( qq| > >- SELECT SUM(ecost) FROM aqorders >+ SELECT SUM(ecost_tax_included) FROM aqorders > LEFT JOIN aqorders_items > ON (aqorders.ordernumber = aqorders_items.ordernumber) > LEFT JOIN items >@@ -237,7 +237,7 @@ sub GetBudgetsPlanCell { > # get the actual amount > $sth = $dbh->prepare( qq| > >- SELECT SUM( ecost * quantity) AS actual >+ SELECT SUM( ecost_tax_included * quantity) AS actual > FROM aqorders JOIN biblioitems > ON (biblioitems.biblionumber = aqorders.biblionumber ) > WHERE aqorders.budget_id = ? and itemtype = ? | >@@ -250,7 +250,7 @@ sub GetBudgetsPlanCell { > # get the actual amount > $sth = $dbh->prepare( qq| > >- SELECT SUM(ecost * quantity) AS actual >+ SELECT SUM(ecost_tax_included * quantity) AS actual > FROM aqorders > JOIN aqbudgets ON (aqbudgets.budget_id = aqorders.budget_id ) > WHERE aqorders.budget_id = ? AND >@@ -329,10 +329,12 @@ sub ModBudgetPlan { > > # ------------------------------------------------------------------- > sub GetBudgetSpent { >- my ($budget_id) = @_; >- my $dbh = C4::Context->dbh; >- my $sth = $dbh->prepare(qq| >- SELECT SUM( COALESCE(unitprice, ecost) * quantity ) AS sum FROM aqorders >+ my ($budget_id) = @_; >+ my $dbh = C4::Context->dbh; >+ # unitprice_tax_included should always been set here >+ # we should not need to retrieve ecost_tax_included >+ my $sth = $dbh->prepare(qq| >+ SELECT SUM( COALESCE(unitprice_tax_included, ecost_tax_included) * quantity ) AS sum FROM aqorders > WHERE budget_id = ? AND > quantityreceived > 0 AND > datecancellationprinted IS NULL >@@ -358,7 +360,7 @@ sub GetBudgetOrdered { > my ($budget_id) = @_; > my $dbh = C4::Context->dbh; > my $sth = $dbh->prepare(qq| >- SELECT SUM(ecost * quantity) AS sum FROM aqorders >+ SELECT SUM(ecost_tax_included * quantity) AS sum FROM aqorders > WHERE budget_id = ? AND > quantityreceived = 0 AND > datecancellationprinted IS NULL >-- >1.9.1
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 13324
:
33795
|
47497
|
48873
|
56437
|
56893