From 06b8e939bd070ec6e28869ac86d0743196aba2a2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Tue, 20 Aug 2013 12:04:01 +0200
Subject: [PATCH] manage user permissions for margin rate

---
 .../core/tpl/freeproductline_create.tpl.php   | 34 +++++++++--
 .../tpl/predefinedproductline_create.tpl.php  | 59 ++++++++++++++-----
 2 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 85d310c39c7..2bf8a55a3d0 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -61,13 +61,21 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
 		?>
 		</td>
 		<?php
-		if(! empty($conf->global->DISPLAY_MARGIN_RATES))
+		if ($user->rights->margins->creer)
 		{
-			echo '<td align="right">'.$langs->trans('MarginRate').'</td>';
+			if(! empty($conf->global->DISPLAY_MARGIN_RATES))
+			{
+				echo '<td align="right">'.$langs->trans('MarginRate').'</td>';
+			}
+			if(! empty($conf->global->DISPLAY_MARK_RATES))
+			{
+				echo '<td align="right">'.$langs->trans('MarkRate').'</td>';
+			}
 		}
-		if(! empty($conf->global->DISPLAY_MARK_RATES))
+		else
 		{
-			echo '<td align="right">'.$langs->trans('MarkRate').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+			if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
 		}
 	}
 	?>
@@ -125,12 +133,26 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob
 			value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
 		</td>
 		<?php
+		if ($user->rights->margins->creer)
+		{
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				echo '<td align="right"><input type="text" size="2" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'">%</td>';
 			}
 			elseif (! empty($conf->global->DISPLAY_MARK_RATES)) {
 				echo '<td align="right"><input type="text" size="2" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'">%</td>';
 			}
+		}
+		else
+		{
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				$colspan++;
+				$coldisplay++;
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+				$colspan++;
+				$coldisplay++;
+			}
+		}
 	}
 	?>
 	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>"><input type="submit" class="button" value="<?php echo $langs->trans('Add'); ?>" name="addline"></td>
@@ -190,7 +212,9 @@ if (! empty($conf->service->enabled) && $dateSelector)
 
 </form>
 
-<?php if ($conf->margin->enabled) { ?>
+<?php if ($conf->margin->enabled && $user->rights->margins->creer)
+{
+?>
 <script type="text/javascript">
 	var npRate = null;
 <?php
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index a3fd98b6322..7fdc03d5169 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -63,14 +63,6 @@ jQuery(document).ready(function() {
 $colspan = 4;
 if (! empty($usemargins))
 {
-	if(! empty($conf->global->DISPLAY_MARGIN_RATES))
-	{
-	echo '<td align="right">'.$langs->trans('MarginRate').'</td>';
-	}
-	if(! empty($conf->global->DISPLAY_MARK_RATES))
-	{
-	echo '<td align="right">'.$langs->trans('MarkRate').'</td>';
-	}
 	?>
 	<td align="right">
 	<?php
@@ -78,6 +70,23 @@ if (! empty($usemargins))
 		echo $langs->trans('BuyingPrice');
 	else
 		echo $langs->trans('CostPrice');
+
+	if ($user->rights->margins->creer)
+	{
+		if(! empty($conf->global->DISPLAY_MARGIN_RATES))
+		{
+			echo '<td align="right">'.$langs->trans('MarginRate').'</td>';
+		}
+		if(! empty($conf->global->DISPLAY_MARK_RATES))
+		{
+			echo '<td align="right">'.$langs->trans('MarkRate').'</td>';
+		}
+	}
+	else
+	{
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+		if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
+	}
 	?>
 	</td>
 	<?php
@@ -125,18 +134,32 @@ else {
 	$colspan = 4;
 	if (! empty($usemargins))
 	{
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-			echo '<td align="right"><input type="text" size="2" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'">%</td>';
-		}
-		elseif (! empty($conf->global->DISPLAY_MARK_RATES)) {
-			echo '<td align="right"><input type="text" size="2" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'">%</td>';
-		}
 		?>
 		<td align="right">
 			<select id="fournprice" name="fournprice" class="flat" style="display: none;"></select>
 			<input type="text" size="5" id="buying_price" name="buying_price" class="flat" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
 		</td>
 		<?php
+		if ($user->rights->margins->creer)
+		{
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				echo '<td align="right"><input type="text" size="2" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'">%</td>';
+			}
+			elseif (! empty($conf->global->DISPLAY_MARK_RATES)) {
+				echo '<td align="right"><input type="text" size="2" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'">%</td>';
+			}
+		}
+		else
+		{
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				$colspan++;
+				$coldisplay++;
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+				$colspan++;
+				$coldisplay++;
+			}
+		}
 	}
 	?>
 	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
@@ -204,6 +227,10 @@ if (! empty($usemargins))
 {
 ?>
 	<script type="text/javascript">
+<?php
+	if ($user->rights->margins->creer)
+	{
+?>
 	var npRate = null;
 <?php
 	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
@@ -294,7 +321,9 @@ if (! empty($usemargins))
 	function formatFloat(num) {
 		return roundFloat(num).replace('.', ',');
 	}
-
+<?php
+	}
+?>
 	$("#idprod").change(function() {
 	  $("#fournprice options").remove();
 	  $("#fournprice").hide();