From 94955a4f566cd6a8ffe3510681cb99adbd586179 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Wed, 21 Dec 2011 10:12:46 +0000
Subject: [PATCH] // Fix unit price calculation and display in BO

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11461 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/products/prices.tpl | 4 ++--
 controllers/admin/AdminProductsController.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl
index 889fd16fb..eb1cda8c2 100644
--- a/admin-dev/themes/template/products/prices.tpl
+++ b/admin-dev/themes/template/products/prices.tpl
@@ -205,12 +205,12 @@ jQuery(document).ready(Customer.init);
 		<tr id="tr_unit_price">
 			<td class="col-left"><label>{l s='Unit price:'}</label></td>
 			<td style="padding-bottom:5px;">
-				{$currency->prefix} <input size="11" maxlength="14" id="unit_price" name="unit_price" type="text" value="{$product->unit_price}"
+				{$currency->prefix} <input size="11" maxlength="14" id="unit_price" name="unit_price" type="text" value="{$unit_price}"
 					onkeyup="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); unitPriceWithTax('unit');"/>{$currency->suffix}
 				{l s='/'} <!--<input size="6" maxlength="10" id="unity" name="unity" type="text" value="{$product->unity|htmlentitiesUTF8}" onkeyup="if (isArrowKey(event)) return ;unitySecond();" onchange="unitySecond();"/> -->
 				<select onchange="unitySecond();" name="unity" id="unity">
 					{foreach $unities as $unity}
-						<option value="{$unity}">{$unity}</option>
+						<option value="{$unity}" {if $unity == $product->unity} selected="selected"{/if}>{$unity}</option>
 					{/foreach}
 				</select>
 				{if $ps_tax && $country_display_tax_label}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index fde5cc009..dbaeeb7eb 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2605,7 +2605,7 @@ class AdminProductsControllerCore extends AdminController
 
 		$data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX'));
 		if ($product->unit_price_ratio != 0)
-			$data->assign('unit_price', Tools::ps_round($product->price) / $product->unit_price_ratio);
+			$data->assign('unit_price', Tools::ps_round($product->price / $product->unit_price_ratio, 2));
 		else
 			$data->assign('unit_price', 0);