Bug 15503 [Followup] - Add replacementprice and itemcallnumber

Signed-off-by: Benjamin Daeuber <bdaeuber@cityoffargo.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index ea5fa0f..c9b9ae8 100755 (executable)
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -213,6 +213,8 @@ if ($op eq ""){
         my @copynos = $input->multi_param('copyno_' . $biblio_count);
         my @budget_codes = $input->multi_param('budget_code_' . $biblio_count);
         my @itemprices = $input->multi_param('itemprice_' . $biblio_count);
+        my @replacementprices = $input->multi_param('replacementprice_' . $biblio_count);
+        my @itemcallnumbers = $input->multi_param('itemcallnumber_' . $biblio_count);
         my $itemcreation = 0;
         for (my $i = 0; $i < $count; $i++) {
             $itemcreation = 1;
@@ -227,6 +229,8 @@ if ($op eq ""){
                 uri => $uris[$i],
                 copynumber => $copynos[$i],
                 price => $itemprices[$i],
+                replacementprice => $replacementprices[$i],
+                itemcallnumber => $itemcallnumbers[$i],
             }, $biblionumber);
         }
         if ($itemcreation == 1) {
@@ -519,7 +523,7 @@ sub import_biblios_list {
         # Items
         my @itemlist = ();
         my $all_items_quantity = 0;
-        my $alliteminfos = get_infos_syspref_on_item('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'quantity', 'budget_code']);
+        my $alliteminfos = get_infos_syspref_on_item('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code']);
         if ($alliteminfos != -1) {
             foreach my $iteminfos (@$alliteminfos) {
                 my $item_homebranch = $iteminfos->{homebranch};
@@ -535,6 +539,8 @@ sub import_biblios_list {
                 my $item_quantity = $iteminfos->{quantity} || 1;
                 my $item_budget_code = $iteminfos->{budget_code};
                 my $item_price = $iteminfos->{price};
+                my $item_replacement_price = $iteminfos->{replacementprice};
+                my $item_callnumber = $iteminfos->{itemcallnumber};
 
                 for (my $i = 0; $i < $item_quantity; $i++) {
 
@@ -554,6 +560,8 @@ sub import_biblios_list {
                         'quantity' => $item_quantity,
                         'budget_code' => $item_budget_code || $budget_code,
                         'itemprice' => $item_price || $price,
+                        'replacementprice' => $item_replacement_price,
+                        'itemcallnumber' => $item_callnumber,
                     );
                     $all_items_quantity++;
                     push @itemlist, \%itemrecord;

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 b7ef10a..939b466 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -383,6 +383,8 @@
                         </select>
                         </li>
                         <li><label for="price_item_[% item.item_id %]">price</label><input type="text" id="price_item_[% item.item_id %]" name="itemprice_[% item.biblio_count %]" value="[% item.itemprice %]"></li>
+                        <li><label for="replacementprice_item_[% item.item_id %]">replacement price</label><input type="text" id="replacementprice_item_[% item.item_id %]" name="replacementprice_[% item.biblio_count %]" value="[% item.replacementprice %]"></li>
+                        <li><label for="callnumber_item_[% item.item_id %]">callnumber</label><input type="text" id="callnumber_item_[% item.item_id %]" name="itemcallnumber_[% item.biblio_count %]" value="[% item.itemcallnumber %]"></li>
                         </ol>
                         </fieldset>
                         [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index d3cf4a7..99d0e03 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -66,7 +66,7 @@ Acquisitions:
             - Set the mapping values for new item records created from a MARC record in a staged file.
             - pref: MarcItemFieldsToOrder
               type: textarea
-            - "You can use the following fields: homebranch, holdingbranch, itype, nonpublic_note, public_note, loc, ccode, notforloan, uri, copyno and price. Special fields: quantity and budget_code"
+            - "You can use the following fields: homebranch, holdingbranch, itype, nonpublic_note, public_note, loc, ccode, notforloan, uri, copyno, price, replacementprice and itemcallnumber. Special fields: quantity and budget_code"
             - "<br/>For example:<br/>holdingbranch: 975$b<br/>itype: 975$9|975$z"
         -
             - pref: ClaimsBccCopy