From afe48a014bb819da3d39503a107ec656e6d49a5e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 18 Jul 2019 13:08:18 +0000 Subject: [PATCH] Bug 23338: Allow specifying order level replacement price when adding to basket from file To test: 0 - Clear MarcFieldsToOrder and MarcItemFieldsToOrder preferences 1 - Have a budget/fund/vendor in acquisitions 2 - Create or find a basket for vendor 3 - Add to basket from a file or staged batch (can use any record) 4 - Note there is no option for replacement price 5 - Add the order 6 - Replacement price is 0 - you must modify order or set upon receiving 7 - Apply patch 8 - Repeat 9 - Disable matchign check during add to basket 10 - Note you can specify a replacement price 11 - Do so 12 - Note it is saved in order Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 95fe32e224af1c4ac9deb7d1b5dbe668053f8a47) Signed-off-by: Fridolin Somers (cherry picked from commit 543bf219294b3b20c4a6b019851278235f5334c6) --- acqui/addorderiso2709.pl | 2 ++ .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 8e0f9ff1e2..4d0aa5dec6 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -140,6 +140,7 @@ if ($op eq ""){ my @import_record_id_selected = $input->multi_param("import_record_id"); my @quantities = $input->multi_param('quantity'); my @prices = $input->multi_param('price'); + my @orderreplacementprices = $input->multi_param('replacementprice'); my @budgets_id = $input->multi_param('budget_id'); my @discount = $input->multi_param('discount'); my @sort1 = $input->multi_param('sort1'); @@ -317,6 +318,7 @@ if ($op eq ""){ order_internalnote => $cgiparams->{'all_order_internalnote'}, order_vendornote => $cgiparams->{'all_order_vendornote'}, currency => $cgiparams->{'all_currency'}, + replacementprice => shift( @orderreplacementprices ), ); # get the price if there is one. my $price= shift( @prices ) || GetMarcPrice($marcrecord, C4::Context->preference('marcflavour')); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index ac128b06ac..84d83f2c53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -218,6 +218,10 @@ +
  • + + +
  • % -- 2.39.5