Bugzilla – Attachment 60249 Details for
Bug 18115
Fix use of Objects as hashref in acqui/addorderiso2709.pl - Bug 15503 followup
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18115 - Fix use of Objects as hashref in acqui/addorderiso2709.pl - Bug 15503 followup
Bug-18115---Fix-use-of-Objects-as-hashref-in-acqui.patch (text/plain), 3.79 KB, created by
Kyle M Hall (khall)
on 2017-02-15 11:24:52 UTC
(
hide
)
Description:
Bug 18115 - Fix use of Objects as hashref in acqui/addorderiso2709.pl - Bug 15503 followup
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2017-02-15 11:24:52 UTC
Size:
3.79 KB
patch
obsolete
>From 702e74467befdff0c45e27b02160724d61e866ac Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 14 Feb 2017 16:29:18 +0000 >Subject: [PATCH] Bug 18115 - Fix use of Objects as hashref in > acqui/addorderiso2709.pl - Bug 15503 followup > >To test: >Use a vendor with values in gstrate, listincgst, discount and ensure they are used correctly in plan from 15503 > >Bug 15503 test plan: >1) Edit the MarcItemFieldsToOrder syspref. For example: >homebranch: 975$a >holdingbranch: 975$b >itype: 975$9|975$z >nonpublic_note: 975$x >public_note: 975$y >loc: 975$8 >ccode: 975$c >notforloan: 975$7 >uri: 975$u >copyno: 975$n >quantity: 969$h >budget_code: 922$a >price: 975$p > >2) Create some sample records in koha with values in these fields, then save them as Unicode-UTF-8 >Example: >922 _aBudget_code_1 >922 _aBudget_code_2 >969 _h3 >969 _h1 >975 _71 > _8loc > _9CD > _aHomebranch_1 > _bHoldingbranch_1 > _cccode_1 > _ncopyno > _uuri > _xnonpublic_note > _ypublic_note > _p12.5 >975 _70 > _8loc2 > _aHomebranch_2 > _bHoldingbranch_2 > _cccode_2 > _ncopyno2 > _uuri2 > _xnonpublic_note2 > _ypublic_note2 > _zDVD > _p22 > >3) Import your test records with the import tool (Stage MARC records for import) > >4) Choose a basket, then click on "Add to basket" => "From a staged file" > >5) Choose the file you have imported. For each record that had item informations, you will have a preview of the item that will be created on the left side of the screen. Values can still be modified at this point. Save. > >6) Check that the items and corresponding order lines have been created. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > acqui/addorderiso2709.pl | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl >index 18ba56e..04aa5fd 100755 >--- a/acqui/addorderiso2709.pl >+++ b/acqui/addorderiso2709.pl >@@ -259,9 +259,9 @@ if ($op eq ""){ > # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation > $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR"; > $price = Koha::Number::Price->new($price)->unformat; >- $orderinfo{gstrate} = $bookseller->{gstrate}; >- my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100; >- if ( $bookseller->{listincgst} ) { >+ $orderinfo{gstrate} = $bookseller->gstrate; >+ my $c = $c_discount ? $c_discount : $bookseller->discount / 100; >+ if ( $bookseller->listincgst ) { > if ( $c_discount ) { > $orderinfo{ecost} = $price; > $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); >@@ -327,9 +327,9 @@ if ($op eq ""){ > # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation > $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR"; > $price = Koha::Number::Price->new($price)->unformat; >- $orderinfo{gstrate} = $bookseller->{gstrate}; >- my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100; >- if ( $bookseller->{listincgst} ) { >+ $orderinfo{gstrate} = $bookseller->gstrate; >+ my $c = $c_discount ? $c_discount : $bookseller->discount / 100; >+ if ( $bookseller->listincgst ) { > if ( $c_discount ) { > $orderinfo{ecost} = $price; > $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); >-- >2.1.4
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 18115
:
60217
|
60249
|
60811
|
60834
|
60888