From 770ce6b4ccbb22da54398ac8a524b07fdddd8c1d Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Thu, 29 Jan 2015 10:43:46 +0100
Subject: [PATCH] =?UTF-8?q?[CORE]=20renomage=20d=20evariables=20pour=20?=
 =?UTF-8?q?=C3=AAtre=20en=20rapport=20avec=20le=20module=20(#new=5Fask=5Fp?=
 =?UTF-8?q?rice).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/askpricesupplier.php                              | 4 ++--
 htdocs/comm/askpricesupplier/class/askpricesupplier.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/askpricesupplier.php b/htdocs/comm/askpricesupplier.php
index f1ea1cde9f0..da35edf54a9 100644
--- a/htdocs/comm/askpricesupplier.php
+++ b/htdocs/comm/askpricesupplier.php
@@ -2028,7 +2028,7 @@ if ($action == 'create')
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 
 	// Form to add new line
-	if ($object->statut == 0 && $user->rights->propal->creer)
+	if ($object->statut == 0 && $user->rights->askpricesupplier->creer)
 	{
 		if ($action != 'editline')
 		{
@@ -2117,7 +2117,7 @@ if ($action == 'create')
 
 				// Send
 				if ($object->statut == 1 || $object->statut == 2) {
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->askpricesupplier->propal_advance->send) {
+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->askpricesupplier->send) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
index 2deb897a192..49af98252e4 100644
--- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
+++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
@@ -1335,7 +1335,7 @@ class AskPriceSupplier extends CommonObject
         $now=dol_now();
 
         if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->propal_advance->validate)))
+       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->askpricesupplier->validate)))
         {
             $this->db->begin();