[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #23 from Katrin Fischer  ---
These patches have been pushed to 16.11.x and will be in 16.11.14.

Thx, Alex!

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Fridolin SOMERS  changed:

   What|Removed |Added

 Status|Pushed to Master|Pushed to Stable

--- Comment #22 from Fridolin SOMERS  ---
Pushed to 17.05.x, will be in 17.05.06.

I have added a followup to correct UT :
Bug 18999: (17.05.x followup) Koha::Acquisition::Order is not an object yet

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Fridolin SOMERS  changed:

   What|Removed |Added

   Patch complexity|--- |Small patch
 CC||fridolin.som...@biblibre.co
   ||m

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Jonathan Druart  changed:

   What|Removed |Added

 Status|Passed QA   |Pushed to Master

--- Comment #21 from Jonathan Druart  
---
Pushed to master for 17.11, thanks to everybody involved!

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Tomás Cohen Arazi  changed:

   What|Removed |Added

 Status|Signed Off  |Passed QA

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #20 from Tomás Cohen Arazi  ---
Created attachment 67474
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67474=edit
Bug 18999: (QA followup) ModReceiveOrder expects a hashref

Signed-off-by: Tomas Cohen Arazi 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Tomás Cohen Arazi  changed:

   What|Removed |Added

  Attachment #67317|0   |1
is obsolete||
  Attachment #67318|0   |1
is obsolete||
  Attachment #67319|0   |1
is obsolete||

--- Comment #17 from Tomás Cohen Arazi  ---
Created attachment 67471
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67471=edit
Bug 18999: Add regression tests

Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
the t/db_dependent/Budgets.t

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

Signed-off-by: Lee Jamison 
Signed-off-by: Josef Moravec 
Signed-off-by: Tomas Cohen Arazi 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #19 from Tomás Cohen Arazi  ---
Created attachment 67473
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67473=edit
Bug 18999: Modified SQL query in GetBudgetSpent() in C4/Budgets.pm

Removed the SQL select condition 'AND closedate IS NOT NULL' because
this was not returning shippingcost values and it does not exist in the
SQL query to return the shipping cost in spent.pl

Also removed the retrieval of shipping cost and the associated addition
of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
to prevent the shipping costs being subtracted off the fund total twice

Test plan:
1. Go to Acquisition and create a currency, budget (make this value of
100), fund ( make this the value of 50), vendor (if
neccessary)

2. Create a basket and click 'Add to basket'

3. Add 2 items with the vendor price of 10

4. Click 'Receive shipment' and write in the shipment cost of 6

5. Click 'Finish receiving' and go back to Acquisitions

6. Notice the spent column value is 0.00 but if you click on the value then
the spent.pl page is displayed and shows that the shipment cost was 6.00

7. On the acquisition page also notice that the ordered column value is 26.00

8. Click on the name of the fund and notice the spent column value is
0.00 in the fund page table

9. Apply patch

10. Refresh acquisition page and notice that 6.00 is the value in the
Spent column and 20.00 is the value in the ordered column. Both of which
match the subtotal of the full-list tables displayed when you click on these
values

11. Also notice the spent value in the fund page table is 6.00

12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm
and check they make sense

Sponsored-by: Catalyst IT

Signed-off-by: Katrin Fischer 
Signed-off-by: Josef Moravec 
Signed-off-by: Tomas Cohen Arazi 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #18 from Tomás Cohen Arazi  ---
Created attachment 67472
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67472=edit
Bug 18999: (QA followup) Minor fixes for tests

Removed unneccessary declaration of $budget and changed
Koha::Acquisition::Order->new->insert into
Koha::Acquisition::Order->new->store as requested in tester feedback

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

Signed-off-by: Josef Moravec 
Signed-off-by: Tomas Cohen Arazi 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Nick Clemens  changed:

   What|Removed |Added

 CC||n...@bywatersolutions.com

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #16 from Josef Moravec  ---
Created attachment 67319
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67319=edit
Bug 18999 - Followup based on tester feedback

Removed unneccessary declaration of $budget and changed
Koha::Acquisition::Order->new->insert into
Koha::Acquisition::Order->new->store as requested in tester feedback

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

Signed-off-by: Josef Moravec 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Josef Moravec  changed:

   What|Removed |Added

  Attachment #67316|0   |1
is obsolete||

--- Comment #14 from Josef Moravec  ---
Created attachment 67317
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67317=edit
Bug 18999- Modified SQL query in GetBudgetSpent() in C4/Budgets.pm

Removed the SQL select condition 'AND closedate IS NOT NULL' because
this was not returning shippingcost values and it does not exist in the
SQL query to return the shipping cost in spent.pl

Also removed the retrieval of shipping cost and the associated addition
of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
to prevent the shipping costs being subtracted off the fund total twice

Test plan:
1. Go to Acquisition and create a currency, budget (make this value of
100), fund ( make this the value of 50), vendor (if
neccessary)

2. Create a basket and click 'Add to basket'

3. Add 2 items with the vendor price of 10

4. Click 'Receive shipment' and write in the shipment cost of 6

5. Click 'Finish receiving' and go back to Acquisitions

6. Notice the spent column value is 0.00 but if you click on the value then
the spent.pl page is displayed and shows that the shipment cost was 6.00

7. On the acquisition page also notice that the ordered column value is 26.00

8. Click on the name of the fund and notice the spent column value is
0.00 in the fund page table

9. Apply patch

10. Refresh acquisition page and notice that 6.00 is the value in the
Spent column and 20.00 is the value in the ordered column. Both of which
match the subtotal of the full-list tables displayed when you click on these
values

11. Also notice the spent value in the fund page table is 6.00

12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm
and check they make sense

Sponsored-by: Catalyst IT

Signed-off-by: Katrin Fischer 

Signed-off-by: Josef Moravec 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #15 from Josef Moravec  ---
Created attachment 67318
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67318=edit
Bug 18999 - Added regression test

Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
the t/db_dependent/Budgets.t

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

Signed-off-by: Lee Jamison 

Signed-off-by: Josef Moravec 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Josef Moravec  changed:

   What|Removed |Added

  Attachment #65626|0   |1
is obsolete||
  Attachment #66855|0   |1
is obsolete||
  Attachment #67173|0   |1
is obsolete||

--- Comment #13 from Josef Moravec  ---
Created attachment 67316
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67316=edit
Bug 18282: operationId must be unique

operationId has the following documentation:
 "Unique string used to identify the operation. The id MUST be unique among all
  operations described in the API."

This patch modifies operationIds to be unique accross our API operations.

Signed-off-by: Tomas Cohen Arazi 

Signed-off-by: Jonathan Druart 

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Josef Moravec  changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Alex Buckley  changed:

   What|Removed |Added

 Status|Failed QA   |Needs Signoff

--- Comment #12 from Alex Buckley  ---
Hi Tomas 

I have made the changes you requested in comment 10 on the new follow-up patch
applied, can you please test again

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #11 from Alex Buckley  ---
Created attachment 67173
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67173=edit
Bug 18999 - Followup based on tester feedback

Removed unneccessary declaration of $budget and changed
Koha::Acquisition::Order->new->insert into
Koha::Acquisition::Order->new->store as requested in tester feedback

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Tomás Cohen Arazi  changed:

   What|Removed |Added

 Status|Signed Off  |Failed QA

--- Comment #10 from Tomás Cohen Arazi  ---
Hi Alex, the tests you introduce:
- Mask an earlier declaration of $budget
- Call Koha::Acquisition::Order->new->insert is wrong (should probably be
->store)

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Tomás Cohen Arazi  changed:

   What|Removed |Added

 CC||tomasco...@gmail.com
 QA Contact|testo...@bugs.koha-communit |tomasco...@gmail.com
   |y.org   |

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Lee Jamison  changed:

   What|Removed |Added

  Attachment #66378|0   |1
is obsolete||

--- Comment #9 from Lee Jamison  ---
Created attachment 66855
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=66855=edit
Bug 18999 - Added regression test

Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
the t/db_dependent/Budgets.t

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

Signed-off-by: Lee Jamison 
All tests pass as expected

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Lee Jamison  changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Alex Buckley  changed:

   What|Removed |Added

 Status|Failed QA   |Needs Signoff

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #8 from Alex Buckley  ---
Created attachment 66378
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=66378=edit
Bug 18999 - Added regression test

Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
the t/db_dependent/Budgets.t

Test plan:
1. Go into your koha-shell

2. set the PERL5LIB variable

3. Run t/db_dependent/Budgets.t

All tests should pass

Sponsored-by: Catalyst IT

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Julian Maurice  changed:

   What|Removed |Added

 CC||julian.maur...@biblibre.com
 Status|Signed Off  |Failed QA

--- Comment #7 from Julian Maurice  ---
(In reply to Katrin Fischer from comment #6)
> QA might ask for a regression test here.

Yes :)
A regression test would be really useful.

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Jonathan Druart  changed:

   What|Removed |Added

 CC||jonathan.dru...@bugs.koha-c
   ||ommunity.org
   Assignee|koha-b...@lists.koha-commun |alexbuck...@catalyst.net.nz
   |ity.org |

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Marjorie Barry-Vila  changed:

   What|Removed |Added

 CC||marjorie.barry-v...@ccsr.qc
   ||.ca

-- 
You are receiving this mail because:
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Katrin Fischer  changed:

   What|Removed |Added

  Attachment #65446|0   |1
is obsolete||

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #6 from Katrin Fischer  ---
QA might ask for a regression test here.

Note: All Acquisition related tests still pass for me (Acquisitions.t,
Acquisition/*, Budgets.t)

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #5 from Katrin Fischer  ---
Created attachment 65626
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=65626=edit
[SIGNED OFF] Bug 18999- Modified SQL query in GetBudgetSpent() in C4/Budgets.pm

Removed the SQL select condition 'AND closedate IS NOT NULL' because
this was not returning shippingcost values and it does not exist in the
SQL query to return the shipping cost in spent.pl

Also removed the retrieval of shipping cost and the associated addition
of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
to prevent the shipping costs being subtracted off the fund total twice

Test plan:
1. Go to Acquisition and create a currency, budget (make this value of
100), fund ( make this the value of 50), vendor (if
neccessary)

2. Create a basket and click 'Add to basket'

3. Add 2 items with the vendor price of 10

4. Click 'Receive shipment' and write in the shipment cost of 6

5. Click 'Finish receiving' and go back to Acquisitions

6. Notice the spent column value is 0.00 but if you click on the value then
the spent.pl page is displayed and shows that the shipment cost was 6.00

7. On the acquisition page also notice that the ordered column value is 26.00

8. Click on the name of the fund and notice the spent column value is
0.00 in the fund page table

9. Apply patch

10. Refresh acquisition page and notice that 6.00 is the value in the
Spent column and 20.00 is the value in the ordered column. Both of which
match the subtotal of the full-list tables displayed when you click on these
values

11. Also notice the spent value in the fund page table is 6.00

12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm
and check they make sense

Sponsored-by: Catalyst IT

Signed-off-by: Katrin Fischer 

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Katrin Fischer  changed:

   What|Removed |Added

 Status|Needs Signoff   |Signed Off

--- Comment #4 from Katrin Fischer  ---
There is a slight change in behaviour from these patches, but after giving it
some thought, I think it makes more sense this way:

Before:
- Receive the order, but invoice is not closed
- Acq home: 
  - shipping cost is added to 'ordered', but not shown in list (not ok)
- Fund table:
  - shipping cost is added to 'total ordered'
- Close invoice
- Acq home:
  - shipping cost is NOT added to 'spent' and shows in list (not ok)
- Fund table:
  - shipping cost is added to 'total spent'

After:
- Receive the order, but invoice is not closed
- Acq home:
  - shipping cost is added to 'spent' and shows in list (ok)
- Fund table:
  - shipping cost is added to 'total spent'
- Close invoice
- Acq home:
  - shipping cost is added to 'spent' and shows in list (ok)
- Fund table:
  - shipping cost is added to 'total spent'

So with the new patch the funds table and acq table always match, which is
good. Also the sum on the acq home page for 'spent' and the sum on the linked
list of ordered items match.

There is no longer a different behaviour for open/closed invoiced. But as this
was only applying to the shipping cost and not the cost for the items itself,
it seems more consistent this way.

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #3 from Alex Buckley  ---
Thanks Katrin that would be great :)

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #2 from Katrin Fischer  ---
Thx Alex! I hope to be able to test soon!

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

Alex Buckley  changed:

   What|Removed |Added

 Status|NEW |Needs Signoff
 CC||alexbuck...@catalyst.net.nz

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-bugs] [Bug 18999] Acq: Shipping cost not included in total spent on acq home and funds page

[bugzilla-daemon]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18999

--- Comment #1 from Alex Buckley  ---
Created attachment 65446
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=65446=edit
Bug 18999- Modified SQL query in GetBudgetSpent() in C4/Budgets.pm

Removed the SQL select condition 'AND closedate IS NOT NULL' because
this was not returning shippingcost values and it does not exist in the
SQL query to return the shipping cost in spent.pl

Also removed the retrieval of shipping cost and the associated addition
of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
to prevent the shipping costs being subtracted off the fund total twice

Test plan:
1. Go to Acquisition and create a currency, budget (make this value of
100), fund ( make this the value of 50), vendor (if
neccessary)

2. Create a basket and click 'Add to basket'

3. Add 2 items with the vendor price of 10

4. Click 'Receive shipment' and write in the shipment cost of 6

5. Click 'Finish receiving' and go back to Acquisitions

6. Notice the spent column value is 0.00 but if you click on the value then
the spent.pl page is displayed and shows that the shipment cost was 6.00

7. On the acquisition page also notice that the ordered column value is 26.00

8. Click on the name of the fund and notice the spent column value is
0.00 in the fund page table

9. Apply patch

10. Refresh acquisition page and notice that 6.00 is the value in the
Spent column and 20.00 is the value in the ordered column. Both of which
match the subtotal of the full-list tables displayed when you click on these
values

11. Also notice the spent value in the fund page table is 6.00

12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm
and check they make sense

Sponsored-by: Catalyst IT

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the assignee for the bug.
___
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/