[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.11-44-g04f5f02a21

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 19.05.x has been updated
       via  04f5f02a2191578e03dcb8373d235fca9b8930fd (commit)
       via  783eeb323cb2bc50c113192df57f2f8f185b7423 (commit)
      from  9970739c2be2dbe853dbda5717bd4ccdc2d07072 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 04f5f02a2191578e03dcb8373d235fca9b8930fd
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sat May 30 00:56:04 2020 +0000

    Bug 25545: (follow-up) Fix capitalization
    
    Total + Adjustments + Shipment cost ($)
    
    changed to:
    Total + adjustments + shipment cost ($)
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit f98f2edf0a1515ce727e670ecaecd4f9295f34cb)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 31969accb3dd74ee103c1d7d9fb77141210b1658)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    (cherry picked from commit 42f885d5b7c4c7299f80309d2962fd8a7183393f)
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>

commit 783eeb323cb2bc50c113192df57f2f8f185b7423
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed May 27 10:38:03 2020 +0000

    Bug 25545: Add adjustments to total tax included
    
    Adjustments are not affected by tax, they are meant as a way to alter invoice
    values after receiving (damaged items, refuneds, extra charges, etc)
    
    When adjustments were added the tax included column was missed
    
    To test:
    - Add a basket with at least one order
    - Close it
    - Receive shipment
    - Receive the order
    - Finish receiving
    - Add an adjustment of any amount
    - Verify in the invoice details table:
      - Total tax exc. is showing including the adjustmnt
      - Total tax inc. is missing the adjustment
    - Apply patch
    - Reload
      - Total tax exc. is showing including the adjustmnt
      - Total tax inc. is showing including the adjustment
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 286a739b5cd906a55b2dc97e6ab1ef9ffb00a6f7)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 4be984e5e037b2c9767cb6c085e37ba20b3a8448)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    (cherry picked from commit 7cb30b79d71a663e038fdca32ae60b431b4af9c9)
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>

-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository