Attachment 48871 Details for Bug 13321 – Bug 13321: Csv export - Display rrp and ecost with and without taxes

[patch] Bug 13321: Csv export - Display rrp and ecost with and without taxes

Bug-13321-Csv-export---Display-rrp-and-ecost-with-.patch (text/plain), 4.42 KB, created by Julian Maurice on 2016-03-09 14:50:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2016-03-09 14:50:52 UTC

Size: 4.42 KB

patch

obsolete

>From 947d9e1dedb0ce3b0c96886dd0f0de98b6f9b986 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Mon, 15 Dec 2014 16:32:15 +0100
>Subject: [PATCH] Bug 13321: Csv export - Display rrp and ecost with and
> without taxes
>
>If a basketgroup is exported as a CSV file, both prices should be displayed to
>avoid confusion.
>
>Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
>
>Signed-off-by: Francois Charbonnier <francois.charbonnier@inlibro.com>
>
>Signed-off-by: Sonia Bouis <sonia.bouis@univ-lyon3.fr>
>---
> C4/Acquisition.pm                                                   | 6 ++++--
> .../intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt    | 3 ++-
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 19572a2..dd385da 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -367,9 +367,11 @@ sub GetBasketGroupAsCSV {
>                 collectiontitle => $bd->{collectiontitle},
>                 isbn => $order->{isbn},
>                 quantity => $order->{quantity},
>-                rrp => $order->{rrp},
>+                rrp_tax_included => $order->{rrp_tax_included},
>+                rrp_tax_excluded => $order->{rrp_tax_excluded},
>                 discount => $bookseller->{discount},
>-                ecost => $order->{ecost},
>+                ecost_tax_included => $order->{ecost_tax_included},
>+                ecost_tax_excluded => $order->{ecost_tax_excluded},
>                 notes => $order->{order_vendornote},
>                 entrydate => $order->{entrydate},
>                 booksellername => $bookseller->{name},
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
>index de07b35..d28d8f8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/basketgroup.tt
>@@ -1 +1 @@
>-Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP,Discount,Estimated cost,Note for vendor,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place
>+Account number,Basket name,Order number,Author,Title,Publisher,Publication year,Collection title,ISBN,Quantity,RRP tax included, RRP tax excluded,Discount,Estimated cost tax included,Estimated cost tax excluded,Note for vendor,Entry date,Bookseller name,Bookseller physical address,Bookseller postal address,Contract number,Contract name,Basket group delivery place,Basket group billing place,Basket delivery place,Basket billing place
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt
>index 21fb4d3..e314194 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt
>@@ -1,3 +1,4 @@
>+[% USE Price %]
> [% INCLUDE csv_headers/acqui/basketgroup.tt %]
>-[% FOREACH r IN rows %][% r.clientnumber %],"[% r.basketname %]",[% r.ordernumber %],"[% r.author %]","[% r.title %]","[% r.publishercode %]",[% r.publicationyear %],"[% r.collectiontitle %]",[% r.isbn %],[% r.quantity %],[% r.rrp %],[% r.discount %],[% r.ecost %],"[% r.notes %]",[% r.entrydate %],"[% r.booksellername %]","[% r.bookselleraddress %]","[% r.booksellerpostal %]",[% r.contractnumber %],"[% r.contractname %]","[% r.basketgroupdeliveryplace %]","[% r.basketgroupbillingplace %]","[% r.basketdeliveryplace %]","[% r.basketbillingplace %]"
>+[% FOREACH r IN rows %][% r.clientnumber %],"[% r.basketname %]",[% r.ordernumber %],"[% r.author %]","[% r.title %]","[% r.publishercode %]",[% r.publicationyear %],"[% r.collectiontitle %]",[% r.isbn %],[% r.quantity %],[% r.rrp_tax_included | $Price %],[% r.rrp_tax_excluded | $Price %],[% r.discount %],[% r.ecost_tax_included | $Price %],[% r.ecost_tax_excluded | $Price %],"[% r.notes %]",[% r.entrydate %],"[% r.booksellername %]","[% r.bookselleraddress %]","[% r.booksellerpostal %]",[% r.contractnumber %],"[% r.contractname %]","[% r.basketgroupdeliveryplace %]","[% r.basketgroupbillingplace %]","[% r.basketdeliveryplace %]","[% r.basketbillingplace %]"
> [% END %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 13321: 33789 | 33790 | 33791 | 33792 | 33793 | 34432 | 35152 | 35165 | 47489 | 47490 | 47491 | 47492 | 47493 | 47494 | 48867 | 48868 | 48869 | 48870 | 48871 | 48872 | 51080 | 51081 | 51082 | 51083 | 51084 | 51085 | 51643 | 51644 | 51645 | 51646 | 51647 | 51648 | 51649 | 52046 | 55168 | 55415 | 55416 | 55417 | 55418 | 55419 | 55420 | 55421 | 55422 | 55423 | 55427 | 56408 | 56422 | 56423 | 56424 | 56425 | 56426 | 56427 | 56428 | 56429 | 56430 | 56431 | 56432 | 56898 | 56899 | 56900 | 56901 | 56902 | 56903 | 56904 | 56905 | 56906 | 56907 | 56908 | 56909 | 56930 | 56959