--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_card.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_card.php
@@ -15 +14,0 @@
- * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>

@@ -37 +35,0 @@
-// Load Dolibarr environment

@@ -48 +46 @@
-if (isModEnabled('project')) {

+if (!empty($conf->projet->enabled)) {

@@ -55 +53 @@
-if (isModEnabled('margin')) {

+if (!empty($conf->margin->enabled))

@@ -57 +54,0 @@
-}

@@ -64,5 +61 @@
-$action = GETPOST('action', 'aZ09');

-$cancel = GETPOST('cancel', 'alpha');

-$backtopage = GETPOST('backtopage', 'alpha');

-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');

-

+$action = GETPOST('action', 'alpha');

@@ -71,0 +65 @@
+$projectid = GETPOST('projectid', 'int');

@@ -74,2 +67,0 @@
-$projectid = GETPOST('projectid', 'int');

-$rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;

@@ -78,3 +70,3 @@
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));

-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));

-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));

+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));

+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));

+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));

@@ -83,0 +76,4 @@
+

+// Security check

+if (!empty($user->socid)) $socid = $user->socid;

+$result = restrictedArea($user, 'supplier_proposal', $id);

@@ -97 +93 @@
-	if ($ret > 0) {

+	if ($ret > 0)

@@ -99,5 +95,2 @@
-	}

-	if ($ret <= 0) {

-		setEventMessages($object->error, $object->errors, 'errors');

-		$action = '';

-	}

+	if ($ret < 0)

+		dol_print_error('', $object->error);

@@ -106,24 +99,3 @@
-// Common permissions

-$usercanread = $user->rights->supplier_proposal->lire;

-$usercancreate		= $user->rights->supplier_proposal->creer;

-$usercandelete		= $user->rights->supplier_proposal->supprimer;

-

-// Advanced permissions

-$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->supplier_proposal->validate_advance)));

-$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->rights->supplier_proposal->send_advance);

-

-// Additional area permissions

-$usercanclose = $user->rights->supplier_proposal->cloturer;

-$usercancreateorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);

-

-// Permissions for includes

-$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php

-$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php

-$permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php

-$permissiontoadd = $usercancreate;

-

-// Security check

-if (!empty($user->socid)) {

-	$socid = $user->socid;

-}

-$result = restrictedArea($user, 'supplier_proposal', $object->id);

+$permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php

+$permissiondellink = $user->rights->supplier_proposal->creer; // Used by the include of actions_dellink.inc.php

+$permissiontoedit = $user->rights->supplier_proposal->creer; // Used by the include of actions_lineupdown.inc.php

@@ -138,22 +110,8 @@
-if ($reshook < 0) {

-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-}

-

-if (empty($reshook)) {

-	$backurlforlist = DOL_URL_ROOT.'/supplier_proposal/list.php';

-

-	if (empty($backtopage) || ($cancel && empty($id))) {

-		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {

-			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {

-				$backtopage = $backurlforlist;

-			} else {

-				$backtopage = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');

-			}

-		}

-	}

-

-	if ($cancel) {

-		if (!empty($backtopageforcancel)) {

-			header("Location: ".$backtopageforcancel);

-			exit;

-		} elseif (!empty($backtopage)) {

+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+

+if (empty($reshook))

+{

+	if ($cancel)

+	{

+		if (!empty($backtopage))

+		{

@@ -173,2 +131,4 @@
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {

-		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {

+	if ($action == 'confirm_clone' && $confirm == 'yes')

+	{

+		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))

+		{

@@ -176 +136,3 @@
-		} else {

+		}

+		else

+		{

@@ -182 +144,3 @@
-				} else {

+				}

+				else

+				{

@@ -188,2 +152,5 @@
-	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {

-		// Delete askprice

+	}

+

+	// Delete askprice

+	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->supplier_proposal->supprimer)

+	{

@@ -198,2 +165,5 @@
-	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {

-		// Remove line

+	}

+

+	// Remove line

+	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->supplier_proposal->creer)

+	{

@@ -202 +172 @@
-		if ($result > 0) {

+		if ($result)

@@ -204,6 +174,2 @@
-		} else {

-			$langs->load("errors");

-			setEventMessages($object->error, $object->errors, 'errors');

-		}

-

-		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {

+

+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {

@@ -212 +178 @@
-			if (getDolGlobalInt('MAIN_MULTILANGS')) {

+			if (!empty($conf->global->MAIN_MULTILANGS)) {

@@ -218,4 +184 @@
-			if ($ret > 0) {

-				$object->fetch_thirdparty();

-			}

-			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

@@ -226,2 +189,8 @@
-	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {

-		// Validation

+	}

+

+	// Validation

+	elseif ($action == 'confirm_validate' && $confirm == 'yes' &&

+		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))

+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))

+	)

+	{

@@ -229,21 +198,20 @@
-		if ($result >= 0) {

-			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {

-				$outputlangs = $langs;

-				$newlang = '';

-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-					$newlang = GETPOST('lang_id', 'aZ09');

-				}

-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {

-					$newlang = $object->thirdparty->default_lang;

-				}

-				if (!empty($newlang)) {

-					$outputlangs = new Translate("", $conf);

-					$outputlangs->setDefaultLang($newlang);

-				}

-				$model = $object->model_pdf;

-				$ret = $object->fetch($id); // Reload to get new records

-				if ($ret > 0) {

-					$object->fetch_thirdparty();

-				}

-

-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);

+		if ($result >= 0)

+		{

+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))

+			{

+						// Define output language

+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))

+				{

+					$outputlangs = $langs;

+					$newlang = '';

+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

+					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;

+					if (!empty($newlang)) {

+						$outputlangs = new Translate("", $conf);

+						$outputlangs->setDefaultLang($newlang);

+					}

+					$model = $object->modelpdf;

+					$ret = $object->fetch($id); // Reload to get new records

+

+					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);

+				}

@@ -253,9 +221,9 @@
-			if (count($object->errors) > 0) {

-				setEventMessages($object->error, $object->errors, 'errors');

-			} else {

-				setEventMessages($langs->trans($object->error), null, 'errors');

-			}

-		}

-	} elseif ($action == 'setdate_livraison' && $usercancreate) {

-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int')));

-		if ($result < 0) {

+			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');

+			else setEventMessages($langs->trans($object->error), null, 'errors');

+		}

+	}

+

+	elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)

+	{

+		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));

+		if ($result < 0)

@@ -263,3 +231,5 @@
-		}

-	} elseif ($action == 'add' && $usercancreate) {

-		// Create supplier proposal

+	}

+

+	// Create supplier proposal

+	elseif ($action == 'add' && $user->rights->supplier_proposal->creer)

+	{

@@ -277 +247,2 @@
-		if (!$error) {

+		if (!$error)

+		{

@@ -281 +252,2 @@
-			if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal')) {

+			if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal'))

+			{

@@ -284 +256 @@
-					$object->delivery_date = $date_delivery;

+					$object->date_livraison = $date_delivery;

@@ -288,0 +261,2 @@
+					$object->remise_percent = GETPOST('remise_percent');

+					$object->remise_absolue = GETPOST('remise_absolue');

@@ -291 +265 @@
-					$object->model_pdf = GETPOST('model');

+					$object->modelpdf = GETPOST('model');

@@ -293,2 +267 @@
-					$object->note = GETPOST('note', 'restricthtml');

-					$object->note_private = GETPOST('note', 'restricthtml');

+					$object->note = GETPOST('note', 'none');

@@ -295,0 +269,2 @@
+

+					$id = $object->create_from($user);

@@ -301 +276 @@
-				$object->delivery_date = $date_delivery;

+				$object->date_livraison = $date_delivery;

@@ -308 +283 @@
-				$object->model_pdf = GETPOST('model');

+				$object->modelpdf = GETPOST('model');

@@ -310,2 +285 @@
-				$object->note = GETPOST('note', 'restricthtml');

-				$object->note_private = GETPOST('note', 'restricthtml');

+				$object->note = GETPOST('note', 'none');

@@ -317 +291,2 @@
-				if (isModEnabled("multicurrency")) {

+				if (!empty($conf->multicurrency->enabled))

+				{

@@ -329,26 +304,6 @@
-			if (!$error) {

-				if ($origin && $originid) {

-					// Parse element/subelement (ex: project_task)

-					$element = $subelement = $origin;

-					if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {

-						$element = $regs[1];

-						$subelement = $regs[2];

-					}

-

-					// For compatibility

-					if ($element == 'order') {

-						$element = $subelement = 'commande';

-					}

-					if ($element == 'propal') {

-						$element = 'comm/propal';

-						$subelement = 'propal';

-					}

-					if ($element == 'contract') {

-						$element = $subelement = 'contrat';

-					}

-					if ($element == 'inter') {

-						$element = $subelement = 'ficheinter';

-					}

-					if ($element == 'shipping') {

-						$element = $subelement = 'expedition';

-					}

+			if (!$error)

+			{

+				if ($origin && $originid)

+				{

+					$element = 'supplier_proposal';

+					$subelement = 'supplier_proposal';

@@ -366 +321,2 @@
-					if ($id > 0) {

+					if ($id > 0)

+					{

@@ -375 +331,2 @@
-						if ($result > 0) {

+						if ($result > 0)

+						{

@@ -377 +334,2 @@
-							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {

+							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))

+							{

@@ -384 +342,2 @@
-							for ($i = 0; $i < $num; $i++) {

+							for ($i = 0; $i < $num; $i++)

+							{

@@ -419,2 +378 @@
-									$lines[$i]->pa_ht,

-									$label,

+									$lines[$i]->pa_ht, $label,

@@ -443 +401 @@
-							// modified by hook

+																											   // modified by hook

@@ -445 +402,0 @@
-								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

@@ -456,2 +413,3 @@
-				} else {

-					// Standard creation

+				} 			// Standard creation

+				else

+				{

@@ -461,2 +419,4 @@
-				if ($id > 0) {

-					if (!$error) {

+				if ($id > 0)

+				{

+					if (!$error)

+					{

@@ -466 +426,2 @@
-						if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {

+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))

+						{

@@ -469,6 +430,2 @@
-							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-								$newlang = GETPOST('lang_id', 'aZ09');

-							}

-							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {

-								$newlang = $object->thirdparty->default_lang;

-							}

+							if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

+							if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;

@@ -479 +436 @@
-							$model = $object->model_pdf;

+							$model = $object->modelpdf;

@@ -483,3 +440 @@
-							if ($result < 0) {

-								dol_print_error($db, $result);

-							}

+							if ($result < 0) dol_print_error($db, $result);

@@ -490 +445,3 @@
-					} else {

+					}

+					else

+					{

@@ -494 +451,3 @@
-				} else {

+				}

+				else

+				{

@@ -501,2 +460,4 @@
-	} elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {

-		// Reopen proposal

+	}

+

+	// Reopen proposal

+	elseif ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {

@@ -507,2 +468,4 @@
-	} elseif ($action == 'close' && $usercanclose && !GETPOST('cancel', 'alpha')) {

-		// Close proposal

+	}

+

+	// Close proposal

+	elseif ($action == 'close' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {

@@ -513,2 +476,4 @@
-	} elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {

-		// Set accepted/refused

+	}

+

+	// Set accepted/refused

+	elseif ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {

@@ -521 +486 @@
-				$object->cloture($user, GETPOST('statut'), GETPOST('note', 'restricthtml'));

+				$object->cloture($user, GETPOST('statut'), GETPOST('note', 'none'));

@@ -532 +497 @@
-	$trackid = 'spro'.$object->id;

+	$trackid = 'spr'.$object->id;

@@ -536,0 +502 @@
+	$permissiontoadd = $user->rights->supplier_proposal->creer;

@@ -541 +507,2 @@
-	if ($action == 'modif' && $usercancreate) {

+	if ($action == 'modif' && $user->rights->supplier_proposal->creer)

+	{

@@ -544 +511,2 @@
-		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {

+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))

+		{

@@ -547 +515 @@
-			if (getDolGlobalInt('MAIN_MULTILANGS')) {

+			if (!empty($conf->global->MAIN_MULTILANGS)) {

@@ -553,7 +521,6 @@
-			if ($ret > 0) {

-				$object->fetch_thirdparty();

-			}

-			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

-		}

-	} elseif ($action == "setabsolutediscount" && $usercancreate) {

-		if (GETPOST("remise_id", 'int')) {

+			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+		}

+	}

+

+	elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {

+		if ($_POST["remise_id"]) {

@@ -561 +528 @@
-				$result = $object->insert_discount(GETPOST("remise_id", 'int'));

+				$result = $object->insert_discount($_POST["remise_id"]);

@@ -570,10 +537,2 @@
-	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') && $usercancreate) {

-		// Define vat_rate

-		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);

-		$vat_rate = str_replace('*', '', $vat_rate);

-		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);

-		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);

-		foreach ($object->lines as $line) {

-			$result = $object->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);

-		}

-	} elseif ($action == 'addline' && $usercancreate) {

+	if ($action == 'addline' && $user->rights->supplier_proposal->creer)

+	{

@@ -585 +544 @@
-		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');

+		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');

@@ -588 +546,0 @@
-

@@ -590,3 +548,3 @@
-

-		$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');

-		if ($prod_entry_mode == 'free') {

+		$prod_entry_mode = GETPOST('prod_entry_mode');

+		if ($prod_entry_mode == 'free')

+		{

@@ -594 +552,5 @@
-		} else {

+			$price_ht = GETPOST('price_ht');

+			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);

+		}

+		else

+		{

@@ -596,15 +558,7 @@
-		}

-

-		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'

-

-		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);

-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);

-		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);

-		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);

-

-		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);

-

-		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);

-		if (empty($remise_percent)) {

-			$remise_percent = 0;

-		}

+			$price_ht = '';

+			$tva_tx = '';

+		}

+

+		$qty = GETPOST('qty'.$predef);

+		$remise_percent = GETPOST('remise_percent'.$predef);

+		$price_ht_devise = GETPOST('multicurrency_price_ht');

@@ -623,5 +577 @@
-		if ($prod_entry_mode == 'free' && GETPOST('price_ht') < 0 && $qty < 0) {

-			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');

-			$error++;

-		}

-		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {

+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('type') < 0) {

@@ -632 +582,2 @@
-		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && GETPOST('multicurrency_price_ht') === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.

+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.

+		{

@@ -636 +587 @@
-		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {

+		if ($prod_entry_mode == 'free' && empty($idprod) && empty($product_desc)) {

@@ -641,2 +592,2 @@
-			$pu_ht = price2num($price_ht, 'MU');

-			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');

+			$pu_ht = 0;

+			$pu_ttc = 0;

@@ -648 +599,5 @@
-			if ($prod_entry_mode != 'free' && empty($error)) {	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''

+			// Ecrase $pu par celui du produit

+			// Ecrase $desc par celui du produit

+			// Ecrase $txtva par celui du produit

+			if (($prod_entry_mode != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''

+			{

@@ -652,3 +607 @@
-				if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') {

-					$idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)

-				}

+				if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') $idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)

@@ -657 +610,2 @@
-				if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {

+				if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg))

+				{

@@ -659 +613 @@
-					$res = $productsupplier->fetch($idprod); // Load product from its id

+					$res = $productsupplier->fetch($idprod); // Load product from its ID

@@ -662 +616,2 @@
-					if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {

+					if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER))

+					{

@@ -665 +620,2 @@
-						if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price

+						if ($productsupplier->fourn_socid != $socid)	// The price we found is for another supplier, so we clear supplier price

+						{

@@ -668 +624,3 @@
-					} else {

+					}

+					else

+					{

@@ -672 +630,3 @@
-				} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {

+				}

+				elseif (GETPOST('idprodfournprice', 'alpha') > 0)

+				{

@@ -679 +639,2 @@
-				if ($idprod > 0) {

+				if ($idprod > 0)

+				{

@@ -682,18 +642,0 @@
-					// Define output language

-					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {

-						$outputlangs = $langs;

-						$newlang = '';

-						if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-							$newlang = GETPOST('lang_id', 'aZ09');

-						}

-						if (empty($newlang)) {

-							$newlang = $object->thirdparty->default_lang;

-						}

-						if (!empty($newlang)) {

-							$outputlangs = new Translate("", $conf);

-							$outputlangs->setDefaultLang($newlang);

-						}

-						$desc = (!empty($productsupplier->multilangs[$outputlangs->defaultlang]["description"])) ? $productsupplier->multilangs[$outputlangs->defaultlang]["description"] : $productsupplier->description;

-					} else {

-						$desc = $productsupplier->description;

-					}

@@ -701,15 +644,8 @@
-					if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {

-						$desc = $productsupplier->desc_supplier;

-					}

-

-					//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time

-					if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {

-						$product_desc='';

-					}

-

-					if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {

-						$desc = $product_desc;

-					}

-					if (!empty($product_desc) && trim($product_desc) != trim($desc)) {

-						$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));

-					}

+					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {

+					    $desc = $productsupplier->desc_supplier;

+					} else $desc = $productsupplier->description;

+

+					if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));

+

+					$type = $productsupplier->type;

+					$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');

@@ -719,9 +655,3 @@
-					// Get vat rate

-					$tva_npr = 0;

-					if (!GETPOSTISSET('tva_tx')) {	// If vat rate not provided from the form (the form has the priority)

-						$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));

-						$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));

-					}

-					if (empty($tva_tx)) {

-						$tva_npr = 0;

-					}

+					$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));

+					$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));

+					if (empty($tva_tx)) $tva_npr = 0;

@@ -731,23 +661,2 @@
-					$type = $productsupplier->type;

-					if (GETPOST('price_ht') != '' || GETPOST('multicurrency_price_ht') != '') {

-						$price_base_type = 'HT';

-						$pu = price2num($price_ht, 'MU');

-						$pu_devise = price2num($price_ht_devise, 'CU');

-					} elseif (GETPOST('price_ttc') != '' || GETPOST('multicurrency_price_ttc') != '') {

-						$price_base_type = 'TTC';

-						$pu = price2num($price_ttc, 'MU');

-						$pu_devise = price2num($price_ttc_devise, 'CU');

-					} else {

-						$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');

-						if (empty($object->multicurrency_code) || ($productsupplier->fourn_multicurrency_code != $object->multicurrency_code)) {	// If object is in a different currency and price not in this currency

-							$pu = $productsupplier->fourn_pu;

-							$pu_devise = 0;

-						} else {

-							$pu = $productsupplier->fourn_pu;

-							$pu_devise = $productsupplier->fourn_multicurrency_unitprice;

-						}

-					}

-

-					if (empty($pu)) {

-						$pu = 0; // If pu is '' or null, we force to have a numeric value

-					}

+					$pu_ht = $productsupplier->fourn_pu;

+					if (empty($pu_ht)) $pu_ht = 0; // If pu is '' or null, we force to have a numeric value

@@ -761 +670 @@
-						($price_base_type == 'HT' ? $pu : 0),

+						$pu_ht,

@@ -769 +678 @@
-						($price_base_type == 'TTC' ? $pu : 0),

+						$pu_ttc,

@@ -772 +681 @@
-						min($rank, count($object->lines) + 1),

+						-1,

@@ -783 +692 @@
-						$pu_devise,

+						$productsupplier->fourn_multicurrency_unitprice,

@@ -786,6 +695,5 @@
-					);

-

-					//var_dump($tva_tx);

-					//var_dump($productsupplier->fourn_pu);

-					//var_dump($price_base_type);exit;

-					if ($result < 0) {

+                    );

+

+					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;

+					if ($result < 0)

+					{

@@ -796 +704,2 @@
-				if ($idprod == -99 || $idprod == 0) {

+				if ($idprod == -99 || $idprod == 0)

+				{

@@ -802 +711,2 @@
-				if ($idprod == -1) {

+				if ($idprod == -1)

+				{

@@ -808 +718,3 @@
-			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error)) {    // Free product.  // $price_ht is already set

+			}

+			elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set

+			{

@@ -811 +722,0 @@
-

@@ -820,3 +731 @@
-				if (!preg_match('/\((.*)\)/', $tva_tx)) {

-					$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'

-				}

+				$tva_tx = price2num($tva_tx); // When vat is text input field

@@ -828 +737,2 @@
-				if (GETPOST('price_ht') != '' || GETPOST('multicurrency_price_ht') != '') {

+				if ($price_ht !== '')

+				{

@@ -830 +740,3 @@
-				} else {

+				}

+				else

+				{

@@ -835,2 +747 @@
-				$pu_ht_devise = price2num($price_ht_devise, 'CU');

-				$info_bits = 0;

+				$pu_ht_devise = price2num($price_ht_devise, 'MU');

@@ -862,6 +773,6 @@
-					$pu_ht_devise

-				);

-			}

-

-

-			if (!$error && $result > 0) {

+					$pu_ht_devise);

+			}

+

+

+			if (!$error && $result > 0)

+			{

@@ -873 +784,2 @@
-				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {

+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))

+				{

@@ -876,6 +788,2 @@
-					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {

-						$newlang = GETPOST('lang_id', 'aZ09');

-					}

-					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {

-						$newlang = $object->thirdparty->default_lang;

-					}

+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

+					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;

@@ -886 +794 @@
-					$model = $object->model_pdf;

+					$model = $object->modelpdf;

@@ -888,3 +795,0 @@
-					if ($ret > 0) {

-						$object->fetch_thirdparty();

-					}

@@ -893,3 +798 @@
-					if ($result < 0) {

-						dol_print_error($db, $result);

-					}

+					if ($result < 0) dol_print_error($db, $result);

@@ -907 +809,0 @@
-				unset($_POST['fourn_ref']);

@@ -921,2 +822,0 @@
-				unset($_POST['units']);

-

@@ -923,0 +824,171 @@
+

+				unset($_POST['date_starthour']);

+				unset($_POST['date_startmin']);

+				unset($_POST['date_startsec']);

+				unset($_POST['date_startday']);

+				unset($_POST['date_startmonth']);

+				unset($_POST['date_startyear']);

+				unset($_POST['date_endhour']);

+				unset($_POST['date_endmin']);

+				unset($_POST['date_endsec']);

+				unset($_POST['date_endday']);

+				unset($_POST['date_endmonth']);

+				unset($_POST['date_endyear']);

+			}

+			else

+			{

+				$db->rollback();

+

+				setEventMessages($object->error, $object->errors, 'errors');

+			}

+		}

+	}

+

+	// Mise a jour d'une ligne dans la demande de prix

+	elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) {

+		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);

+

+		// Define info_bits

+		$info_bits = 0;

+		if (preg_match('/\*/', $vat_rate))

+			$info_bits |= 0x01;

+

+		// Clean parameters

+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none'));

+

+		// Define vat_rate

+		$vat_rate = str_replace('*', '', $vat_rate);

+		$localtax1_rate = get_localtax($vat_rate, 1, $mysoc, $object->thirdparty);

+		$localtax2_rate = get_localtax($vat_rate, 2, $mysoc, $object->thirdparty);

+

+		if (GETPOST('price_ht') != '')

+		{

+			$ht = price2num(GETPOST('price_ht'));

+		}

+

+		if (GETPOST('price_ttc') != '')

+		{

+			$reg = array();

+			$vatratecleaned = $vat_rate;

+			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"

+			{

+				$vatratecleaned = trim($reg[1]);

+				$vatratecode = $reg[2];

+			}

+

+			$ttc = price2num(GETPOST('price_ttc'));

+			$ht = $ttc / (1 + ($vatratecleaned / 100));

+		}

+

+		$price_base_type = 'HT';

+		$pu_ht_devise = GETPOST('multicurrency_subprice');

+

+		// Add buying price

+		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');

+		$buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value

+

+		// Extrafields Lines

+		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);

+		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);

+		// Unset extrafield POST Data

+		if (is_array($extralabelsline)) {

+			foreach ($extralabelsline as $key => $value) {

+				unset($_POST["options_".$key]);

+			}

+		}

+

+		// Define special_code for special lines

+		$special_code = GETPOST('special_code');

+		if (!GETPOST('qty')) $special_code = 3;

+

+		// Check minimum price

+		$productid = GETPOST('productid', 'int');

+		if (!empty($productid)) {

+			$productsupplier = new ProductFournisseur($db);

+			if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))

+			{

+				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $productid, 'none', GETPOST('socid', 'int')) < 0)

+				{

+					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');

+				}

+			}

+

+			$product = new Product($db);

+			$res = $product->fetch($productid);

+

+			$type = $product->type;

+

+			$price_min = $product->price_min;

+			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level))

+				$price_min = $product->multiprices_min [$object->thirdparty->price_level];

+

+			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');

+		} else {

+			$type = GETPOST('type');

+			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');

+

+			// Check parameters

+			if (GETPOST('type') < 0) {

+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');

+				$error++;

+			}

+		}

+

+		if (!$error) {

+			$db->begin();

+

+			$ref_supplier = GETPOST('fourn_ref', 'alpha');

+			$fk_unit = GETPOST('units');

+

+			$result = $object->updateline(

+				GETPOST('lineid'),

+				$ht,

+				GETPOST('qty'),

+				GETPOST('remise_percent'),

+				$vat_rate,

+				$localtax1_rate,

+				$localtax2_rate,

+				$description,

+				$price_base_type,

+				$info_bits,

+				$special_code,

+				GETPOST('fk_parent_line'),

+				0,

+				$fournprice,

+				$buyingprice,

+				$label,

+				$type,

+				$array_options,

+				$ref_supplier,

+				$fk_unit,

+				$pu_ht_devise

+			);

+

+			if ($result >= 0) {

+				$db->commit();

+

+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {

+					// Define output language

+					$outputlangs = $langs;

+					if (!empty($conf->global->MAIN_MULTILANGS)) {

+						$outputlangs = new Translate("", $conf);

+						$newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $object->thirdparty->default_lang);

+						$outputlangs->setDefaultLang($newlang);

+					}

+					$ret = $object->fetch($id); // Reload to get new records

+					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+				}

+

+				unset($_POST['qty']);

+				unset($_POST['type']);

+				unset($_POST['productid']);

+				unset($_POST['remise_percent']);

+				unset($_POST['price_ht']);

+				unset($_POST['multicurrency_price_ht']);

+				unset($_POST['price_ttc']);

+				unset($_POST['tva_tx']);

+				unset($_POST['product_ref']);

+				unset($_POST['product_label']);

+				unset($_POST['product_desc']);

+				unset($_POST['fournprice']);

+				unset($_POST['buying_price']);

@@ -943,166 +1014,3 @@
-	} elseif ($action == 'updateline' && $usercancreate && GETPOST('save') == $langs->trans("Save")) {

-		// Update a line within proposal

-		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);

-

-		// Define info_bits

-		$info_bits = 0;

-		if (preg_match('/\*/', $vat_rate)) {

-			$info_bits |= 0x01;

-		}

-

-		// Clean parameters

-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));

-

-		// Define vat_rate

-		$vat_rate = str_replace('*', '', $vat_rate);

-		$localtax1_rate = get_localtax($vat_rate, 1, $mysoc, $object->thirdparty);

-		$localtax2_rate = get_localtax($vat_rate, 2, $mysoc, $object->thirdparty);

-

-		if (GETPOST('price_ht') != '') {

-			$price_base_type = 'HT';

-			$ht = price2num(GETPOST('price_ht'), '', 2);

-		} else {

-			$reg = array();

-			$vatratecleaned = $vat_rate;

-			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) {      // If vat is "xx (yy)"

-				$vatratecleaned = trim($reg[1]);

-				$vatratecode = $reg[2];

-			}

-

-			$ttc = price2num(GETPOST('price_ttc'), '', 2);

-			$ht = (float) $ttc / (1 + ((float) $vatratecleaned / 100));

-			$price_base_type = 'HT';

-		}

-

-		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU', 2);

-

-		// Add buying price

-		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');

-		$buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value

-

-		// Extrafields Lines

-		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);

-		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);

-		// Unset extrafield POST Data

-		if (is_array($extralabelsline)) {

-			foreach ($extralabelsline as $key => $value) {

-				unset($_POST["options_".$key]);

-			}

-		}

-

-		// Define special_code for special lines

-		$special_code = GETPOST('special_code');

-		if (!GETPOST('qty')) {

-			$special_code = 3;

-		}

-

-		// Check minimum price

-		$productid = GETPOST('productid', 'int');

-		if (!empty($productid)) {

-			$productsupplier = new ProductFournisseur($db);

-			if (getDolGlobalString('SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY')) {

-				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), $productid, 'none', GETPOST('socid', 'int')) < 0) {

-					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');

-				}

-			}

-

-			$product = new Product($db);

-			$res = $product->fetch($productid);

-

-			$type = $product->type;

-

-			$price_min = $product->price_min;

-			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {

-				$price_min = $product->multiprices_min [$object->thirdparty->price_level];

-			}

-

-			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');

-		} else {

-			$type = GETPOST('type');

-			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');

-

-			// Check parameters

-			if (GETPOST('type') < 0) {

-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');

-				$error++;

-			}

-		}

-

-		if (!$error) {

-			$db->begin();

-

-			$ref_supplier = GETPOST('fourn_ref', 'alpha');

-			$fk_unit = GETPOST('units');

-

-			$result = $object->updateline(

-				GETPOST('lineid', 'int'),

-				$ht,

-				price2num(GETPOST('qty'), 'MS', 2),

-				price2num(GETPOST('remise_percent'), '', 2),

-				$vat_rate,

-				$localtax1_rate,

-				$localtax2_rate,

-				$description,

-				$price_base_type,

-				$info_bits,

-				$special_code,

-				GETPOST('fk_parent_line', 'int'),

-				0,

-				$fournprice,

-				$buyingprice,

-				$label,

-				$type,

-				$array_options,

-				$ref_supplier,

-				$fk_unit,

-				$pu_ht_devise

-			);

-

-			if ($result >= 0) {

-				$db->commit();

-

-				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {

-					// Define output language

-					$outputlangs = $langs;

-					if (getDolGlobalInt('MAIN_MULTILANGS')) {

-						$outputlangs = new Translate("", $conf);

-						$newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $object->thirdparty->default_lang);

-						$outputlangs->setDefaultLang($newlang);

-					}

-					$ret = $object->fetch($id); // Reload to get new records

-					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

-				}

-

-				unset($_POST['qty']);

-				unset($_POST['type']);

-				unset($_POST['productid']);

-				unset($_POST['remise_percent']);

-				unset($_POST['price_ht']);

-				unset($_POST['multicurrency_price_ht']);

-				unset($_POST['price_ttc']);

-				unset($_POST['tva_tx']);

-				unset($_POST['product_ref']);

-				unset($_POST['product_label']);

-				unset($_POST['product_desc']);

-				unset($_POST['fournprice']);

-				unset($_POST['buying_price']);

-

-				unset($_POST['date_starthour']);

-				unset($_POST['date_startmin']);

-				unset($_POST['date_startsec']);

-				unset($_POST['date_startday']);

-				unset($_POST['date_startmonth']);

-				unset($_POST['date_startyear']);

-				unset($_POST['date_endhour']);

-				unset($_POST['date_endmin']);

-				unset($_POST['date_endsec']);

-				unset($_POST['date_endday']);

-				unset($_POST['date_endmonth']);

-				unset($_POST['date_endyear']);

-			} else {

-				$db->rollback();

-

-				setEventMessages($object->error, $object->errors, 'errors');

-			}

-		}

-	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {

+	}

+

+	elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {

@@ -1111,2 +1019,4 @@
-	} elseif ($action == 'classin' && $usercancreate) {

-		// Set project

+	}

+

+	// Set project

+	elseif ($action == 'classin' && $user->rights->supplier_proposal->creer) {

@@ -1114,5 +1024,9 @@
-	} elseif ($action == 'setavailability' && $usercancreate) {

-		// Delivery delay

-		$result = $object->availability(GETPOST('availability_id'));

-	} elseif ($action == 'setconditions' && $usercancreate) {

-		// Terms of payments

+	}

+

+	// Delivery delay

+	elseif ($action == 'setavailability' && $user->rights->supplier_proposal->creer) {

+		$result = $object->availability($_POST['availability_id']);

+	}

+

+	// Terms of payments

+	elseif ($action == 'setconditions' && $user->rights->supplier_proposal->creer) {

@@ -1120,6 +1034,12 @@
-		//} elseif ($action == 'setremisepercent' && $usercancreate) {

-		//	$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent'), '', 2));

-		//} elseif ($action == 'setremiseabsolue' && $usercancreate) {

-		//	$result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU', 2));

-	} elseif ($action == 'setmode' && $usercancreate) {

-		// Payment mode

+	}

+

+	elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {

+		$result = $object->set_remise_percent($user, $_POST['remise_percent']);

+	}

+

+	elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {

+		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);

+	}

+

+	// Payment mode

+	elseif ($action == 'setmode' && $user->rights->supplier_proposal->creer) {

@@ -1127,2 +1047,4 @@
-	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {

-		// Multicurrency Code

+	}

+

+	// Multicurrency Code

+	elseif ($action == 'setmulticurrencycode' && $user->rights->supplier_proposal->creer) {

@@ -1130,5 +1052,9 @@
-	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {

-		// Multicurrency rate

-		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));

-	} elseif ($action == 'update_extras') {

-		$object->oldcopy = dol_clone($object, 2);

+	}

+

+	// Multicurrency rate

+	elseif ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {

+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));

+	}

+

+	elseif ($action == 'update_extras') {

+		$object->oldcopy = dol_clone($object);

@@ -1137,6 +1063,5 @@
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));

-		if ($ret < 0) {

-			$error++;

-		}

-

-		if (!$error) {

+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));

+		if ($ret < 0) $error++;

+

+		if (!$error)

+		{

@@ -1144 +1069,2 @@
-			if ($result < 0) {

+			if ($result < 0)

+			{

@@ -1150,3 +1076 @@
-		if ($error) {

-			$action = 'edit_extras';

-		}

+		if ($error) $action = 'edit_extras';

@@ -1161,7 +1085 @@
-$title = $object->ref." - ".$langs->trans('Card');

-if ($action == 'create') {

-	$title = $langs->trans("SupplierProposalNew");

-}

-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';

-

-llxHeader('', $title, $help_url);

+llxHeader('', $langs->trans('CommRequests'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');

@@ -1174,3 +1092 @@
-if (isModEnabled('project')) {

-	$formproject = new FormProjets($db);

-}

+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }

@@ -1181 +1097,2 @@
-if ($action == 'create') {

+if ($action == 'create')

+{

@@ -1184 +1101 @@
-	print load_fiche_titre($langs->trans("SupplierProposalNew"), '', 'supplier_proposal');

+	print load_fiche_titre($langs->trans("NewAskPrice"), '', 'supplier_proposal');

@@ -1187 +1104 @@
-	if ($socid > 0) {

+	if ($socid > 0)

@@ -1189 +1105,0 @@
-	}

@@ -1192,15 +1108,4 @@
-	if (!empty($origin) && !empty($originid)) {

-		$element = $subelement = GETPOST('origin');

-		if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin'), $regs)) {

-			$element = $regs[1];

-			$subelement = $regs[2];

-		}

-

-		// For compatibility

-		if ($element == 'order' || $element == 'commande') {

-			$element = $subelement = 'commande';

-		}

-		if ($element == 'propal') {

-			$element = 'comm/propal';

-			$subelement = 'propal';

-		}

+	if (!empty($origin) && !empty($originid))

+	{

+		$element = 'supplier_proposal';

+		$subelement = 'supplier_proposal';

@@ -1213 +1118,2 @@
-		if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {

+		if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))

+		{

@@ -1222,0 +1129,2 @@
+		$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));

+		$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));

@@ -1228,9 +1136,8 @@
-		if (isModEnabled("multicurrency")) {

-			if (!empty($objectsrc->multicurrency_code)) {

-				$currency_code = $objectsrc->multicurrency_code;

-			}

-			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {

-				$currency_tx = $objectsrc->multicurrency_tx;

-			}

-		}

-	} else {

+		if (!empty($conf->multicurrency->enabled))

+		{

+			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;

+			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;

+		}

+	}

+	else

+	{

@@ -1239,3 +1146 @@
-		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {

-			$currency_code = $soc->multicurrency_code;

-		}

+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;

@@ -1253,8 +1158,119 @@
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';

-

-	print dol_get_fiche_head();

-

-	// Call Hook tabContentCreateSupplierProposal

-	$parameters = array();

-	// Note that $action and $object may be modified by hook

-	$reshook = $hookmanager->executeHooks('tabContentCreateSupplierProposal', $parameters, $object, $action);

+

+	dol_fiche_head();

+

+	print '<table class="border centpercent">';

+

+	// Reference

+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';

+

+	// Third party

+	print '<tr>';

+	print '<td class="fieldrequired">'.$langs->trans('Supplier').'</td>';

+	if ($socid > 0) {

+		print '<td colspan="2">';

+		print $soc->getNomUrl(1);

+		print '<input type="hidden" name="socid" value="'.$soc->id.'">';

+		print '</td>';

+	} else {

+		print '<td colspan="2">';

+		print $form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');

+		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';

+		print '</td>';

+	}

+	print '</tr>'."\n";

+

+	if ($soc->id > 0)

+	{

+		// Discounts for third party

+		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';

+

+		$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);

+

+		$thirdparty = $soc;

+		$discount_type = 1;

+		$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid'));

+		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';

+

+		print '</td></tr>';

+	}

+

+	// Terms of payment

+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';

+	$form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);

+	print '</td></tr>';

+

+	// Mode of payment

+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';

+	$form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');

+	print '</td></tr>';

+

+	// Bank Account

+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {

+		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';

+		$form->select_comptes(GETPOST('fk_account') > 0 ? GETPOST('fk_account', 'int') : $fk_account, 'fk_account', 0, '', 1);

+		print '</td></tr>';

+	}

+

+	// Shipping Method

+	if (!empty($conf->expedition->enabled)) {

+		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';

+		print $form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : $shipping_method_id, 'shipping_method_id', '', 1);

+		print '</td></tr>';

+	}

+

+	// Delivery date (or manufacturing)

+	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';

+	print '<td colspan="2">';

+	$datedelivery = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));

+	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {

+		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);

+		$syear = date("Y", $tmpdte);

+		$smonth = date("m", $tmpdte);

+		$sday = date("d", $tmpdte);

+		print $form->selectDate($syear."-".$smonth."-".$sday, 'liv_', '', '', '', "addask");

+	} else {

+		print $form->selectDate($datedelivery ? $datedelivery : -1, 'liv_', '', '', '', "addask", 1, 1);

+	}

+	print '</td></tr>';

+

+

+	// Model

+	print '<tr>';

+	print '<td>'.$langs->trans("DefaultModel").'</td>';

+	print '<td colspan="2">';

+	$liste = ModelePDFSupplierProposal::liste_modeles($db);

+	print $form->selectarray('model', $liste, ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF));

+	print "</td></tr>";

+

+	// Project

+	if (!empty($conf->projet->enabled))

+	{

+		$langs->load("projects");

+

+		$formproject = new FormProjets($db);

+

+		if ($origin == 'project') $projectid = ($originid ? $originid : 0);

+

+		print '<tr>';

+		print '<td>'.$langs->trans("Project").'</td><td colspan="2">';

+

+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');

+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';

+

+		print '</td>';

+		print '</tr>';

+	}

+

+	// Multicurrency

+	if (!empty($conf->multicurrency->enabled)) {

+		print '<tr>';

+		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';

+		print '<td colspan="3" class="maxwidthonsmartphone">';

+		print $form->selectMultiCurrency($currency_code, 'multicurrency_code');

+		print '</td></tr>';

+	}

+

+	// Other attributes

+	$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);

+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

+	print $hookmanager->resPrint;

@@ -1262,6 +1278,59 @@
-		print '<table class="border centpercent">';

-

-		// Reference

-		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';

-

-		// Third party

+		print $object->showOptionals($extrafields, 'edit', $parameters);

+	}

+

+

+	// Lines from source

+	if (!empty($origin) && !empty($originid) && is_object($objectsrc))

+	{

+		// TODO for compatibility

+		if ($origin == 'contrat') {

+			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva

+			$objectsrc->remise_absolue = $remise_absolue;

+			$objectsrc->remise_percent = $remise_percent;

+			$objectsrc->update_price(1, - 1, 1);

+		}

+

+		print "\n<!-- ".$classname." info -->";

+		print "\n";

+		print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";

+		print '<input type="hidden" name="total"          value="'.$objectsrc->total_ttc.'">'."\n";

+		print '<input type="hidden" name="tva"            value="'.$objectsrc->total_tva.'">'."\n";

+		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';

+		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';

+

+		print '<tr><td>'.$langs->trans('CommRequest').'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';

+		print '<tr><td>'.$langs->trans('AmountHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';

+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";

+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1

+		{

+			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";

+		}

+

+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2

+		{

+			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";

+		}

+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";

+

+		if (!empty($conf->multicurrency->enabled))

+		{

+			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';

+			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva)."</td></tr>";

+			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";

+		}

+	}

+

+	print "</table>\n";

+

+

+	/*

+	 * Combobox pour la fonction de copie

+ 	 */

+

+	if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';

+

+	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE))

+	{

+		print '<br><table>';

+

+		// For backward compatibility

@@ -1269,6 +1338,25 @@
-		print '<td class="fieldrequired">'.$langs->trans('Supplier').'</td>';

-		if ($socid > 0) {

-			print '<td colspan="2">';

-			print $soc->getNomUrl(1, 'supplier');

-			print '<input type="hidden" name="socid" value="'.$soc->id.'">';

-			print '</td>';

+		print '<td><input type="radio" name="createmode" value="copy"></td>';

+		print '<td>'.$langs->trans("CopyAskFrom").' </td>';

+		print '<td>';

+		$liste_ask = array();

+		$liste_ask [0] = '';

+

+		$sql = "SELECT p.rowid as id, p.ref, s.nom";

+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal p";

+		$sql .= ", ".MAIN_DB_PREFIX."societe s";

+		$sql .= " WHERE s.rowid = p.fk_soc";

+		$sql .= " AND p.entity = ".$conf->entity;

+		$sql .= " AND p.fk_statut <> ".SupplierProposal::STATUS_DRAFT;

+		$sql .= " ORDER BY Id";

+

+		$resql = $db->query($sql);

+		if ($resql) {

+			$num = $db->num_rows($resql);

+			$i = 0;

+			while ($i < $num) {

+				$row = $db->fetch_row($resql);

+				$askPriceSupplierRefAndSocName = $row [1]." - ".$row [2];

+				$liste_ask [$row [0]] = $askPriceSupplierRefAndSocName;

+				$i++;

+			}

+			print $form->selectarray("copie_supplier_proposal", $liste_ask, 0);

@@ -1276,39 +1364,2 @@
-			print '<td colspan="2">';

-			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';

-			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');

-			// reload page to retrieve customer informations

-			if (getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE')) {

-				print '<script>

-				$(document).ready(function() {

-					$("#socid").change(function() {

-						console.log("We have changed the company - Reload page");

-						// reload page

-						$("input[name=action]").val("create");

-						$("form[name=add]").submit();

-					});

-				});

-				</script>';

-			}

-			print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';

-			print '</td>';

-		}

-		print '</tr>'."\n";

-

-		if ($soc->id > 0) {

-			// Discounts for third party

-			print '<tr><td>'.$langs->trans('Discounts').'</td><td>';

-

-			$absolute_discount = $soc->getAvailableDiscounts('', '', 0, 1);

-

-			$thirdparty = $soc;

-			$discount_type = 1;

-			$backtopage = urlencode($_SERVER["PHP_SELF"].'?socid='.$thirdparty->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid'));

-			include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';

-

-			print '</td></tr>';

-		}

-

-		// Terms of payment

-		print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';

-		print img_picto('', 'payment', 'class="pictofixedwidth"');

-		print $form->getSelectConditionsPaiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);

+			dol_print_error($db);

+		}

@@ -1317,181 +1368,13 @@
-		// Mode of payment

-		print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';

-		print img_picto('', 'bank', 'class="pictofixedwidth"');

-		$form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');

-		print '</td></tr>';

-

-		// Bank Account

-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {

-			print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';

-			$form->select_comptes(GETPOST('fk_account') > 0 ? GETPOST('fk_account', 'int') : $fk_account, 'fk_account', 0, '', 1);

-			print '</td></tr>';

-		}

-

-		// Shipping Method

-		if (isModEnabled("expedition")) {

-			print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';

-			print img_picto('', 'dolly', 'class="pictofixedwidth"');

-			$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : "", 'shipping_method_id', '', 1);

-			print '</td></tr>';

-		}

-

-		// Delivery date (or manufacturing)

-		print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';

-		print '<td colspan="2">';

-		print img_picto('', 'action', 'class="pictofixedwidth"');

-		$datedelivery = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));

-		if (is_numeric(getDolGlobalString('DATE_LIVRAISON_WEEK_DELAY'))) {	// If value set to 0 or a num, not empty

-			$tmpdte = time() + (7 * getDolGlobalInt('DATE_LIVRAISON_WEEK_DELAY') * 24 * 60 * 60);

-			$syear = date("Y", $tmpdte);

-			$smonth = date("m", $tmpdte);

-			$sday = date("d", $tmpdte);

-			print $form->selectDate($syear."-".$smonth."-".$sday, 'liv_', '', '', '', "addask");

-		} else {

-			print $form->selectDate($datedelivery ? $datedelivery : -1, 'liv_', '', '', '', "addask", 1, 1);

-		}

-		print '</td></tr>';

-

-

-		// Model

-		print '<tr>';

-		print '<td>'.$langs->trans("DefaultModel").'</td>';

-		print '<td colspan="2">';

-		print img_picto('', 'pdf', 'class="pictofixedwidth"');

-		$list = ModelePDFSupplierProposal::liste_modeles($db);

-		$preselected = (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT') ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);

-		print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);

-		print "</td></tr>";

-

-		// Project

-		if (isModEnabled('project')) {

-			$langs->load("projects");

-

-			$formproject = new FormProjets($db);

-

-			if ($origin == 'project') {

-				$projectid = ($originid ? $originid : 0);

-			}

-

-			print '<tr>';

-			print '<td>'.$langs->trans("Project").'</td><td colspan="2">';

-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');

-			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';

-

-			print '</td>';

-			print '</tr>';

-		}

-

-		// Multicurrency

-		if (isModEnabled("multicurrency")) {

-			print '<tr>';

-			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';

-			print '<td colspan="3" class="maxwidthonsmartphone">';

-			print img_picto('', 'currency', 'class="pictofixedwidth"');

-			print $form->selectMultiCurrency($currency_code, 'multicurrency_code');

-			print '</td></tr>';

-		}

-

-		// Other attributes

-		$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);

-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

-		print $hookmanager->resPrint;

-		if (empty($reshook)) {

-			print $object->showOptionals($extrafields, 'create', $parameters);

-		}

-

-

-		// Lines from source

-		if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {

-			// TODO for compatibility

-			if ($origin == 'contrat') {

-				// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva

-				//$objectsrc->remise_absolue = $remise_absolue;

-				//$objectsrc->remise_percent = $remise_percent;

-				$objectsrc->update_price(1, 'auto', 1);

-			}

-

-			print "\n<!-- ".$classname." info -->";

-			print "\n";

-			print '<input type="hidden" name="amount"   value="'.$objectsrc->total_ht.'">'."\n";

-			print '<input type="hidden" name="total"    value="'.$objectsrc->total_ttc.'">'."\n";

-			print '<input type="hidden" name="tva"      value="'.$objectsrc->total_tva.'">'."\n";

-			print '<input type="hidden" name="origin"   value="'.$objectsrc->element.'">';

-			print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';

-

-			print '<tr><td>'.$langs->trans('CommRequest').'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';

-			print '<tr><td>'.$langs->trans('AmountHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';

-			print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";

-			if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1

-				print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";

-			}

-

-			if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) { 		// Localtax2

-				print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";

-			}

-			print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";

-

-			if (isModEnabled("multicurrency")) {

-				print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';

-				print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva)."</td></tr>";

-				print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";

-			}

-		}

-

-		print "</table>\n";

-

-

-		/*

-		 * Combobox for copy function

-		  */

-

-		if (!getDolGlobalString('SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE')) {

-			print '<input type="hidden" name="createmode" value="empty">';

-		}

-

-		if (getDolGlobalString('SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE')) {

-			print '<br><table>';

-

-			// For backward compatibility

-			print '<tr>';

-			print '<td><input type="radio" name="createmode" value="copy"></td>';

-			print '<td>'.$langs->trans("CopyAskFrom").' </td>';

-			print '<td>';

-			$liste_ask = array();

-			$liste_ask [0] = '';

-

-			$sql = "SELECT p.rowid as id, p.ref, s.nom";

-			$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal p";

-			$sql .= ", ".MAIN_DB_PREFIX."societe s";

-			$sql .= " WHERE s.rowid = p.fk_soc";

-			$sql .= " AND p.entityy IN (".getEntity('supplier_proposal').")";

-			$sql .= " AND p.fk_statut <> ".SupplierProposal::STATUS_DRAFT;

-			$sql .= " ORDER BY Id";

-

-			$resql = $db->query($sql);

-			if ($resql) {

-				$num = $db->num_rows($resql);

-				$i = 0;

-				while ($i < $num) {

-					$row = $db->fetch_row($resql);

-					$askPriceSupplierRefAndSocName = $row[1]." - ".$row[2];

-					$liste_ask[$row[0]] = $askPriceSupplierRefAndSocName;

-					$i++;

-				}

-				print $form->selectarray("copie_supplier_proposal", $liste_ask, 0);

-			} else {

-				dol_print_error($db);

-			}

-			print '</td></tr>';

-

-			print '<tr><td class="tdtop"><input type="radio" name="createmode" value="empty" checked></td>';

-			print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyAsk").'</td></tr>';

-		}

-

-		if (getDolGlobalString('SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE')) {

-			print '</table>';

-		}

-	}

-

-	print dol_get_fiche_end();

-

-	print $form->buttonsSaveCancel("CreateDraft");

+		print '<tr><td class="tdtop"><input type="radio" name="createmode" value="empty" checked></td>';

+		print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyAsk").'</td></tr>';

+	}

+

+	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '</table>';

+

+	dol_fiche_end();

+

+	print '<div class="center">';

+	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';

+	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

+	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';

+	print '</div>';

@@ -1509 +1391,0 @@
-		print '<div class="div-table-responsive-no-min">';

@@ -1515 +1396,0 @@
-		print '</div>';

@@ -1526 +1407 @@
-	print dol_get_fiche_head($head, 'comm', $langs->trans('CommRequest'), -1, 'supplier_proposal');

+	dol_fiche_head($head, 'comm', $langs->trans('CommRequest'), -1, 'supplier_proposal');

@@ -1532 +1412,0 @@
-		$filter = '(s.fournisseur:=:1)';

@@ -1535,10 +1415,5 @@
-			// 'text' => $langs->trans("ConfirmClone"),

-			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),

-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' =>

-			// 1),

-			array(

-				'type' => 'other',

-				'name' => 'socid',

-				'label' => $langs->trans("SelectThirdParty"),

-				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', $filter))

-			);

+							// 'text' => $langs->trans("ConfirmClone"),

+							// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),

+							// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' =>

+							// 1),

+							array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', 's.fournisseur=1')));

@@ -1547,2 +1422,4 @@
-	} elseif ($action == 'delete') {

-		// Confirm delete

+	}

+

+	// Confirm delete

+	elseif ($action == 'delete') {

@@ -1550,2 +1427,4 @@
-	} elseif ($action == 'reopen') {

-		// Confirm reopen

+	}

+

+	// Confirm reopen

+	elseif ($action == 'reopen') {

@@ -1553,2 +1432,4 @@
-	} elseif ($action == 'ask_deleteline') {

-		// Confirmation delete product/service line

+	}

+

+	// Confirmation delete product/service line

+	elseif ($action == 'ask_deleteline') {

@@ -1556,2 +1437,4 @@
-	} elseif ($action == 'validate') {

-		// Confirm validate askprice

+	}

+

+	// Confirm validate askprice

+	elseif ($action == 'validate') {

@@ -1573 +1456 @@
-		if (isModEnabled('notification')) {

+		if (!empty($conf->notification->enabled)) {

@@ -1580 +1463 @@
-		if (!$error) {

+		if (!$error)

@@ -1582 +1464,0 @@
-		}

@@ -1588,5 +1470,2 @@
-	if (empty($reshook)) {

-		$formconfirm .= $hookmanager->resPrint;

-	} elseif ($reshook > 0) {

-		$formconfirm = $hookmanager->resPrint;

-	}

+	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;

+	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;

@@ -1604,2 +1483,2 @@
-	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', 0, 1);

-	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', null, null, '', 1);

+	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);

+	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', null, null, '', 1);

@@ -1607,4 +1486,2 @@
-	$morehtmlref .= $object->thirdparty->getNomUrl(1, 'supplier');

-	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {

-		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';

-	}

+	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);

+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';

@@ -1612 +1489,2 @@
-	if (isModEnabled('project')) {

+	if (!empty($conf->projet->enabled))

+	{

@@ -1614,3 +1492,3 @@
-		$morehtmlref .= '<br>';

-		if ($usercancreate) {

-			$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');

+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';

+		if ($user->rights->supplier_proposal->creer)

+		{

@@ -1618,3 +1496,13 @@
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';

-			}

-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');

+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';

+			}

+			if ($action == 'classify') {

+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';

+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+				$morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+				$morehtmlref .= '</form>';

+			} else {

+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

+			}

@@ -1625,4 +1513,5 @@
-				$morehtmlref .= $proj->getNomUrl(1);

-				if ($proj->title) {

-					$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';

-				}

+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+				$morehtmlref .= $proj->ref;

+				$morehtmlref .= '</a>';

+			} else {

+				$morehtmlref .= '';

@@ -1637,78 +1526,91 @@
-	// Call Hook tabContentViewSupplierProposal

-	$parameters = array();

-	// Note that $action and $object may be modified by hook

-	$reshook = $hookmanager->executeHooks('tabContentViewSupplierProposal', $parameters, $object, $action);

-	if (empty($reshook)) {

-		print '<div class="fichecenter">';

-		print '<div class="fichehalfleft">';

-		print '<div class="underbanner clearboth"></div>';

-

-		print '<table class="border tableforfield centpercent">';

-

-		// Relative and absolute discounts

-		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {

-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice

-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice

-		} else {

-			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";

-			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";

-		}

-

-		print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td>';

-

-		$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);

-		$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);

-		$absolute_discount = price2num($absolute_discount, 'MT');

-		$absolute_creditnote = price2num($absolute_creditnote, 'MT');

-

-		$thirdparty = $soc;

-		$discount_type = 1;

-		$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);

-		include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';

-

-		print '</td></tr>';

-

-		// Payment term

-		print '<tr><td class="titlefield">';

-		print '<table class="nobordernopadding" width="100%"><tr><td>';

-		print $langs->trans('PaymentConditionsShort');

-		print '</td>';

-		if ($action != 'editconditions' && $object->statut != SupplierProposal::STATUS_NOTSIGNED) {

-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';

-		}

-		print '</tr></table>';

-		print '</td><td class="valuefield">';

-		if ($action == 'editconditions') {

-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);

-		} else {

-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none', 1);

-		}

-		print '</td>';

-		print '</tr>';

-

-		// Delivery date

-		$langs->load('deliveries');

-		print '<tr><td>';

-		print '<table class="nobordernopadding" width="100%"><tr><td>';

-		print $langs->trans('DeliveryDate');

-		print '</td>';

-		if ($action != 'editdate_livraison' && $object->statut == SupplierProposal::STATUS_VALIDATED) {

-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1).'</a></td>';

-		}

-		print '</tr></table>';

-		print '</td><td class="valuefield">';

-		if ($action == 'editdate_livraison') {

-			print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" class="formconsumeproduce">';

-			print '<input type="hidden" name="token" value="'.newToken().'">';

-			print '<input type="hidden" name="action" value="setdate_livraison">';

-			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';

-			print $form->selectDate($object->delivery_date, 'liv_', '', '', '', "editdate_livraison");

-			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';

-			print '</form>';

-		} else {

-			print dol_print_date($object->delivery_date, 'daytext');

-		}

-		print '</td>';

-		print '</tr>';

-

-		// Payment mode

+

+	print '<div class="fichecenter">';

+	print '<div class="fichehalfleft">';

+	print '<div class="underbanner clearboth"></div>';

+

+	print '<table class="border tableforfield" width="100%">';

+

+	// Relative and absolute discounts

+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice

+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice

+	} else {

+		$filterabsolutediscount = "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')";

+		$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS PAID)%')";

+	}

+

+	print '<tr><td class="titlefield">'.$langs->trans('Discounts').'</td><td>';

+

+	$absolute_discount = $soc->getAvailableDiscounts('', $filterabsolutediscount, 0, 1);

+	$absolute_creditnote = $soc->getAvailableDiscounts('', $filtercreditnote, 0, 1);

+	$absolute_discount = price2num($absolute_discount, 'MT');

+	$absolute_creditnote = price2num($absolute_creditnote, 'MT');

+

+	$thirdparty = $soc;

+	$discount_type = 1;

+	$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);

+	include DOL_DOCUMENT_ROOT.'/core/tpl/object_discounts.tpl.php';

+

+	print '</td></tr>';

+

+	// Payment term

+	print '<tr><td class="titlefield">';

+	print '<table class="nobordernopadding" width="100%"><tr><td>';

+	print $langs->trans('PaymentConditionsShort');

+	print '</td>';

+	if ($action != 'editconditions' && $object->statut != SupplierProposal::STATUS_NOTSIGNED)

+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';

+	print '</tr></table>';

+	print '</td><td colspan="3">';

+	if ($action == 'editconditions') {

+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);

+	} else {

+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none', 1);

+	}

+	print '</td>';

+	print '</tr>';

+

+	// Delivery date

+	$langs->load('deliveries');

+	print '<tr><td>';

+	print '<table class="nobordernopadding" width="100%"><tr><td>';

+	print $langs->trans('DeliveryDate');

+	print '</td>';

+	if ($action != 'editdate_livraison' && $object->statut == SupplierProposal::STATUS_VALIDATED)

+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1).'</a></td>';

+	print '</tr></table>';

+	print '</td><td colspan="3">';

+	if ($action == 'editdate_livraison') {

+		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" class="formconsumeproduce">';

+		print '<input type="hidden" name="token" value="'.newToken().'">';

+		print '<input type="hidden" name="action" value="setdate_livraison">';

+		print $form->selectDate($object->date_livraison, 'liv_', '', '', '', "editdate_livraison");

+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';

+		print '</form>';

+	} else {

+		print dol_print_date($object->date_livraison, 'daytext');

+	}

+	print '</td>';

+	print '</tr>';

+

+	// Payment mode

+	print '<tr>';

+	print '<td>';

+	print '<table class="nobordernopadding" width="100%"><tr><td>';

+	print $langs->trans('PaymentMode');

+	print '</td>';

+	if ($action != 'editmode' && $object->statut != SupplierProposal::STATUS_NOTSIGNED)

+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';

+	print '</tr></table>';

+	print '</td><td colspan="3">';

+	if ($action == 'editmode') {

+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);

+	} else {

+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');

+	}

+	print '</td></tr>';

+

+	// Multicurrency

+	if (!empty($conf->multicurrency->enabled))

+	{

+		// Multicurrency code

@@ -1718 +1620 @@
-		print $langs->trans('PaymentMode');

+		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);

@@ -1720,3 +1622,2 @@
-		if ($action != 'editmode' && $object->statut != SupplierProposal::STATUS_NOTSIGNED) {

-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';

-		}

+		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_VALIDATED)

+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';

@@ -1724,3 +1625,3 @@
-		print '</td><td class="valuefield">';

-		if ($action == 'editmode') {

-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);

+		print '</td><td colspan="3">';

+		if ($action == 'editmulticurrencycode') {

+			$form->form_multicurrency_code($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_code, 'multicurrency_code');

@@ -1728 +1629 @@
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');

+			$form->form_multicurrency_code($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_code, 'none');

@@ -1732,3 +1633,3 @@
-		// Multicurrency

-		if (isModEnabled("multicurrency")) {

-			// Multicurrency code

+		// Multicurrency rate

+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)

+		{

@@ -1738 +1639 @@
-			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);

+			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);

@@ -1740,3 +1641,2 @@
-			if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_VALIDATED) {

-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';

-			}

+			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_VALIDATED && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)

+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';

@@ -1744,3 +1644,6 @@
-			print '</td><td class="valuefield">';

-			if ($action == 'editmulticurrencycode') {

-				$form->form_multicurrency_code($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_code, 'multicurrency_code');

+			print '</td><td colspan="3">';

+			if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {

+				if ($action == 'actualizemulticurrencyrate') {

+	   				list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);

+				}

+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);

@@ -1748 +1651,6 @@
-				$form->form_multicurrency_code($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_code, 'none');

+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);

+				if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {

+					print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';

+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';

+					print '</div>';

+				}

@@ -1751,82 +1659,14 @@
-

-			// Multicurrency rate

-			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {

-				print '<tr>';

-				print '<td>';

-				print '<table class="nobordernopadding" width="100%"><tr><td>';

-				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);

-				print '</td>';

-				if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_VALIDATED && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {

-					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';

-				}

-				print '</tr></table>';

-				print '</td><td class="valuefield">';

-				if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {

-					if ($action == 'actualizemulticurrencyrate') {

-						list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);

-					}

-					$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);

-				} else {

-					$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);

-					if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {

-						print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';

-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=actualizemulticurrencyrate">'.$langs->trans("ActualizeCurrency").'</a>';

-						print '</div>';

-					}

-				}

-				print '</td></tr>';

-			}

-		}

-

-		/* Not for supplier proposals

-		if ($soc->outstanding_limit) {

-			// Outstanding Bill

-			print '<tr><td>';

-			print $langs->trans('OutstandingBill');

-			print '</td><td class="valuefield">';

-			$arrayoutstandingbills = $soc->getOutstandingBills('supplier');

-			$outstandingBills = $arrayoutstandingbills['opened'];

-			print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);

-			print '</td>';

-			print '</tr>';

-		}*/

-

-		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {

-			// Bank Account

-			print '<tr><td>';

-			print '<table width="100%" class="nobordernopadding"><tr><td>';

-			print $langs->trans('BankAccount');

-			print '</td>';

-			if ($action != 'editbankaccount' && $usercancreate) {

-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';

-			}

-			print '</tr></table>';

-			print '</td><td class="valuefield">';

-			if ($action == 'editbankaccount') {

-				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);

-			} else {

-				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');

-			}

-			print '</td>';

-			print '</tr>';

-		}

-

-		// Other attributes

-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

-

-		print '</table>';

-

-		print '</div>';

-		print '<div class="fichehalfright">';

-		print '<div class="underbanner clearboth"></div>';

-

-		print '<table class="border tableforfield centpercent">';

-

-		print '<tr>';

-		// Amount HT

-		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';

-		print '<td class="nowrap amountcard right">' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . '</td>';

-		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {

-			// Multicurrency Amount HT

-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';

-		}

+		}

+	}

+

+	/* Not for supplier proposals

+	if ($soc->outstanding_limit)

+	{

+		// Outstanding Bill

+		print '<tr><td>';

+		print $langs->trans('OutstandingBill');

+		print '</td><td class=right colspan="3">';

+		$arrayoutstandingbills = $soc->getOutstandingBills('supplier');

+		$outstandingBills = $arrayoutstandingbills['opened'];

+		print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);

+		print '</td>';

@@ -1834,9 +1674,19 @@
-

-		print '<tr>';

-		// Amount VAT

-		print '<td class="titlefieldmiddle">' . $langs->trans('AmountVAT') . '</td>';

-		print '<td class="nowrap amountcard right">' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . '</td>';

-		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {

-			// Multicurrency Amount VAT

-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';

-		}

+	}*/

+

+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled))

+	{

+		// Bank Account

+		print '<tr><td>';

+		print '<table width="100%" class="nobordernopadding"><tr><td>';

+		print $langs->trans('BankAccount');

+		print '</td>';

+		if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer)

+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';

+		print '</tr></table>';

+		print '</td><td colspan="3">';

+		if ($action == 'editbankaccount') {

+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);

+		} else {

+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');

+		}

+		print '</td>';

@@ -1844,30 +1694,20 @@
-

-		// Amount Local Taxes

-		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {

-			print '<tr>';

-			print '<td class="titlefieldmiddle">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';

-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . '</td>';

-			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {

-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';

-			}

-			print '</tr>';

-

-			if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {

-				print '<tr>';

-				print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';

-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . '</td>';

-				if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {

-					print '<td class="nowrap amountcard right">' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';

-				}

-				print '</tr>';

-			}

-		}

-

-		print '<tr>';

-		// Amount TTC

-		print '<td>' . $langs->trans('AmountTTC') . '</td>';

-		print '<td class="nowrap amountcard right">' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . '</td>';

-		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {

-			// Multicurrency Amount TTC

-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';

-		}

+	}

+

+	// Other attributes

+	$cols = 2;

+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

+

+	print '</table>';

+

+	print '</div>';

+	print '<div class="fichehalfright">';

+	print '<div class="ficheaddleft">';

+	print '<div class="underbanner clearboth"></div>';

+

+	print '<table class="border tableforfield centpercent">';

+

+	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))

+	{

+		// Multicurrency Amount HT

+		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';

+		print '<td>'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';

@@ -1876,84 +1716,116 @@
-		print '</table>';

-

-		// Margin Infos

-		/*if (isModEnabled('margin')) {

-			$formmargin->displayMarginInfos($object);

-		}*/

-

-		print '</div>';

-		print '</div>';

-

-		print '<div class="clearboth"></div><br>';

-

-		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {

-			$blocname = 'contacts';

-			$title = $langs->trans('ContactsAddresses');

-			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';

-		}

-

-		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {

-			$blocname = 'notes';

-			$title = $langs->trans('Notes');

-			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';

-		}

-

-		/*

-		 * Lines

-		 */

-

-		// Show object lines

-		$result = $object->getLinesArray();

-

-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '').'" method="POST">

-		<input type="hidden" name="token" value="' . newToken().'">

-		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">

-		<input type="hidden" name="mode" value="">

-		<input type="hidden" name="id" value="' . $object->id.'">

-		<input type="hidden" name="backtopage" value="'.$backtopage.'">

-		';

-

-		if (!empty($conf->use_javascript_ajax) && $object->statut == SupplierProposal::STATUS_DRAFT) {

-			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';

-		}

-

-		print '<div class="div-table-responsive-no-min">';

-		print '<table id="tablelines" class="noborder noshadow" width="100%">';

-

-		// Add free products/services form

-		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;

-		$forceall = 1;

-		$dateSelector = 0;

-		$inputalsopricewithtax = 1;

-		$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty.

-		if (getDolGlobalString('SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY')) {

-			$senderissupplier = 1;

-		}

-

-		if (!empty($object->lines)) {

-			$object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);

-		}

-

-		// Form to add new line

-		if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) {

-			if ($action != 'editline') {

-				// Add products/services form

-

-				$parameters = array();

-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

-				if ($reshook < 0) {

-					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-				}

-				if (empty($reshook)) {

-					$object->formAddObjectLine($dateSelector, $soc, $mysoc);

-				}

-			}

-		}

-

-		print '</table>';

-		print '</div>';

-		print "</form>\n";

-	}

-

-	print dol_get_fiche_end();

-

-	if ($action == 'statut') {

+		// Multicurrency Amount VAT

+		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';

+		print '<td>'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';

+		print '</tr>';

+

+		// Multicurrency Amount TTC

+		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';

+		print '<td>'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';

+		print '</tr>';

+	}

+

+	// Amount HT

+	print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';

+	print '<td>'.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';

+	print '</tr>';

+

+	// Amount VAT

+	print '<tr><td>'.$langs->trans('AmountVAT').'</td>';

+	print '<td>'.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';

+	print '</tr>';

+

+	// Amount Local Taxes

+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 	// Localtax1

+	{

+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';

+		print '<td class="nowrap">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';

+		print '</tr>';

+	}

+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 	// Localtax2

+	{

+		print '<tr><td height="10">'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';

+		print '<td class="nowrap">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';

+		print '</tr>';

+	}

+

+	// Amount TTC

+	print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';

+	print '<td class="nowrap">'.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';

+	print '</tr>';

+

+	print '</table>';

+

+	// Margin Infos

+	/*if (! empty($conf->margin->enabled)) {

+	   $formmargin->displayMarginInfos($object);

+	}*/

+

+	print '</div>';

+	print '</div>';

+	print '</div>';

+

+	print '<div class="clearboth"></div><br>';

+

+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {

+		$blocname = 'contacts';

+		$title = $langs->trans('ContactsAddresses');

+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';

+	}

+

+	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {

+		$blocname = 'notes';

+		$title = $langs->trans('Notes');

+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';

+	}

+

+	/*

+	 * Lines

+	 */

+

+	// Show object lines

+	$result = $object->getLinesArray();

+

+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid')).'" method="POST">

+	<input type="hidden" name="token" value="' . newToken().'">

+	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">

+	<input type="hidden" name="mode" value="">

+	<input type="hidden" name="id" value="' . $object->id.'">

+	';

+

+	if (!empty($conf->use_javascript_ajax) && $object->statut == SupplierProposal::STATUS_DRAFT) {

+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';

+	}

+

+	print '<div class="div-table-responsive-no-min">';

+	print '<table id="tablelines" class="noborder noshadow" width="100%">';

+

+	// Add free products/services form

+	global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;

+	$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;

+	$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty.

+	if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier = 1;

+

+	if (!empty($object->lines))

+		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);

+

+	// Form to add new line

+	if ($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer)

+	{

+		if ($action != 'editline')

+		{

+			// Add products/services form

+			$object->formAddObjectLine($dateSelector, $soc, $mysoc);

+

+			$parameters = array();

+			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

+		}

+	}

+

+	print '</table>';

+	print '</div>';

+	print "</form>\n";

+

+	dol_fiche_end();

+

+	if ($action == 'statut')

+	{

@@ -1961 +1833 @@
-		$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" id="formacceptrefuse" class="formconsumeproduce paddingbottom paddingleft paddingright">';

+		$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" id="formacceptrefuse" class="formconsumeproduce">';

@@ -1965,5 +1837,3 @@
-		if (getDolGlobalString('SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL')) {

-			$form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option

-		}

-		$form_close .= '<table class="border centpercent marginleftonly marginrightonly">';

-		$form_close .= '<tr><td>'.$langs->trans("CloseAs").'</td><td class="left">';

+		if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option

+		$form_close .= '<table class="border centpercent">';

+		$form_close .= '<tr><td width="150"  class="left">'.$langs->trans("CloseAs").'</td><td class="left">';

@@ -1976,2 +1846,2 @@
-		$form_close .= '<tr><td class="left">'.$langs->trans('Note').'</td><td class="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';

-		$form_close .= $object->note_private;

+		$form_close .= '<tr><td width="150" class="left">'.$langs->trans('Note').'</td><td class="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';

+		$form_close .= $object->note;

@@ -1979,4 +1849,6 @@
-		$form_close .= '</table>';

-		$form_close .= $form->buttonsSaveCancel();

-		$form_close .= '<a id="acceptedrefused">&nbsp;</a>';

-		$form_close .= '</form>';

+		$form_close .= '<tr><td class="center" colspan="2">';

+		$form_close .= '<input type="submit" class="button" name="validate" value="'.$langs->trans('Save').'">';

+		$form_close .= ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';

+		$form_close .= '<a name="acceptedrefused">&nbsp;</a>';

+		$form_close .= '</td>';

+		$form_close .= '</tr></table></form>';

@@ -1995,3 +1867,5 @@
-		// modified by hook

-		if (empty($reshook)) {

-			if ($action != 'statut' && $action != 'editline') {

+																									   // modified by hook

+		if (empty($reshook))

+		{

+			if ($action != 'statut' && $action != 'editline')

+			{

@@ -1999,2 +1873,5 @@
-				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && $usercanvalidate) {

-					if (count($object->lines) > 0) {

+				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 &&

+					((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))

+	   				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))

+				) {

+					if (count($object->lines) > 0)

@@ -2002 +1878,0 @@
-					}

@@ -2007,2 +1883,2 @@
-				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercancreate) {

-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('Modify').'</a></div>';

+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->creer) {

+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a></div>';

@@ -2012,2 +1888,2 @@
-				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $usercanclose) {

-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#reopen').'"';

+				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $user->rights->supplier_proposal->cloturer) {

+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';

@@ -2020,3 +1896,3 @@
-						if ($usercansend) {

-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';

-						} else {

+						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {

+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';

+						} else

@@ -2024 +1899,0 @@
-						}

@@ -2029,3 +1904,3 @@
-				if (isModEnabled("supplier_order") && $object->statut == SupplierProposal::STATUS_SIGNED) {

-					if ($usercancreateorder) {

-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'&amp;token='.newToken().'">'.$langs->trans("AddSupplierOrderShort").'</a></div>';

+				if (!empty($conf->fournisseur->enabled) && $object->statut == SupplierProposal::STATUS_SIGNED) {

+					if ($user->rights->fournisseur->commande->creer) {

+						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a></div>';

@@ -2036,2 +1911,2 @@
-				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercanclose) {

-					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=statut'.(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#acceptedrefused').'"';

+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->cloturer) {

+					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';

@@ -2042,2 +1917,2 @@
-				if ($object->statut == SupplierProposal::STATUS_SIGNED && $usercanclose) {

-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=close'.(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#close').'"';

+				if ($object->statut == SupplierProposal::STATUS_SIGNED && $user->rights->supplier_proposal->cloturer) {

+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';

@@ -2048,2 +1923,2 @@
-				if ($usercancreate) {

-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&object='.$object->element.'&amp;token='.newToken().'">'.$langs->trans("ToClone").'</a></div>';

+				if ($user->rights->supplier_proposal->creer) {

+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';

@@ -2053 +1928,4 @@
-				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete));

+				if (($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) {

+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';

+					print '>'.$langs->trans('Delete').'</a></div>';

+				}

@@ -2060 +1938,2 @@
-	if ($action != 'presend') {

+	if ($action != 'presend')

+	{

@@ -2064 +1943 @@
-		 * Generated documents

+		 * Documents generes

@@ -2069,4 +1948,4 @@
-		$genallowed = $usercanread;

-		$delallowed = $usercancreate;

-

-		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);

+		$genallowed = $user->rights->supplier_proposal->lire;

+		$delallowed = $user->rights->supplier_proposal->creer;

+

+		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);

@@ -2080 +1959 @@
-		print '</div><div class="fichehalfright">';

+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';

@@ -2087 +1966 @@
-		print '</div></div>';

+		print '</div></div></div>';

@@ -2100 +1979 @@
-	$trackid = 'spro'.$object->id;

+	$trackid = 'spr'.$object->id;

--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_contact.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_contact.php
@@ -6 +5,0 @@
- * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.de>

@@ -28 +26,0 @@
-// Load Dolibarr environment

@@ -35,2 +32,0 @@
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';

-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';

@@ -39 +35 @@
-$langs->loadLangs(array("propal", "supplier_proposal", "facture", "orders", "sendings", "companies"));

+$langs->loadLangs(array("propal", "facture", "orders", "sendings", "companies"));

@@ -43 +39 @@
-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

@@ -46,3 +42 @@
-if ($user->socid) {

-	$socid = $user->socid;

-}

+if ($user->socid) $socid = $user->socid;

@@ -53,3 +47 @@
-$permissiontoedit = $user->hasRight('supplier_proposal', 'creer');

-

-$hookmanager->initHooks(array('supplier_proposalcontactcard', 'globalcard'));

+$permissiontoedit = $user->rights->supplier_proposal->creer;

@@ -59,20 +51,24 @@
- * Actions

- */

-

-$parameters = array('id'=>$id);

-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);

-if ($reshook < 0) {

-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-}

-

-if (empty($reshook)) {

-	/*

-	 * Add a new contact

-	 */

-	if ($action == 'addcontact' && $permissiontoedit) {

-		$result = $object->fetch($id);

-

-		if ($result > 0 && $id > 0) {

-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));

-			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

-			$result = $object->add_contact($contactid, $typeid, GETPOST("source"));

+ * Add a new contact

+ */

+

+if ($action == 'addcontact' && $permissiontoedit)

+{

+	$result = $object->fetch($id);

+

+    if ($result > 0 && $id > 0)

+    {

+    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));

+  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);

+    }

+

+	if ($result >= 0)

+	{

+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

+		exit;

+	}

+	else

+	{

+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')

+		{

+			$langs->load("errors");

+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');

@@ -80,17 +76,2 @@
-

-		if ($result >= 0) {

-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

-			exit;

-		} else {

-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

-				$langs->load("errors");

-				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');

-			} else {

-				setEventMessages($object->error, $object->errors, 'errors');

-			}

-		}

-	} elseif ($action == 'swapstatut' && $permissiontoedit) {

-		// Toggle the status of a contact

-		if ($object->fetch($id)) {

-			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));

-		} else {

+		else

+		{

@@ -99,13 +80,32 @@
-	} elseif ($action == 'deletecontact' && $permissiontoedit) {

-		// Deleting a contact

-		$object->fetch($id);

-		$result = $object->delete_contact(GETPOST("lineid", 'int'));

-

-		if ($result >= 0) {

-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

-			exit;

-		} else {

-			setEventMessages($object->error, $object->errors, 'errors');

-		}

-	}

-}

+	}

+}

+

+// Toggle the status of a contact

+elseif ($action == 'swapstatut' && $permissiontoedit)

+{

+	if ($object->fetch($id))

+	{

+	    $result = $object->swapContactStatus(GETPOST('ligne'));

+	}

+	else

+	{

+		dol_print_error($db);

+	}

+}

+

+// Deleting a contact

+elseif ($action == 'deletecontact' && $permissiontoedit)

+{

+	$object->fetch($id);

+	$result = $object->delete_contact(GETPOST("lineid", 'int'));

+

+	if ($result >= 0)

+	{

+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

+		exit;

+	}

+	else {

+		dol_print_error($db);

+	}

+}

+

@@ -116,0 +117,4 @@
+

+$help_url = '';

+llxHeader('', $langs->trans("SupplierProposals"), $help_url);

+

@@ -129 +133,2 @@
-if ($id > 0 || !empty($ref)) {

+if ($id > 0 || !empty($ref))

+{

@@ -132 +137,2 @@
-	if ($object->fetch($id, $ref) > 0) {

+	if ($object->fetch($id, $ref) > 0)

+	{

@@ -135,4 +140,0 @@
-		$title = $object->ref." - ".$langs->trans('ContactsAddresses');

-		$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';

-		llxHeader('', $title, $help_url);

-

@@ -140 +142 @@
-		print dol_get_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');

+		dol_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');

@@ -148,2 +150,2 @@
-		//$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);

-		//$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);

+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);

+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);

@@ -151 +153 @@
-		$morehtmlref .= $object->thirdparty->getNomUrl(1);

+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);

@@ -153,7 +155,9 @@
-		if (isModEnabled('project')) {

-			$langs->load("projects");

-			$morehtmlref .= '<br>';

-			if (0) {

-				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');

-				if ($action != 'classify') {

-					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';

+		if (!empty($conf->projet->enabled))

+		{

+		    $langs->load("projects");

+		    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+		    if ($permissiontoedit)

+		    {

+		        if ($action != 'classify') {

+		        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+					$morehtmlref .= ' : ';

@@ -161,11 +165,22 @@
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');

-			} else {

-				if (!empty($object->fk_project)) {

-					$proj = new Project($db);

-					$proj->fetch($object->fk_project);

-					$morehtmlref .= $proj->getNomUrl(1);

-					if ($proj->title) {

-						$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';

-					}

-				}

-			}

+	        	if ($action == 'classify') {

+	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+	                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+	                $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+	                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+	                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+	                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+	                $morehtmlref .= '</form>';

+	            } else {

+	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

+	            }

+		    } else {

+		        if (!empty($object->fk_project)) {

+		            $proj = new Project($db);

+		            $proj->fetch($object->fk_project);

+		            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+		            $morehtmlref .= $proj->ref;

+		            $morehtmlref .= '</a>';

+		        } else {

+		            $morehtmlref .= '';

+		        }

+		    }

@@ -178 +193 @@
-		print dol_get_fiche_end();

+		dol_fiche_end();

@@ -182 +197,3 @@
-	} else {

+	}

+	else

+	{

--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_document.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_document.php
@@ -29 +28,0 @@
-// Load Dolibarr environment

@@ -36 +35 @@
-if (isModEnabled('project')) {

+if (!empty($conf->projet->enabled)) {

@@ -40 +39 @@
-$langs->loadLangs(array('compta', 'supplier_proposal', 'other'));

+$langs->loadLangs(array('compta', 'other'));

@@ -49 +48,2 @@
-if (!empty($user->socid)) {

+if (!empty($user->socid))

+{

@@ -56,2 +56,2 @@
-$sortfield = GETPOST('sortfield', 'aZ09comma');

-$sortorder = GETPOST('sortorder', 'aZ09comma');

+$sortfield = GETPOST("sortfield", 'alpha');

+$sortorder = GETPOST("sortorder", 'alpha');

@@ -59,3 +59 @@
-if (empty($page) || $page == -1) {

-	$page = 0;

-}     // If $page is not defined, or '' or -1

+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1

@@ -65,6 +63,2 @@
-if (!$sortorder) {

-	$sortorder = "ASC";

-}

-if (!$sortfield) {

-	$sortfield = "name";

-}

+if (!$sortorder) $sortorder = "ASC";

+if (!$sortfield) $sortfield = "name";

@@ -74 +68,2 @@
-if ($object->id > 0) {

+if ($object->id > 0)

+{

@@ -77,11 +72 @@
-}

-

-$permissiontoadd = $user->rights->supplier_proposal->creer;

-$usercancreate = $permissiontoadd;

-

-/*

- * Actions

- */

-

-if ($object->id > 0) {

-	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';

+	include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';

@@ -95,3 +80 @@
-$title = $object->ref." - ".$langs->trans('Documents');

-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';

-llxHeader('', $title, $help_url);

+llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');

@@ -101 +84,2 @@
-if ($object->id > 0) {

+if ($object->id > 0)

+{

@@ -105 +89 @@
-	print dol_get_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');

+	dol_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');

@@ -108 +92 @@
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);

+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);

@@ -110 +94,2 @@
-	foreach ($filearray as $key => $file) {

+	foreach ($filearray as $key => $file)

+	{

@@ -124 +109 @@
-	$morehtmlref .= $object->thirdparty->getNomUrl(1);

+	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);

@@ -126,19 +111,32 @@
-	if (isModEnabled('project')) {

-		$langs->load("projects");

-		$morehtmlref .= '<br>';

-		if (0) {

-			$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');

-			if ($action != 'classify') {

-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';

-			}

-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');

-		} else {

-			if (!empty($object->fk_project)) {

-				$proj = new Project($db);

-				$proj->fetch($object->fk_project);

-				$morehtmlref .= $proj->getNomUrl(1);

-				if ($proj->title) {

-					$morehtmlref .= ' - '.$proj->title;

-				}

-			}

-		}

+	if (!empty($conf->projet->enabled))

+	{

+	    $langs->load("projects");

+	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+	    if ($user->rights->supplier_proposal->creer)

+	    {

+	        if ($action != 'classify') {

+	        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+				$morehtmlref .= ' : ';

+            }

+            if ($action == 'classify') {

+                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+                $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+                $morehtmlref .= '</form>';

+            } else {

+                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

+            }

+	    } else {

+	        if (!empty($object->fk_project)) {

+	            $proj = new Project($db);

+	            $proj->fetch($object->fk_project);

+	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+	            $morehtmlref .= $proj->ref;

+	            $morehtmlref .= '</a>';

+	        } else {

+	            $morehtmlref .= '';

+	        }

+	    }

@@ -164 +162 @@
-	print dol_get_fiche_end();

+	dol_fiche_end();

@@ -167 +165 @@
-	$permissiontoadd = $user->rights->supplier_proposal->creer;

+	$permission = $user->rights->supplier_proposal->creer;

@@ -170,2 +168,4 @@
-	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

-} else {

+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

+}

+else

+{

--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_index.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_index.php
@@ -27 +26,0 @@
-// Load Dolibarr environment

@@ -42 +41,2 @@
-if (isset($user->socid) && $user->socid > 0) {

+if (isset($user->socid) && $user->socid > 0)

+{

@@ -64,0 +65,17 @@
+

+// Search form

+

+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo

+{

+    print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';

+    print '<input type="hidden" name="token" value="'.newToken().'">';

+    print '<div class="div-table-responsive-no-min">';

+    print '<table class="noborder nohover centpercent">';

+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';

+    print '<tr class="oddeven"><td>';

+    print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';

+    print '</tr>';

+    print "</table></div></form><br>\n";

+}

+

+

@@ -70,3 +87 @@
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-}

+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -75,6 +90,2 @@
-if ($user->socid) {

-	$sql .= ' AND p.fk_soc = '.((int) $user->socid);

-}

-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-}

+if ($user->socid) $sql .= ' AND p.fk_soc = '.$user->socid;

+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

@@ -84,76 +95,74 @@
-if ($resql) {

-	$num = $db->num_rows($resql);

-	$i = 0;

-

-	$total = 0;

-	$totalinprocess = 0;

-	$dataseries = array();

-	$colorseries = array();

-	$vals = array();

-	// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for sales orders), 3=Closed (Sent/Received, billed or not)

-	while ($i < $num) {

-		$row = $db->fetch_row($resql);

-		if ($row) {

-			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))

-			{

-				$vals[$row[1]] = $row[0];

-				$totalinprocess += $row[0];

-			}

-			$total += $row[0];

-		}

-		$i++;

-	}

-	$db->free($resql);

-

-	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

-

-	print '<div class="div-table-responsive-no-min">';

-	print '<table class="noborder centpercent">';

-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";

-	$listofstatus = array(0, 1, 2, 3, 4);

-	foreach ($listofstatus as $status) {

-		$dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

-		if ($status == SupplierProposal::STATUS_DRAFT) {

-			$colorseries[$status] = '-'.$badgeStatus0;

-		}

-		if ($status == SupplierProposal::STATUS_VALIDATED) {

-			$colorseries[$status] = $badgeStatus1;

-		}

-		if ($status == SupplierProposal::STATUS_SIGNED) {

-			$colorseries[$status] = $badgeStatus4;

-		}

-		if ($status == SupplierProposal::STATUS_NOTSIGNED) {

-			$colorseries[$status] = $badgeStatus9;

-		}

-		if ($status == SupplierProposal::STATUS_CLOSE) {

-			$colorseries[$status] = $badgeStatus6;

-		}

-

-		if (empty($conf->use_javascript_ajax)) {

-			print '<tr class="oddeven">';

-			print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';

-			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';

-			print "</tr>\n";

-		}

-	}

-	if ($conf->use_javascript_ajax) {

-		print '<tr><td class="center" colspan="2">';

-

-		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

-		$dolgraph = new DolGraph();

-		$dolgraph->SetData($dataseries);

-		$dolgraph->SetDataColor(array_values($colorseries));

-		$dolgraph->setShowLegend(2);

-		$dolgraph->setShowPercent(1);

-		$dolgraph->SetType(array('pie'));

-		$dolgraph->setHeight('200');

-		$dolgraph->draw('idgraphstatus');

-		print $dolgraph->show($total ? 0 : 1);

-

-		print '</td></tr>';

-	}

-

-	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';

-	print "</table></div><br>";

-} else {

-	dol_print_error($db);

+if ($resql)

+{

+    $num = $db->num_rows($resql);

+    $i = 0;

+

+    $total = 0;

+    $totalinprocess = 0;

+    $dataseries = array();

+    $colorseries = array();

+    $vals = array();

+    // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)

+    while ($i < $num)

+    {

+        $row = $db->fetch_row($resql);

+        if ($row)

+        {

+            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))

+            {

+                $vals[$row[1]] = $row[0];

+                $totalinprocess += $row[0];

+            }

+            $total += $row[0];

+        }

+        $i++;

+    }

+    $db->free($resql);

+

+    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';

+

+    print '<div class="div-table-responsive-no-min">';

+    print '<table class="noborder centpercent">';

+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";

+    $listofstatus = array(0, 1, 2, 3, 4);

+    foreach ($listofstatus as $status)

+    {

+    	$dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

+    	if ($status == SupplierProposal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;

+    	if ($status == SupplierProposal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;

+    	if ($status == SupplierProposal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;

+    	if ($status == SupplierProposal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;

+    	if ($status == SupplierProposal::STATUS_CLOSE) $colorseries[$status] = $badgeStatus6;

+

+    	if (empty($conf->use_javascript_ajax))

+    	{

+    		print '<tr class="oddeven">';

+    		print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';

+    		print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';

+    		print "</tr>\n";

+    	}

+    }

+    if ($conf->use_javascript_ajax)

+    {

+        print '<tr><td class="center" colspan="2">';

+

+        include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';

+        $dolgraph = new DolGraph();

+        $dolgraph->SetData($dataseries);

+        $dolgraph->SetDataColor(array_values($colorseries));

+        $dolgraph->setShowLegend(2);

+        $dolgraph->setShowPercent(1);

+        $dolgraph->SetType(array('pie'));

+        $dolgraph->setHeight('200');

+        $dolgraph->draw('idgraphstatus');

+        print $dolgraph->show($total ? 0 : 1);

+

+        print '</td></tr>';

+    }

+

+    print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';

+    print "</table></div><br>";

+}

+else

+{

+    dol_print_error($db);

@@ -166 +175,2 @@
-if (isModEnabled('supplier_proposal')) {

+if (!empty($conf->supplier_proposal->enabled))

+{

@@ -170,3 +180 @@
-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -176,6 +184,2 @@
-	if ($socid) {

-		$sql .= " AND c.fk_soc = ".((int) $socid);

-	}

-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

+	if ($socid) $sql .= " AND c.fk_soc = ".$socid;

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

@@ -184,2 +188,3 @@
-	if ($resql) {

-		print '<div class="div-table-responsive-no-min">';

+	if ($resql)

+	{

+        print '<div class="div-table-responsive-no-min">';

@@ -191 +196,2 @@
-		if ($num) {

+		if ($num)

+		{

@@ -193 +199,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -215 +222 @@
-print '</div><div class="fichetwothirdright">';

+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';

@@ -228,3 +235 @@
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-}

+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -234,6 +239,2 @@
-if ($socid) {

-	$sql .= " AND c.fk_soc = ".((int) $socid);

-}

-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-}

+if ($socid) $sql .= " AND c.fk_soc = ".$socid;

+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

@@ -244,2 +245,3 @@
-if ($resql) {

-	print '<div class="div-table-responsive-no-min">';

+if ($resql)

+{

+    print '<div class="div-table-responsive-no-min">';

@@ -251 +253,2 @@
-	if ($num) {

+	if ($num)

+	{

@@ -253 +256,2 @@
-		while ($i < $num) {

+		while ($i < $num)

+		{

@@ -293,3 +297,2 @@
-} else {

-	dol_print_error($db);

-}

+}

+else dol_print_error($db);

@@ -301 +304,2 @@
-if (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire')) {

+if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)

+{

@@ -306 +310 @@
-	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as supplier_proposalid, p.total_ttc, p.total_tva, p.total_ht, p.ref, p.fk_statut, p.datec as dp";

+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as supplier_proposalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datec as dp";

@@ -309,3 +313 @@
-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	}

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

@@ -315,6 +317,2 @@
-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {

-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);

-	}

-	if ($socid) {

-		$sql .= " AND s.rowid = ".((int) $socid);

-	}

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

+	if ($socid) $sql .= " AND s.rowid = ".$socid;

@@ -324 +322,2 @@
-	if ($result) {

+	if ($result)

+	{

@@ -328,2 +327,3 @@
-		if ($num > 0) {

-			print '<div class="div-table-responsive-no-min">';

+		if ($num > 0)

+		{

+            print '<div class="div-table-responsive-no-min">';

@@ -333,2 +333,3 @@
-			$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

-			while ($i < $nbofloop) {

+			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

+			while ($i < $nbofloop)

+			{

@@ -350,3 +351 @@
-				if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) {

-					print img_warning($langs->trans("Late"));

-				}

+				if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late"));

@@ -377 +376,2 @@
-			if ($num > $nbofloop) {

+			if ($num > $nbofloop)

+			{

@@ -379 +379,3 @@
-			} elseif ($total > 0) {

+			}

+			elseif ($total > 0)

+			{

@@ -384 +386,3 @@
-	} else {

+	}

+	else

+	{

@@ -389 +393 @@
-print '</div></div>';

+print '</div></div></div>';

--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_info.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_info.php
@@ -22 +22 @@
- *      \file       htdocs/supplier_proposal/info.php

+ *      \file       htdocs/comm/propal/info.php

@@ -27 +26,0 @@
-// Load Dolibarr environment

@@ -32 +31 @@
-if (isModEnabled('project')) {

+if (!empty($conf->projet->enabled)) {

@@ -43,3 +42 @@
-if (!empty($user->socid)) {

-	$socid = $user->socid;

-}

+if (!empty($user->socid)) $socid = $user->socid;

@@ -51,0 +49 @@
+

@@ -52,0 +51,3 @@
+

+llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');

+

@@ -55,0 +57 @@
+

@@ -57,4 +58,0 @@
-

-$title = $object->ref." - ".$langs->trans('Info');

-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';

-llxHeader('', $title, $help_url);

@@ -64 +62 @@
-print dol_get_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');

+dol_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');

@@ -75 +73 @@
-$morehtmlref .= $object->thirdparty->getNomUrl(1);

+$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);

@@ -77,21 +75,32 @@
-if (isModEnabled('project')) {

-	$langs->load("projects");

-	$morehtmlref .= '<br>';

-	if (0) {

-		$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');

-		if ($action != 'classify') {

-			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';

-		}

-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');

-	} else {

-		if (!empty($object->fk_project)) {

-			$proj = new Project($db);

-			$proj->fetch($object->fk_project);

-			$morehtmlref .= $proj->getNomUrl(1);

-			if ($proj->title) {

-				$morehtmlref .= ' - '.$proj->title;

-			}

-		} else {

-			$morehtmlref .= '';

-		}

-	}

+if (!empty($conf->projet->enabled))

+{

+    $langs->load("projects");

+    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+    if ($user->rights->supplier_proposal->creer)

+    {

+        if ($action != 'classify') {

+        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+			$morehtmlref .= ' : ';

+        }

+        if ($action == 'classify') {

+            //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+            $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+            $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+            $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+            $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+            $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+            $morehtmlref .= '</form>';

+        } else {

+            $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

+        }

+    } else {

+        if (!empty($object->fk_project)) {

+            $proj = new Project($db);

+            $proj->fetch($object->fk_project);

+            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+            $morehtmlref .= $proj->ref;

+            $morehtmlref .= '</a>';

+        } else {

+            $morehtmlref .= '';

+        }

+    }

@@ -116 +125 @@
-print dol_get_fiche_end();

+dol_fiche_end();

--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_list.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_list.php
@@ -2,13 +2,12 @@
-/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>

- * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>

- * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>

- * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>

- * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@inodbox.com>

- * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>

- * Copyright (C) 2010-2011	Juanjo Menent			<jmenent@2byte.es>

- * Copyright (C) 2010-2019	Philippe Grand			<philippe.grand@atoo-net.com>

- * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>

- * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>

- * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>

- * Copyright (C) 2018-2023	Charlene Benke			<charlene@patas-monkey.com>

- * Copyright (C) 2021		Alexandre Spangaro		<aspangaro@open-dsi.fr>

+/* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>

+ * Copyright (C) 2004-2017 Laurent Destailleur   <eldy@users.sourceforge.net>

+ * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>

+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>

+ * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@inodbox.com>

+ * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>

+ * Copyright (C) 2010-2011 Juanjo Menent         <jmenent@2byte.es>

+ * Copyright (C) 2010-2019 Philippe Grand        <philippe.grand@atoo-net.com>

+ * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>

+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>

+ * Copyright (C) 2016	   Ferran Marcet         <fmarcet@2byte.es>

+ * Copyright (C) 2018	   Charlene Benke        <charlie@patas-monkey.com>

@@ -36 +34,0 @@
-// Load Dolibarr environment

@@ -45 +43 @@
-if (isModEnabled('project')) {

+if (!empty($conf->projet->enabled))

@@ -47 +44,0 @@
-}

@@ -54 +51 @@
-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

@@ -59,2 +56 @@
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierproposallist';

-$mode = GETPOST('mode', 'alpha');

+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierproposallist';

@@ -64 +60 @@
-$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');

+$search_ref = GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');

@@ -66 +61,0 @@
-$search_societe_alias = GETPOST('search_societe_alias', 'alpha');

@@ -70 +65 @@
-$search_state = GETPOST("search_state");

+$search_state = trim(GETPOST("search_state"));

@@ -72,16 +66,0 @@
-$search_date_startday = GETPOST('search_date_startday', 'int');

-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');

-$search_date_startyear = GETPOST('search_date_startyear', 'int');

-$search_date_endday = GETPOST('search_date_endday', 'int');

-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');

-$search_date_endyear = GETPOST('search_date_endyear', 'int');

-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver

-$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);

-$search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');

-$search_date_valid_startmonth = GETPOST('search_date_valid_startmonth', 'int');

-$search_date_valid_startyear = GETPOST('search_date_valid_startyear', 'int');

-$search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');

-$search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');

-$search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');

-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver

-$search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);

@@ -98 +76,0 @@
-$search_product_category = GETPOST('search_product_category', 'int');

@@ -104 +82 @@
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));

+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));

@@ -107,5 +85,10 @@
-

-$optioncss = GETPOST('optioncss', 'alpha');

-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;

-$sortfield = GETPOST('sortfield', 'aZ09comma');

-$sortorder = GETPOST('sortorder', 'aZ09comma');

+$year = GETPOST("year");

+$month = GETPOST("month");

+$day = GETPOST("day");

+$yearvalid = GETPOST("yearvalid");

+$monthvalid = GETPOST("monthvalid");

+$dayvalid = GETPOST("dayvalid");

+

+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;

+$sortfield = GETPOST("sortfield", 'alpha');

+$sortorder = GETPOST("sortorder", 'alpha');

@@ -113,3 +96 @@
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {

-	$page = 0;

-}     // If $page is not defined, or '' or -1

+if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1

@@ -119,10 +100,4 @@
-if (!$sortfield) {

-	$sortfield = 'sp.date_livraison';

-}

-if (!$sortorder) {

-	$sortorder = 'DESC';

-}

-

-if ($object_statut != '') {

-	$search_status = $object_statut;

-}

+if (!$sortfield) $sortfield = 'sp.date_livraison';

+if (!$sortorder) $sortorder = 'DESC';

+

+if ($object_statut != '') $search_status = $object_statut;

@@ -137,4 +112,3 @@
-if (!empty($user->socid)) {

-	$socid = $user->socid;

-}

-if (!empty($socid)) {

+if (!empty($user->socid))	$socid = $user->socid;

+if (!empty($socid))

+{

@@ -144,0 +119 @@
+$result = restrictedArea($user, $module, $objectid, $dbtable);

@@ -166,3 +141 @@
-if (empty($user->socid)) {

-	$fieldstosearchall["p.note_private"] = "NotePrivate";

-}

+if (empty($user->socid)) $fieldstosearchall["p.note_private"] = "NotePrivate";

@@ -174 +146,0 @@
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>0),

@@ -180 +152 @@
-	'sp.date_valid'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),

+	'sp.date_valid'=>array('label'=>$langs->trans("Date"), 'checked'=>1),

@@ -183 +155 @@
-	'sp.total_tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),

+	'sp.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),

@@ -185,5 +157,5 @@
-	'sp.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),

-	'sp.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),

-	'sp.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),

-	'sp.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),

-	'sp.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),

+	'sp.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'sp.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'sp.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'sp.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

+	'sp.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),

@@ -196,2 +168,8 @@
-include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';

-

+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)

+{

+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)

+	{

+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))

+			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));

+	}

+}

@@ -201,8 +178,0 @@
-if (!$user->hasRight('societe', 'client', 'voir')) {

-	$search_sale = $user->id;

-}

-

-$result = restrictedArea($user, $module, $objectid, $dbtable);

-

-$permissiontoread = $user->rights->supplier_proposal->lire;

-$permissiontodelete = $user->rights->supplier_proposal->supprimer;

@@ -215,7 +185,2 @@
-if (GETPOST('cancel', 'alpha')) {

-	$action = 'list';

-	$massaction = '';

-}

-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {

-	$massaction = '';

-}

+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }

+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }

@@ -225,52 +190,40 @@
-if ($reshook < 0) {

-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-}

-

-if (empty($reshook)) {

-	// Selection of new fields

-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';

-

-	// Purge search criteria

-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers

-		$search_categ = '';

-		$search_user = '';

-		$search_sale = '';

-		$search_ref = '';

-		$search_societe = '';

-		$search_societe_alias = '';

-		$search_montant_ht = '';

-		$search_montant_vat = '';

-		$search_montant_ttc = '';

-		$search_multicurrency_code = '';

-		$search_multicurrency_tx = '';

-		$search_multicurrency_montant_ht = '';

-		$search_multicurrency_montant_vat = '';

-		$search_multicurrency_montant_ttc = '';

-		$search_login = '';

-		$search_product_category = '';

-		$search_town = '';

-		$search_zip = "";

-		$search_state = "";

-		$search_type = '';

-		$search_country = '';

-		$search_type_thirdparty = '';

-		$search_date_startday = '';

-		$search_date_startmonth = '';

-		$search_date_startyear = '';

-		$search_date_endday = '';

-		$search_date_endmonth = '';

-		$search_date_endyear = '';

-		$search_date_start = '';

-		$search_date_end = '';

-		$search_date_valid_startday = '';

-		$search_date_valid_startmonth = '';

-		$search_date_valid_startyear = '';

-		$search_date_valid_endday = '';

-		$search_date_valid_endmonth = '';

-		$search_date_valid_endyear = '';

-		$search_date_valid_start = '';

-		$search_date_valid_end = '';

-		$search_status = '';

-		$object_statut = '';

-	}

-

+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+

+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';

+

+// Do we click on purge search criteria ?

+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers

+{

+	$search_categ = '';

+	$search_user = '';

+	$search_sale = '';

+	$search_ref = '';

+	$search_societe = '';

+	$search_montant_ht = '';

+	$search_montant_vat = '';

+	$search_montant_ttc = '';

+	$search_multicurrency_code = '';

+	$search_multicurrency_tx = '';

+	$search_multicurrency_montant_ht = '';

+	$search_multicurrency_montant_vat = '';

+	$search_multicurrency_montant_ttc = '';

+	$search_login = '';

+	$search_product_category = '';

+	$search_town = '';

+	$search_zip = "";

+	$search_state = "";

+	$search_type = '';

+	$search_country = '';

+	$search_type_thirdparty = '';

+	$yearvalid = '';

+	$monthvalid = '';

+	$dayvalid = '';

+	$year = '';

+	$month = '';

+	$day = '';

+	$search_status = '';

+	$object_statut = '';

+}

+

+if (empty($reshook))

+{

@@ -278,0 +232,2 @@
+	$permissiontoread = $user->rights->supplier_proposal->lire;

+	$permissiontodelete = $user->rights->supplier_proposal->supprimer;

@@ -281,0 +237 @@
+

@@ -286,0 +243,3 @@
+

+

+$now = dol_now();

@@ -295,6 +253,0 @@
-$now = dol_now();

-

-$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields

-

-$title = $langs->trans('ListOfSupplierProposals');

@@ -302,4 +255,2 @@
-

-

-// Build and execute select

-// --------------------------------------------------------------------

+//llxHeader('',$langs->trans('CommRequest'),$help_url);

+

@@ -307,4 +258,2 @@
-if ($sall || $search_user > 0) {

-	$sql = 'SELECT DISTINCT';

-}

-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.town, s.zip, s.fk_pays, s.client, s.code_client,';

+if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';

+$sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';

@@ -313 +262 @@
-$sql .= ' sp.rowid, sp.note_public, sp.note_private, sp.total_ht, sp.total_tva, sp.total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut as status, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';

+$sql .= ' sp.rowid, sp.note_private, sp.total_ht, sp.tva as total_vat, sp.total as total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut as status, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';

@@ -317 +266,2 @@
-$sql .= " u.firstname, u.lastname, u.photo, u.login, u.statut as ustatus, u.admin, u.employee, u.email as uemail";

+if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";

+$sql .= " u.firstname, u.lastname, u.photo, u.login";

@@ -320,3 +270 @@
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {

-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');

-	}

+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');

@@ -333,6 +281,3 @@
-if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (sp.rowid = ef.fk_object)";

-}

-if ($sall) {

-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON sp.rowid=pd.fk_supplier_proposal';

-}

+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (sp.rowid = ef.fk_object)";

+if ($sall || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON sp.rowid=pd.fk_supplier_proposal';

+if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';

@@ -341 +286,4 @@
-if ($search_user > 0) {

+// We'll need this table joined to the select in order to filter by sale

+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

+if ($search_user > 0)

+{

@@ -347,120 +295,29 @@
-if ($search_town) {

-	$sql .= natural_search('s.town', $search_town);

-}

-if ($search_zip) {

-	$sql .= natural_search("s.zip", $search_zip);

-}

-if ($search_state) {

-	$sql .= natural_search("state.nom", $search_state);

-}

-if ($search_country) {

-	$sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';

-}

-if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {

-	$sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';

-}

-if ($search_ref) {

-	$sql .= natural_search('sp.ref', $search_ref);

-}

-if (empty($arrayfields['s.name_alias']['checked']) && $search_societe) {

-	$sql .= natural_search(array("s.nom", "s.name_alias"), $search_societe);

-} else {

-	if ($search_societe) {

-		$sql .= natural_search('s.nom', $search_societe);

-	}

-	if ($search_societe_alias) {

-		$sql .= natural_search('s.name_alias', $search_societe_alias);

-	}

-}

-if ($search_login) {

-	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_login);

-}

-if ($search_montant_ht) {

-	$sql .= natural_search('sp.total_ht', $search_montant_ht, 1);

-}

-if ($search_montant_vat != '') {

-	$sql .= natural_search("sp.total_tva", $search_montant_vat, 1);

-}

-if ($search_montant_ttc != '') {

-	$sql .= natural_search("sp.total_ttc", $search_montant_ttc, 1);

-}

-if ($search_multicurrency_code != '') {

-	$sql .= " AND sp.multicurrency_code = '".$db->escape($search_multicurrency_code)."'";

-}

-if ($search_multicurrency_tx != '') {

-	$sql .= natural_search('sp.multicurrency_tx', $search_multicurrency_tx, 1);

-}

-if ($search_multicurrency_montant_ht != '') {

-	$sql .= natural_search('sp.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);

-}

-if ($search_multicurrency_montant_vat != '') {

-	$sql .= natural_search('sp.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);

-}

-if ($search_multicurrency_montant_ttc != '') {

-	$sql .= natural_search('sp.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);

-}

-if ($sall) {

-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);

-}

-if ($socid > 0) {

-	$sql .= ' AND s.rowid = '.((int) $socid);

-}

-if ($search_status >= 0 && $search_status != '') {

-	$sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';

-}

-if ($search_date_start) {

-	$sql .= " AND sp.date_livraison >= '".$db->idate($search_date_start)."'";

-}

-if ($search_date_end) {

-	$sql .= " AND sp.date_livraison <= '".$db->idate($search_date_end)."'";

-}

-if ($search_date_valid_start) {

-	$sql .= " AND sp.date_valid >= '".$db->idate($search_date_valid_start)."'";

-}

-if ($search_date_valid_end) {

-	$sql .= " AND sp.date_valid <= '".$db->idate($search_date_valid_end)."'";

-}

-/*

-if ($search_sale > 0) {

-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);

-}*/

-if ($search_user > 0) {

-	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".((int) $search_user);

-}

-// Search on sale representative

-if ($search_sale && $search_sale != '-1') {

-	if ($search_sale == -2) {

-		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = sp.fk_soc)";

-	} elseif ($search_sale > 0) {

-		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = sp.fk_soc AND sc.fk_user = ".((int) $search_sale).")";

-	}

-}

-// Search for tag/category ($searchCategoryProductList is an array of ID)

-$searchCategoryProductOperator = -1;

-$searchCategoryProductList = array($search_product_category);

-if (!empty($searchCategoryProductList)) {

-	$searchCategoryProductSqlList = array();

-	$listofcategoryid = '';

-	foreach ($searchCategoryProductList as $searchCategoryProduct) {

-		if (intval($searchCategoryProduct) == -2) {

-			$searchCategoryProductSqlList[] = "NOT EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product)";

-		} elseif (intval($searchCategoryProduct) > 0) {

-			if ($searchCategoryProductOperator == 0) {

-				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";

-			} else {

-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);

-			}

-		}

-	}

-	if ($listofcategoryid) {

-		$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."supplier_proposaldet as sd WHERE sd.fk_supplier_proposal = sp.rowid AND sd.fk_product = ck.fk_product AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";

-	}

-	if ($searchCategoryProductOperator == 1) {

-		if (!empty($searchCategoryProductSqlList)) {

-			$sql .= " AND (".implode(' OR ', $searchCategoryProductSqlList).")";

-		}

-	} else {

-		if (!empty($searchCategoryProductSqlList)) {

-			$sql .= " AND (".implode(' AND ', $searchCategoryProductSqlList).")";

-		}

-	}

+if (!$user->rights->societe->client->voir && !$socid) //restriction

+{

+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

+}

+if ($search_town)  $sql .= natural_search('s.town', $search_town);

+if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);

+if ($search_state) $sql .= natural_search("state.nom", $search_state);

+if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';

+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';

+if ($search_ref)     $sql .= natural_search('sp.ref', $search_ref);

+if ($search_societe) $sql .= natural_search('s.nom', $search_societe);

+if ($search_login)  $sql .= natural_search('u.login', $search_login);

+if ($search_montant_ht) $sql .= natural_search('sp.total_ht=', $search_montant_ht, 1);

+if ($search_montant_vat != '') $sql .= natural_search("sp.tva", $search_montant_vat, 1);

+if ($search_montant_ttc != '') $sql .= natural_search("sp.total", $search_montant_ttc, 1);

+if ($search_multicurrency_code != '')        $sql .= ' AND sp.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';

+if ($search_multicurrency_tx != '')          $sql .= natural_search('sp.multicurrency_tx', $search_multicurrency_tx, 1);

+if ($search_multicurrency_montant_ht != '')  $sql .= natural_search('sp.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);

+if ($search_multicurrency_montant_vat != '') $sql .= natural_search('sp.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);

+if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('sp.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);

+if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);

+if ($socid) $sql .= ' AND s.rowid = '.$socid;

+if ($search_status >= 0 && $search_status != '') $sql .= ' AND sp.fk_statut IN ('.$db->escape($search_status).')';

+$sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);

+$sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);

+if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;

+if ($search_user > 0)

+{

+	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".$search_user;

@@ -472 +329 @@
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook

@@ -480 +337,2 @@
-if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {

+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))

+{

@@ -483 +341,2 @@
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0

+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0

+	{

@@ -492 +351,2 @@
-if ($resql) {

+if ($resql)

+{

@@ -496 +356,2 @@
-	if ($socid > 0) {

+	if ($socid > 0)

+	{

@@ -499,3 +360,5 @@
-		$title = $langs->trans('SupplierProposals').' - '.$soc->name;

-	} else {

-		$title = $langs->trans('SupplierProposals');

+		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;

+	}

+	else

+	{

+		$title = $langs->trans('ListOfSupplierProposals');

@@ -508 +371,2 @@
-	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {

+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)

+	{

@@ -513,0 +378 @@
+

@@ -517,4 +382 @@
-	// Output page

-	// --------------------------------------------------------------------

-

-	llxHeader('', $title, $help_url);

+	llxHeader('', $langs->trans('CommRequest'), $help_url);

@@ -523,102 +385,21 @@
-	if (!empty($mode)) {

-		$param .= '&mode='.urlencode($mode);

-	}

-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

-		$param .= '&contextpage='.urlencode($contextpage);

-	}

-	if ($limit > 0 && $limit != $conf->liste_limit) {

-		$param .= '&limit='.((int) $limit);

-	}

-	if ($sall) {

-		$param .= '&sall='.urlencode($sall);

-	}

-	if ($search_date_startday) {

-		$param .= '&search_date_startday='.urlencode($search_date_startday);

-	}

-	if ($search_date_startmonth) {

-		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);

-	}

-	if ($search_date_startyear) {

-		$param .= '&search_date_startyear='.urlencode($search_date_startyear);

-	}

-	if ($search_date_endday) {

-		$param .= '&search_date_endday='.urlencode($search_date_endday);

-	}

-	if ($search_date_endmonth) {

-		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);

-	}

-	if ($search_date_endyear) {

-		$param .= '&search_date_endyear='.urlencode($search_date_endyear);

-	}

-	if ($search_date_valid_startday) {

-		$param .= '&search_date_valid_startday='.urlencode($search_date_valid_startday);

-	}

-	if ($search_date_valid_startmonth) {

-		$param .= '&search_date_valid_startmonth='.urlencode($search_date_valid_startmonth);

-	}

-	if ($search_date_valid_startyear) {

-		$param .= '&search_date_valid_startyear='.urlencode($search_date_valid_startyear);

-	}

-	if ($search_date_valid_endday) {

-		$param .= '&search_date_valid_endday='.urlencode($search_date_valid_endday);

-	}

-	if ($search_date_valid_endmonth) {

-		$param .= '&search_date_valid_endmonth='.urlencode($search_date_valid_endmonth);

-	}

-	if ($search_date_valid_endyear) {

-		$param .= '&search_date_valid_endyear='.urlencode($search_date_valid_endyear);

-	}

-	if ($search_ref) {

-		$param .= '&search_ref='.urlencode($search_ref);

-	}

-	if ($search_societe) {

-		$param .= '&search_societe='.urlencode($search_societe);

-	}

-	if ($search_societe_alias) {

-		$param .= '&search_societe_alias='.urlencode($search_societe_alias);

-	}

-	if ($search_user > 0) {

-		$param .= '&search_user='.urlencode($search_user);

-	}

-	if ($search_sale > 0) {

-		$param .= '&search_sale='.urlencode($search_sale);

-	}

-	if ($search_montant_ht) {

-		$param .= '&search_montant_ht='.urlencode($search_montant_ht);

-	}

-	if ($search_multicurrency_code != '') {

-		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);

-	}

-	if ($search_multicurrency_tx != '') {

-		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);

-	}

-	if ($search_multicurrency_montant_ht != '') {

-		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);

-	}

-	if ($search_multicurrency_montant_vat != '') {

-		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);

-	}

-	if ($search_multicurrency_montant_ttc != '') {

-		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);

-	}

-	if ($search_login) {

-		$param .= '&search_login='.urlencode($search_login);

-	}

-	if ($search_town) {

-		$param .= '&search_town='.urlencode($search_town);

-	}

-	if ($search_zip) {

-		$param .= '&search_zip='.urlencode($search_zip);

-	}

-	if ($socid > 0) {

-		$param .= '&socid='.urlencode($socid);

-	}

-	if ($search_status != '') {

-		$param .= '&search_status='.urlencode($search_status);

-	}

-	if ($optioncss != '') {

-		$param .= '&optioncss='.urlencode($optioncss);

-	}

-	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {

-		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);

-	}

+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);

+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);

+	if ($sall)				 $param .= '&sall='.urlencode($sall);

+	if ($month)              $param .= '&month='.urlencode($month);

+	if ($year)               $param .= '&year='.urlencode($year);

+	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);

+	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);

+	if ($search_user > 0)    $param .= '&search_user='.urlencode($search_user);

+	if ($search_sale > 0)    $param .= '&search_sale='.urlencode($search_sale);

+	if ($search_montant_ht)  $param .= '&search_montant_ht='.urlencode($search_montant_ht);

+	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);

+	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);

+	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);

+	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);

+	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);

+	if ($search_login)  	 $param .= '&search_login='.urlencode($search_login);

+	if ($search_town)		 $param .= '&search_town='.urlencode($search_town);

+	if ($search_zip)		 $param .= '&search_zip='.urlencode($search_zip);

+	if ($socid > 0)          $param .= '&socid='.urlencode($socid);

+	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);

+	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);

@@ -630,3 +411,3 @@
-		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),

-		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),

-		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),

+		'generate_doc'=>$langs->trans("ReGeneratePDF"),

+		'builddoc'=>$langs->trans("PDFMerge"),

+	    //'presend'=>$langs->trans("SendByMail"),

@@ -634,6 +415,2 @@
-	if ($user->hasRight('supplier_proposal', 'supprimer')) {

-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");

-	}

-	if (in_array($massaction, array('presend', 'predelete'))) {

-		$arrayofmassactions = array();

-	}

+	if ($user->rights->supplier_proposal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");

+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();

@@ -642,4 +418,0 @@
-	$url = DOL_URL_ROOT.'/supplier_proposal/card.php?action=create';

-	if (!empty($socid)) {

-		$url .= '&socid='.$socid;

-	}

@@ -647,4 +420,4 @@
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));

-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));

-	$newcardbutton .= dolGetButtonTitleSeparator();

-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('supplier_proposal', 'creer'));

+	if ($user->rights->supplier_proposal->creer)

+	{

+        $newcardbutton .= dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create');

+    }

@@ -654,3 +427 @@
-	if ($optioncss != '') {

-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

-	}

+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

@@ -662 +432,0 @@
-	print '<input type="hidden" name="mode" value="'.$mode.'">';

@@ -672,4 +442,3 @@
-	if ($sall) {

-		foreach ($fieldstosearchall as $key => $val) {

-			$fieldstosearchall[$key] = $langs->trans($val);

-		}

+	if ($sall)

+	{

+		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);

@@ -682,0 +452,9 @@
+ 	// If the user can view prospects other than his'

+ 	if ($user->rights->societe->client->voir || $socid)

+ 	{

+ 		$langs->load("commercial");

+	 	$moreforfilter .= '<div class="divsearchfield">';

+	 	$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';

+		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');

+	 	$moreforfilter .= '</div>';

+ 	}

@@ -684,2 +462,2 @@
-	if ($user->hasRight('user', 'user', 'lire')) {

-		$langs->load("commercial");

+	if ($user->rights->societe->client->voir || $socid)

+	{

@@ -687,2 +465,2 @@
-		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');

-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx');

+		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';

+		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');

@@ -691,7 +468,0 @@
-	// If the user can view prospects other than his'

-	if ($user->hasRight('user', 'user', 'lire')) {

-		$moreforfilter .= '<div class="divsearchfield">';

-		$tmptitle = $langs->trans('LinkedToSpecificUsers');

-		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');

-		$moreforfilter .= '</div>';

-	}

@@ -699 +470,2 @@
-	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {

+	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))

+	{

@@ -702 +474 @@
-		$tmptitle = $langs->trans('IncludingProductWithTag');

+		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';

@@ -704 +476 @@
-		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth300 widthcentpercentminusx', 1);

+		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);

@@ -709,7 +481,5 @@
-	if (empty($reshook)) {

-		$moreforfilter .= $hookmanager->resPrint;

-	} else {

-		$moreforfilter = $hookmanager->resPrint;

-	}

-

-	if (!empty($moreforfilter)) {

+	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;

+	else $moreforfilter = $hookmanager->resPrint;

+

+	if (!empty($moreforfilter))

+	{

@@ -722,2 +492,2 @@
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields

-	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');

+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields

+	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

@@ -726,4 +496,2 @@
-	print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

-

-	// Fields title search

-	// --------------------------------------------------------------------

+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

+

@@ -731,8 +499,2 @@
-	// Action column

-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print '<td class="liste_titre maxwidthsearch">';

-		$searchpicto = $form->showFilterButtons('left');

-		print $searchpicto;

-		print '</td>';

-	}

-	if (!empty($arrayfields['sp.ref']['checked'])) {

+	if (!empty($arrayfields['sp.ref']['checked']))

+	{

@@ -743 +505,2 @@
-	if (!empty($arrayfields['s.nom']['checked'])) {

+	if (!empty($arrayfields['s.nom']['checked']))

+	{

@@ -748,11 +511,2 @@
-	if (!empty($arrayfields['s.name_alias']['checked'])) {

-		print '<td class="liste_titre left">';

-		print '<input class="flat" type="text" size="12" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';

-		print '</td>';

-	}

-	if (!empty($arrayfields['s.town']['checked'])) {

-		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';

-	}

-	if (!empty($arrayfields['s.zip']['checked'])) {

-		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';

-	}

+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';

+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';

@@ -760 +514,2 @@
-	if (!empty($arrayfields['state.nom']['checked'])) {

+	if (!empty($arrayfields['state.nom']['checked']))

+	{

@@ -766 +521,2 @@
-	if (!empty($arrayfields['country.code_iso']['checked'])) {

+	if (!empty($arrayfields['country.code_iso']['checked']))

+	{

@@ -772 +528,2 @@
-	if (!empty($arrayfields['typent.code']['checked'])) {

+	if (!empty($arrayfields['typent.code']['checked']))

+	{

@@ -774 +531 @@
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);

+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));

@@ -778 +535,2 @@
-	if (!empty($arrayfields['sp.date_valid']['checked'])) {

+	if (!empty($arrayfields['sp.date_valid']['checked']))

+	{

@@ -780,6 +538,5 @@
-		print '<div class="nowrapfordate">';

-		print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

-		print '</div>';

-		print '<div class="nowrapfordate">';

-		print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

-		print '</div>';

+		//print $langs->trans('Month').': ';

+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="monthvalid" value="'.dol_escape_htmltag($monthvalid).'">';

+		//print '&nbsp;'.$langs->trans('Year').': ';

+		$syearvalid = $yearvalid;

+		$formother->select_year($syearvalid, 'yearvalid', 1, 20, 5);

@@ -789 +546,2 @@
-	if (!empty($arrayfields['sp.date_livraison']['checked'])) {

+	if (!empty($arrayfields['sp.date_livraison']['checked']))

+	{

@@ -791,10 +549,10 @@
-		print '<div class="nowrapfordate">';

-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

-		print '</div>';

-		print '<div class="nowrapfordate">';

-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

-		print '</div>';

-		print '</td>';

-	}

-

-	if (!empty($arrayfields['sp.total_ht']['checked'])) {

+		//print $langs->trans('Month').': ';

+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';

+		//print '&nbsp;'.$langs->trans('Year').': ';

+		$syear = $year;

+		$formother->select_year($syear, 'year', 1, 20, 5);

+		print '</td>';

+	}

+

+	if (!empty($arrayfields['sp.total_ht']['checked']))

+	{

@@ -806 +564,2 @@
-	if (!empty($arrayfields['sp.total_tva']['checked'])) {

+	if (!empty($arrayfields['sp.total_vat']['checked']))

+	{

@@ -812 +571,2 @@
-	if (!empty($arrayfields['sp.total_ttc']['checked'])) {

+	if (!empty($arrayfields['sp.total_ttc']['checked']))

+	{

@@ -818 +578,2 @@
-	if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {

+	if (!empty($arrayfields['sp.multicurrency_code']['checked']))

+	{

@@ -824 +585,2 @@
-	if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {

+	if (!empty($arrayfields['sp.multicurrency_tx']['checked']))

+	{

@@ -830 +592,2 @@
-	if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {

+	if (!empty($arrayfields['sp.multicurrency_total_ht']['checked']))

+	{

@@ -836 +599,2 @@
-	if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) {

+	if (!empty($arrayfields['sp.multicurrency_total_vat']['checked']))

+	{

@@ -842 +606,2 @@
-	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {

+	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked']))

+	{

@@ -848 +613,2 @@
-	if (!empty($arrayfields['u.login']['checked'])) {

+	if (!empty($arrayfields['u.login']['checked']))

+	{

@@ -861 +627,2 @@
-	if (!empty($arrayfields['sp.datec']['checked'])) {

+	if (!empty($arrayfields['sp.datec']['checked']))

+	{

@@ -866 +633,2 @@
-	if (!empty($arrayfields['sp.tms']['checked'])) {

+	if (!empty($arrayfields['sp.tms']['checked']))

+	{

@@ -871,3 +639,4 @@
-	if (!empty($arrayfields['sp.fk_statut']['checked'])) {

-		print '<td class="liste_titre center parentonrightofpage">';

-		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'search_status width100 onrightofpage');

+	if (!empty($arrayfields['sp.fk_statut']['checked']))

+	{

+		print '<td class="liste_titre maxwidthonsmartphone right">';

+		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status');

@@ -877,6 +646,4 @@
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print '<td class="liste_titre maxwidthsearch">';

-		$searchpicto = $form->showFilterButtons();

-		print $searchpicto;

-		print '</td>';

-	}

+	print '<td class="liste_titre middle">';

+	$searchpicto = $form->showFilterButtons();

+	print $searchpicto;

+	print '</td>';

@@ -885,3 +651,0 @@
-

-	$totalarray = array();

-	$totalarray['nbfield'] = 0;

@@ -891,80 +655,18 @@
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.ref']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.ref']['label'], $_SERVER["PHP_SELF"], 'sp.ref', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['s.nom']['checked'])) {

-		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['s.name_alias']['checked'])) {

-		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['s.town']['checked'])) {

-		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['s.zip']['checked'])) {

-		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['state.nom']['checked'])) {

-		print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['country.code_iso']['checked'])) {

-		print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['typent.code']['checked'])) {

-		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.date_valid']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.date_livraison']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.total_ht']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.total_tva']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.total_tva']['label'], $_SERVER["PHP_SELF"], 'sp.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.total_ttc']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_code', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_tx', '', $param, '', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['u.login']['checked'])) {

-		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');

-		$totalarray['nbfield']++;

-	}

+	if (!empty($arrayfields['sp.ref']['checked']))           print_liste_field_titre($arrayfields['sp.ref']['label'], $_SERVER["PHP_SELF"], 'sp.ref', '', $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');

+	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');

+	if (!empty($arrayfields['sp.date_valid']['checked']))      print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');

+	if (!empty($arrayfields['sp.date_livraison']['checked']))  print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');

+	if (!empty($arrayfields['sp.total_ht']['checked']))        print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');

+	if (!empty($arrayfields['sp.total_vat']['checked']))       print_liste_field_titre($arrayfields['sp.total_vat']['label'], $_SERVER["PHP_SELF"], 'sp.total_vat', '', $param, '', $sortfield, $sortorder, 'right ');

+	if (!empty($arrayfields['sp.total_ttc']['checked']))       print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');

+	if (!empty($arrayfields['sp.multicurrency_code']['checked']))      print_liste_field_titre($arrayfields['sp.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_code', '', $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['sp.multicurrency_tx']['checked']))        print_liste_field_titre($arrayfields['sp.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_tx', '', $param, '', $sortfield, $sortorder);

+	if (!empty($arrayfields['sp.multicurrency_total_ht']['checked']))  print_liste_field_titre($arrayfields['sp.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);

+	if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);

+	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);

+	if (!empty($arrayfields['u.login']['checked']))            print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');

@@ -977,17 +679,4 @@
-	if (!empty($arrayfields['sp.datec']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.tms']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');

-		$totalarray['nbfield']++;

-	}

-	if (!empty($arrayfields['sp.fk_statut']['checked'])) {

-		print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');

-		$totalarray['nbfield']++;

-	}

-	// Action

-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');

-		$totalarray['nbfield']++;

-	}

+	if (!empty($arrayfields['sp.datec']['checked']))     print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

+	if (!empty($arrayfields['sp.tms']['checked']))       print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');

+	if (!empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');

+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');

@@ -1000 +688,0 @@
-	$savnbfield = $totalarray['nbfield'];

@@ -1002,8 +690,2 @@
-	$totalarray['nbfield'] = 0;

-	$totalarray['val'] = array();

-	$totalarray['val']['sp.total_ht'] = 0;

-	$totalarray['val']['sp.total_tva'] = 0;

-	$totalarray['val']['sp.total_ttc'] = 0;

-

-	$imaxinloop = ($limit ? min($num, $limit) : $num);

-	while ($i < $imaxinloop) {

+	while ($i < min($num, $limit))

+	{

@@ -1021 +702,0 @@
-		$companystatic->name_alias = $obj->alias;

@@ -1025,26 +706,18 @@
-		if ($mode == 'kanban') {

-			if ($i == 0) {

-				print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';

-				print '<div class="box-flex-container kanban">';

-			}

-			// Output Kanban

-			// TODO Use a cahe on user

-			$userstatic->fetch($obj->fk_user_author);

-			$objectstatic->delivery_date = $obj->dp;

-			print $objectstatic->getKanbanView('', array('thirdparty'=>$companystatic, 'userauthor'=>$userstatic, 'selected' => in_array($obj->id, $arrayofselected)));

-			if ($i == ($imaxinloop - 1)) {

-				print '</div>';

-				print '</td></tr>';

-			}

-		} else {

-			print '<tr class="oddeven">';

-			// Action column

-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				print '<td class="nowrap center">';

-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

-					$selected = 0;

-					if (in_array($obj->rowid, $arrayofselected)) {

-						$selected = 1;

-					}

-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';

-				}

+		print '<tr class="oddeven">';

+

+		if (!empty($arrayfields['sp.ref']['checked']))

+		{

+			print '<td class="nowrap">';

+

+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';

+			// Picto + Ref

+			print '<td class="nobordernopadding nowrap">';

+			print $objectstatic->getNomUrl(1, '', '', 0, -1, 1);

+			print '</td>';

+			// Warning

+			$warnornote = '';

+			//if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));

+			if ($warnornote)

+			{

+				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';

+				print $warnornote;

@@ -1053,269 +726,197 @@
-			if (!empty($arrayfields['sp.ref']['checked'])) {

-				print '<td class="nowraponall">';

-

-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';

-				// Picto + Ref

-				print '<td class="nobordernopadding nowraponall">';

-				print $objectstatic->getNomUrl(1, '', '', 0, -1, 1);

-				print '</td>';

-				// Warning

-				$warnornote = '';

-				//if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));

-				if ($warnornote) {

-					print '<td style="min-width: 20px" class="nobordernopadding nowrap">';

-					print $warnornote;

-					print '</td>';

-				}

-				// Other picto tool

-				print '<td width="16" class="right nobordernopadding hideonsmartphone">';

-				$filename = dol_sanitizeFileName($obj->ref);

-				$filedir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($obj->ref);

-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;

-				print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);

-				print '</td></tr></table>';

-

-				print "</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Thirdparty

-			if (!empty($arrayfields['s.nom']['checked'])) {

-				print '<td class="tdoverflowmax200">';

-				print $companystatic->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Alias

-			if (!empty($arrayfields['s.name_alias']['checked'])) {

-				print '<td class="tdoverflowmax200">';

-				print $companystatic->name_alias;

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Town

-			if (!empty($arrayfields['s.town']['checked'])) {

-				print '<td class="nocellnopadd">';

-				print $obj->town;

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Zip

-			if (!empty($arrayfields['s.zip']['checked'])) {

-				print '<td class="nocellnopadd">';

-				print $obj->zip;

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// State

-			if (!empty($arrayfields['state.nom']['checked'])) {

-				print "<td>".$obj->state_name."</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Country

-			if (!empty($arrayfields['country.code_iso']['checked'])) {

-				print '<td class="center">';

-				$tmparray = getCountry($obj->fk_pays, 'all');

-				print $tmparray['label'];

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Type ent

-			if (!empty($arrayfields['typent.code']['checked'])) {

-				print '<td class="center">';

-				if (empty($typenArray) || !is_array($typenArray) || count($typenArray) == 0) {

-					$typenArray = $formcompany->typent_array(1);

-				}

-				print $typenArray[$obj->typent_code];

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Date proposal

-			if (!empty($arrayfields['sp.date_valid']['checked'])) {

-				print '<td class="center">';

-				print dol_print_date($db->jdate($obj->date_valid), 'day');

-				print "</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Date delivery

-			if (!empty($arrayfields['sp.date_livraison']['checked'])) {

-				print '<td class="center">';

-				print dol_print_date($db->jdate($obj->dp), 'day');

-				print "</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Amount HT

-			if (!empty($arrayfields['sp.total_ht']['checked'])) {

-				print '<td class="right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-				if (!$i) {

-					$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ht';

-				}

-				$totalarray['val']['sp.total_ht'] += $obj->total_ht;

-			}

-			// Amount VAT

-			if (!empty($arrayfields['sp.total_tva']['checked'])) {

-				print '<td class="right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-				if (!$i) {

-					$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_tva';

-				}

-				$totalarray['val']['sp.total_tva'] += $obj->total_tva;

-			}

-			// Amount TTC

-			if (!empty($arrayfields['sp.total_ttc']['checked'])) {

-				print '<td class="right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-				if (!$i) {

-					$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ttc';

-				}

-				$totalarray['val']['sp.total_ttc'] += $obj->total_ttc;

-			}

-

-			// Currency

-			if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {

-				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Currency rate

-			if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {

-				print '<td class="nowrap">';

-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);

-				print "</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Amount HT

-			if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {

-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Amount VAT

-			if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) {

-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_vat)."</span></td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Amount TTC

-			if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {

-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			$userstatic->id = $obj->fk_user_author;

-			$userstatic->login = $obj->login;

-			$userstatic->status = $obj->ustatus;

-			$userstatic->lastname = $obj->name;

-			$userstatic->firstname = $obj->firstname;

-			$userstatic->photo = $obj->photo;

-			$userstatic->admin = $obj->admin;

-			$userstatic->ref = $obj->fk_user_author;

-			$userstatic->employee = $obj->employee;

-			$userstatic->email = $obj->uemail;

-

-			// Author

-			if (!empty($arrayfields['u.login']['checked'])) {

-				print '<td class="center">';

-				if ($userstatic->id > 0) {

-					print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);

-				} else {

-					print '&nbsp;';

-				}

-				print "</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Extra fields

-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

-			// Fields from hook

-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);

-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook

-			print $hookmanager->resPrint;

-			// Date creation

-			if (!empty($arrayfields['sp.datec']['checked'])) {

-				print '<td class="center nowraponall">';

-				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Date modification

-			if (!empty($arrayfields['sp.tms']['checked'])) {

-				print '<td class="center nowraponall">';

-				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');

-				print '</td>';

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-			// Status

-			if (!empty($arrayfields['sp.fk_statut']['checked'])) {

-				print '<td class="center">'.$objectstatic->getLibStatut(5)."</td>\n";

-				if (!$i) {

-					$totalarray['nbfield']++;

-				}

-			}

-

-			// Action column

-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

-				print '<td class="nowrap center">';

-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

-					$selected = 0;

-					if (in_array($obj->rowid, $arrayofselected)) {

-						$selected = 1;

-					}

-					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';

-				}

-				print '</td>';

-			}

-			if (!$i) {

-				$totalarray['nbfield']++;

-			}

-

-			print "</tr>\n";

-

-			$total += $obj->total_ht;

-			$subtotal += $obj->total_ht;

-		}

+			// Other picto tool

+			print '<td width="16" class="right nobordernopadding hideonsmartphone">';

+			$filename = dol_sanitizeFileName($obj->ref);

+			$filedir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($obj->ref);

+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;

+			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);

+			print '</td></tr></table>';

+

+			print "</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Thirdparty

+		if (!empty($arrayfields['s.nom']['checked']))

+		{

+			print '<td class="tdoverflowmax200">';

+			print $companystatic->getNomUrl(1, 'customer');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Town

+		if (!empty($arrayfields['s.town']['checked']))

+		{

+			print '<td class="nocellnopadd">';

+			print $obj->town;

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Zip

+		if (!empty($arrayfields['s.zip']['checked']))

+		{

+			print '<td class="nocellnopadd">';

+			print $obj->zip;

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// State

+		if (!empty($arrayfields['state.nom']['checked']))

+		{

+			print "<td>".$obj->state_name."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Country

+		if (!empty($arrayfields['country.code_iso']['checked']))

+		{

+			print '<td class="center">';

+			$tmparray = getCountry($obj->fk_pays, 'all');

+			print $tmparray['label'];

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Type ent

+		if (!empty($arrayfields['typent.code']['checked']))

+		{

+			print '<td class="center">';

+			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);

+			print $typenArray[$obj->typent_code];

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Date proposal

+		if (!empty($arrayfields['sp.date_valid']['checked']))

+		{

+			print '<td class="center">';

+			print dol_print_date($db->jdate($obj->date_valid), 'day');

+			print "</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Date delivery

+		if (!empty($arrayfields['sp.date_livraison']['checked']))

+		{

+			print '<td class="center">';

+			print dol_print_date($db->jdate($obj->dp), 'day');

+			print "</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Amount HT

+		if (!empty($arrayfields['sp.total_ht']['checked']))

+		{

+			  print '<td class="right">'.price($obj->total_ht)."</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ht';

+			  $totalarray['val']['sp.total_ht'] += $obj->total_ht;

+		}

+		// Amount VAT

+		if (!empty($arrayfields['sp.total_vat']['checked']))

+		{

+			print '<td class="right">'.price($obj->total_vat)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'sp.total_vat';

+			$totalarray['val']['sp.total_vat'] += $obj->total_vat;

+		}

+		// Amount TTC

+		if (!empty($arrayfields['sp.total_ttc']['checked']))

+		{

+			print '<td class="right">'.price($obj->total_ttc)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ttc';

+			$totalarray['val']['sp.total_ttc'] += $obj->total_ttc;

+		}

+

+		// Currency

+		if (!empty($arrayfields['sp.multicurrency_code']['checked']))

+		{

+			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Currency rate

+		if (!empty($arrayfields['sp.multicurrency_tx']['checked']))

+		{

+			  print '<td class="nowrap">';

+			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);

+			  print "</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount HT

+		if (!empty($arrayfields['sp.multicurrency_total_ht']['checked']))

+		{

+			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";

+			  if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount VAT

+		if (!empty($arrayfields['sp.multicurrency_total_vat']['checked']))

+		{

+			print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Amount TTC

+		if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked']))

+		{

+			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		$userstatic->id = $obj->fk_user_author;

+		$userstatic->login = $obj->login;

+

+		// Author

+		if (!empty($arrayfields['u.login']['checked']))

+		{

+			print '<td class="center">';

+			if ($userstatic->id) print $userstatic->getLoginUrl(1);

+			else print '&nbsp;';

+			print "</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Extra fields

+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

+		// Fields from hook

+		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);

+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook

+		print $hookmanager->resPrint;

+		// Date creation

+		if (!empty($arrayfields['sp.datec']['checked']))

+		{

+			print '<td class="center nowrap">';

+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Date modification

+		if (!empty($arrayfields['sp.tms']['checked']))

+		{

+			print '<td class="center nowrap">';

+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');

+			print '</td>';

+			if (!$i) $totalarray['nbfield']++;

+		}

+		// Status

+		if (!empty($arrayfields['sp.fk_statut']['checked']))

+		{

+			print '<td class="right">'.$objectstatic->getLibStatut(5)."</td>\n";

+			if (!$i) $totalarray['nbfield']++;

+		}

+

+		// Action column

+		print '<td class="nowrap center">';

+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

+		{

+			$selected = 0;

+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;

+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';

+		}

+		print '</td>';

+		if (!$i) $totalarray['nbfield']++;

+

+		print "</tr>\n";

+

+		$total += $obj->total_ht;

+		$subtotal += $obj->total_ht;

+

@@ -1327,11 +927,0 @@
-

-	// If no record found

-	if ($num == 0) {

-		$colspan = 1;

-		foreach ($arrayfields as $key => $val) {

-			if (!empty($val['checked'])) {

-				$colspan++;

-			}

-		}

-		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';

-	}

@@ -1351,3 +941 @@
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {

-		$hidegeneratedfilelistifempty = 0;

-	}

+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;

@@ -1365 +953,3 @@
-} else {

+}

+else

+{

--- /tmp/dsg/dolibarr/htdocs/supplier_proposal/github_19.0.3_note.php
+++ /tmp/dsg/dolibarr/htdocs/supplier_proposal/client_note.php
@@ -24 +24 @@
- *	\file       htdocs/supplier_proposal/note.php

+ *	\file       htdocs/comm/propal/note.php

@@ -26 +26 @@
- *	\brief      Page to show notes of a supplier proposal request

+ *	\brief      Fiche d'information sur une proposition commerciale

@@ -29 +28,0 @@
-// Load Dolibarr environment

@@ -33 +32 @@
-if (isModEnabled('project')) {

+if (!empty($conf->projet->enabled)) {

@@ -41 +40 @@
-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

@@ -44,8 +43 @@
-if ($user->socid) {

-	$socid = $user->socid;

-}

-

-

-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

-$hookmanager->initHooks(array('supplier_proposalnote'));

-

+if ($user->socid) $socid = $user->socid;

@@ -55,2 +46,0 @@
-

-$usercancreate = $user->hasRight("supplier_propal", "write");

@@ -66,8 +56 @@
-$parameters = array();

-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

-if ($reshook < 0) {

-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

-}

-if (empty($reshook)) {

-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once

-}

+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once

@@ -78,0 +62,3 @@
+

+llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur');

+

@@ -81,4 +67,3 @@
-if ($id > 0 || !empty($ref)) {

-	if ($mesg) {

-		print $mesg;

-	}

+if ($id > 0 || !empty($ref))

+{

+	if ($mesg) print $mesg;

@@ -88,6 +73,3 @@
-	if ($object->fetch($id, $ref)) {

-		$object->fetch_thirdparty();

-

-		$title = $object->ref." - ".$langs->trans('Notes');

-		$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';

-		llxHeader('', $title, $help_url);

+	if ($object->fetch($id, $ref))

+	{

+	    $object->fetch_thirdparty();

@@ -96 +78,2 @@
-		if ($societe->fetch($object->socid)) {

+		if ($societe->fetch($object->socid))

+		{

@@ -98 +81 @@
-			print dol_get_fiche_head($head, 'note', $langs->trans('CommRequest'), -1, 'supplier_proposal');

+			dol_fiche_head($head, 'note', $langs->trans('CommRequest'), -1, 'supplier_proposal');

@@ -110 +93 @@
-			$morehtmlref .= $object->thirdparty->getNomUrl(1);

+			$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);

@@ -112,19 +95,32 @@
-			if (isModEnabled('project')) {

-				$langs->load("projects");

-				$morehtmlref .= '<br>';

-				if ($usercancreate) {

-					$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');

-					if ($action != 'classify') {

-						$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';

-					}

-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');

-				} else {

-					if (!empty($object->fk_project)) {

-						$proj = new Project($db);

-						$proj->fetch($object->fk_project);

-						$morehtmlref .= $proj->getNomUrl(1);

-						if ($proj->title) {

-							$morehtmlref .= ' - '.$proj->title;

-						}

-					}

-				}

+			if (!empty($conf->projet->enabled))

+			{

+			    $langs->load("projects");

+			    $morehtmlref .= '<br>'.$langs->trans('Project').' ';

+			    if ($user->rights->supplier_proposal->creer)

+			    {

+			        if ($action != 'classify') {

+			        	//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';

+						$morehtmlref .= ' : ';

+                    }

+		            if ($action == 'classify') {

+		                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);

+		                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';

+		                $morehtmlref .= '<input type="hidden" name="action" value="classin">';

+		                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';

+		                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

+		                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

+		                $morehtmlref .= '</form>';

+		            } else {

+		                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);

+		            }

+			    } else {

+			        if (!empty($object->fk_project)) {

+			            $proj = new Project($db);

+			            $proj->fetch($object->fk_project);

+			            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';

+			            $morehtmlref .= $proj->ref;

+			            $morehtmlref .= '</a>';

+			        } else {

+			            $morehtmlref .= '';

+			        }

+			    }

@@ -146 +142 @@
-			print dol_get_fiche_end();

+			dol_fiche_end();