From 0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5 Mon Sep 17 00:00:00 2001
From: Maxime Pelletier <maxime.pelletier@libeo.com>
Date: Wed, 21 Sep 2011 14:15:39 -0400
Subject: [PATCH] Use unitprice in neworder so that the value is saved in the
 database and so it will be the same field used as to receive shipments

http://bugs.koha-community.org/show_bug.cgi?id=6414
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 acqui/neworderempty.pl                                        | 1 +
 .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6361125eee..02b829a409 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -383,6 +383,7 @@ $template->param(
     listprice        => sprintf("%.2f", $data->{'listprice'}||$data->{'price'}||$listprice),
     total            => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
     ecost            => $data->{'ecost'},
+    unitprice        => sprintf("%.2f", $data->{'unitprice'}),
     notes            => $data->{'notes'},
     publishercode    => $data->{'publishercode'},
     
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 39e9ca26dc..e74a0e5d31 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -416,10 +416,10 @@ $(document).ready(function()
             <li>
                 [% IF ( close ) %]
             <label for="cost">Actual cost: </label>
-                <input type="text" id="cost" size="20" name="cost" value="[% ecost %]" readonly="readonly" />
+                <input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" readonly="readonly" />
                 [% ELSE %]
                 <label for="cost">Actual cost: </label>
-                <input type="text" id="cost" size="20" name="cost" value="[% ecost %]" />
+                <input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" />
                 [% END %]
             </li>
             <li>
-- 
2.39.5