--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_card.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_card.php
@@ -13,7 +13,6 @@
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>

  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>

  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>

- * Copyright (C) 2020	    Nicolas ZABOURI         <info@inovea-conseil.com>

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -69,7 +68,7 @@
 $id = GETPOST('id', 'int');

 $ref = GETPOST('ref', 'alpha');

 $socid = GETPOST('socid', 'int');

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

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

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

 $origin = GETPOST('origin', 'alpha');

 $originid = GETPOST('originid', 'int');

@@ -162,30 +161,30 @@
 		if (!GETPOST('socid', 3))

 		{

 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');

-		} else {

+		}

+		else

+		{

 			if ($object->id > 0) {

 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {

 					//Get difference between old and new delivery date and change lines according to difference

-					$date_delivery = dol_mktime(12, 0, 0,

+                    $date_delivery = dol_mktime(12, 0, 0,

 						GETPOST('date_deliverymonth', 'int'),

 						GETPOST('date_deliveryday', 'int'),

 						GETPOST('date_deliveryyear', 'int')

 					);

-					$date_delivery_old = (empty($object->delivery_date) ? $object->date_livraison : $object->delivery_date);

-					if (!empty($date_delivery_old) && !empty($date_delivery))

+					if (!empty($object->date_livraison) && !empty($date_delivery))

 					{

 						//Attempt to get the date without possible hour rounding errors

-						$old_date_delivery = dol_mktime(12, 0, 0,

-							dol_print_date($date_delivery_old, '%m'),

-							dol_print_date($date_delivery_old, '%d'),

-							dol_print_date($date_delivery_old, '%Y')

+                        $old_date_delivery = dol_mktime(12, 0, 0,

+							dol_print_date($object->date_livraison, '%m'),

+							dol_print_date($object->date_livraison, '%d'),

+							dol_print_date($object->date_livraison, '%Y')

 						);

 						//Calculate the difference and apply if necessary

 						$difference = $date_delivery - $old_date_delivery;

 						if ($difference != 0)

 						{

 							$object->date_livraison = $date_delivery;

-							$object->delivery_date = $date_delivery;

 							foreach ($object->lines as $line)

 							{

 								if (isset($line->date_start)) $line->date_start = $line->date_start + $difference;

@@ -205,7 +204,9 @@
 				}

 			}

 		}

-	} // Delete proposal

+	}

+

+	// Delete proposal

 	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)

 	{

 		$result = $object->delete($user);

@@ -216,7 +217,9 @@
 			$langs->load("errors");

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

 		}

-	} // Remove line

+	}

+

+	// Remove line

 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)

 	{

 		$result = $object->deleteline($lineid);

@@ -233,13 +236,14 @@
 				$outputlangs->setDefaultLang($newlang);

 			}

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

-			if ($ret > 0) $object->fetch_thirdparty();

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

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

 		}

 

 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);

 		exit();

-	} // Validation

+	}

+

+	// Validation

 	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)

 	{

 		$result = $object->valid($user);

@@ -255,11 +259,8 @@
 					$outputlangs = new Translate("", $conf);

 					$outputlangs->setDefaultLang($newlang);

 				}

-				$model = $object->model_pdf;

+				$model = $object->modelpdf;

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

-				if ($ret > 0) {

-					$object->fetch_thirdparty();

-				}

 

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

 			}

@@ -268,7 +269,9 @@
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');

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

 		}

-	} elseif ($action == 'setdate' && $usercancreate)

+	}

+

+	elseif ($action == 'setdate' && $usercancreate)

 	{

 		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);

 

@@ -282,17 +285,21 @@
 			if ($result < 0)

 				dol_print_error($db, $object->error);

 		}

-	} elseif ($action == 'setecheance' && $usercancreate)

+	}

+	elseif ($action == 'setecheance' && $usercancreate)

 	{

 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));

 		if ($result < 0)

 			dol_print_error($db, $object->error);

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

-	{

-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));

+	}

+	elseif ($action == 'setdate_livraison' && $usercancreate)

+	{

+		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));

 		if ($result < 0)

 			dol_print_error($db, $object->error);

-	} // Positionne ref client

+	}

+

+	// Positionne ref client

 	elseif ($action == 'setref_client' && $usercancreate)

 	{

 		$result = $object->set_ref_client($user, GETPOST('ref_client'));

@@ -300,11 +307,15 @@
 		{

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

 		}

-	} // Set incoterm

+	}

+

+	// Set incoterm

 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate)

 	{

 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));

-	} // Create proposal

+	}

+

+	// Create proposal

 	elseif ($action == 'add' && $usercancreate)

 	{

 		$object->socid = $socid;

@@ -342,9 +353,7 @@
 				if ($object->fetch(GETPOST('copie_propal', 'int')) > 0) {

 					$object->ref = GETPOST('ref');

 					$object->datep = $datep;

-					$object->date = $datep;

-					$object->date_livraison = $date_delivery; // deprecated

-					$object->delivery_date = $date_delivery;

+					$object->date_livraison = $date_delivery;

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

 					$object->demand_reason_id = GETPOST('demand_reason_id');

 					$object->fk_delivery_address = GETPOST('fk_address', 'int');

@@ -356,16 +365,18 @@
 					$object->remise_percent = GETPOST('remise_percent');

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

 					$object->socid = GETPOST('socid', 'int');

-					$object->contact_id = GETPOST('contactid', 'int');

+					$object->contactid = GETPOST('contactid', 'int');

 					$object->fk_project = GETPOST('projectid', 'int');

-					$object->model_pdf = GETPOST('model', 'alphanohtml');

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

 					$object->author = $user->id; // deprecated

-					$object->user_author_id = $user->id;

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

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

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

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

 					$object->statut = Propal::STATUS_DRAFT;

 					$object->fk_incoterms = GETPOST('incoterm_id', 'int');

 					$object->location_incoterms = GETPOST('location_incoterms', 'alpha');

+

+					// the create is done below and further more the existing create_from function is quite hilarating

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

 				} else {

 					setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), null, 'errors');

 				}

@@ -373,23 +384,21 @@
 				$object->ref = GETPOST('ref');

 				$object->ref_client = GETPOST('ref_client');

 				$object->datep = $datep;

-				$object->date = $datep;

 				$object->date_livraison = $date_delivery;

-				$object->delivery_date = $date_delivery;

-				$object->availability_id = GETPOST('availability_id', 'int');

-				$object->demand_reason_id = GETPOST('demand_reason_id', 'int');

-				$object->fk_delivery_address = GETPOST('fk_address', 'int');

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

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

+				$object->fk_delivery_address = GETPOST('fk_address');

 				$object->shipping_method_id = GETPOST('shipping_method_id', 'int');

-				$object->duree_validite = price2num(GETPOST('duree_validite', 'alpha'));

-				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');

-				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');

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

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

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

 				$object->fk_account = GETPOST('fk_account', 'int');

-				$object->contact_id = GETPOST('contactid', 'int');

+				$object->contactid = GETPOST('contactid', 'int');

 				$object->fk_project = GETPOST('projectid', 'int');

-				$object->model_pdf = GETPOST('model');

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

 				$object->author = $user->id; // deprecated

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

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

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

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

 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');

 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');

 

@@ -540,15 +549,17 @@
 						setEventMessages($object->error, $object->errors, 'errors');

 						$error++;

 					}

-				} // Standard creation

-				else {

+				} 			// Standard creation

+				else

+				{

 					$id = $object->create($user);

 				}

 

 				if ($id > 0)

 				{

-					// Insert default contacts if defined

-					if (GETPOST('contactid') > 0) {

+					// Insertion contact par defaut si defini

+					if (GETPOST('contactid') > 0)

+					{

 						$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');

 						if ($result < 0)

 						{

@@ -582,7 +593,7 @@
 								$outputlangs = new Translate("", $conf);

 								$outputlangs->setDefaultLang($newlang);

 							}

-							$model = $object->model_pdf;

+							$model = $object->modelpdf;

 

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

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

@@ -591,23 +602,29 @@
 

 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);

 						exit();

-					} else {

+					}

+					else

+					{

 						$db->rollback();

 						$action = 'create';

 					}

-				} else {

+				}

+				else

+				{

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

 					$db->rollback();

 					$action = 'create';

 				}

 			}

 		}

-	} // Classify billed

+	}

+

+	// Classify billed

 	elseif ($action == 'classifybilled' && $usercanclose)

 	{

 		$db->begin();

 

-		$result = $object->cloture($user, $object::STATUS_BILLED, '');

+		$result = $object->cloture($user, Propal::STATUS_BILLED, '');

 		if ($result < 0)

 		{

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

@@ -617,21 +634,25 @@
 		if (!$error)

 		{

 			$db->commit();

-		} else {

+		}

+		else

+		{

 			$db->rollback();

 		}

-	} // Close proposal

-	elseif ($action == 'confirm_closeas' && $usercanclose && !GETPOST('cancel', 'alpha')) {

+	}

+

+	// Close proposal

+	elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {

 		if (!(GETPOST('statut', 'int') > 0)) {

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

-			$action = 'closeas';

+			$action = 'statut';

 		} else {

 			// prevent browser refresh from closing proposal several times

-			if ($object->statut == $object::STATUS_VALIDATED)

+			if ($object->statut == Propal::STATUS_VALIDATED)

 			{

 				$db->begin();

 

-				$result = $object->cloture($user, GETPOST('statut', 'int'), GETPOST('note_private', 'restricthtml'));

+				$result = $object->cloture($user, GETPOST('statut', 'int'), GETPOST('note_private', 'none'));

 				if ($result < 0)

 				{

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

@@ -641,12 +662,16 @@
 				if (!$error)

 				{

 					$db->commit();

-				} else {

+				}

+				else

+				{

 					$db->rollback();

 				}

 			}

 		}

-	} // Reopen proposal

+	}

+

+	// Reopen proposal

 	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {

 		// prevent browser refresh from reopening proposal several times

 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED)

@@ -663,88 +688,94 @@
 			if (!$error)

 			{

 				$db->commit();

-			} else {

+			}

+			else

+			{

 				$db->rollback();

 			}

 		}

-	} // add lines from objectlinked

+	}

+

+	// add lines from objectlinked

 	elseif ($action == 'import_lines_from_object'

-		&& $user->rights->propal->creer

-		&& $object->statut == Propal::STATUS_DRAFT

-		)

-	{

-		$fromElement = GETPOST('fromelement');

-		$fromElementid = GETPOST('fromelementid');

-		$importLines = GETPOST('line_checkbox');

-

-		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))

-		{

-			if ($fromElement == 'commande')

-			{

-				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');

-				$lineClassName = 'OrderLine';

-			} elseif ($fromElement == 'propal')

-			{

-				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');

-				$lineClassName = 'PropaleLigne';

-			}

-			$nextRang = count($object->lines) + 1;

-			$importCount = 0;

-			$error = 0;

-			foreach ($importLines as $lineId)

-			{

-				$lineId = intval($lineId);

-				$originLine = new $lineClassName($db);

-				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)

-				{

-					$originLine->fetch_optionals();

-					$desc = $originLine->desc;

-					$pu_ht = $originLine->subprice;

-					$qty = $originLine->qty;

-					$txtva = $originLine->tva_tx;

-					$txlocaltax1 = $originLine->localtax1_tx;

-					$txlocaltax2 = $originLine->localtax2_tx;

-					$fk_product = $originLine->fk_product;

-					$remise_percent = $originLine->remise_percent;

-					$date_start = $originLine->date_start;

-					$date_end = $originLine->date_end;

-					$ventil = 0;

-					$info_bits = $originLine->info_bits;

-					$fk_remise_except = $originLine->fk_remise_except;

-					$price_base_type = 'HT';

-					$pu_ttc = 0;

-					$type = $originLine->product_type;

-					$rang = $nextRang++;

-					$special_code = $originLine->special_code;

-					$origin = $originLine->element;

-					$origin_id = $originLine->id;

-					$fk_parent_line = 0;

-					$fk_fournprice = $originLine->fk_fournprice;

-					$pa_ht = $originLine->pa_ht;

-					$label = $originLine->label;

-					$array_options = $originLine->array_options;

-					$situation_percent = 100;

-					$fk_prev_id = '';

-					$fk_unit = $originLine->fk_unit;

-					$pu_ht_devise = $originLine->multicurrency_subprice;

-

-					$res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $date_start, $date_end, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);

-

-					if ($res > 0) {

-						$importCount++;

-					} else {

-						$error++;

-					}

-				} else {

-					$error++;

-				}

-			}

-

-			if ($error)

-			{

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

-			}

-		}

+	    && $user->rights->propal->creer

+	    && $object->statut == Propal::STATUS_DRAFT

+	    )

+	{

+	    $fromElement = GETPOST('fromelement');

+	    $fromElementid = GETPOST('fromelementid');

+	    $importLines = GETPOST('line_checkbox');

+

+	    if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))

+	    {

+	        if ($fromElement == 'commande')

+	        {

+	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');

+	            $lineClassName = 'OrderLine';

+	        }

+	        elseif ($fromElement == 'propal')

+	        {

+	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');

+	            $lineClassName = 'PropaleLigne';

+	        }

+	        $nextRang = count($object->lines) + 1;

+	        $importCount = 0;

+	        $error = 0;

+	        foreach ($importLines as $lineId)

+	        {

+	            $lineId = intval($lineId);

+	            $originLine = new $lineClassName($db);

+	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)

+	            {

+	                $originLine->fetch_optionals();

+	                $desc = $originLine->desc;

+	                $pu_ht = $originLine->subprice;

+	                $qty = $originLine->qty;

+	                $txtva = $originLine->tva_tx;

+	                $txlocaltax1 = $originLine->localtax1_tx;

+	                $txlocaltax2 = $originLine->localtax2_tx;

+	                $fk_product = $originLine->fk_product;

+	                $remise_percent = $originLine->remise_percent;

+	                $date_start = $originLine->date_start;

+	                $date_end = $originLine->date_end;

+	                $ventil = 0;

+	                $info_bits = $originLine->info_bits;

+	                $fk_remise_except = $originLine->fk_remise_except;

+	                $price_base_type = 'HT';

+	                $pu_ttc = 0;

+	                $type = $originLine->product_type;

+	                $rang = $nextRang++;

+	                $special_code = $originLine->special_code;

+	                $origin = $originLine->element;

+	                $origin_id = $originLine->id;

+	                $fk_parent_line = 0;

+	                $fk_fournprice = $originLine->fk_fournprice;

+	                $pa_ht = $originLine->pa_ht;

+	                $label = $originLine->label;

+	                $array_options = $originLine->array_options;

+	                $situation_percent = 100;

+	                $fk_prev_id = '';

+	                $fk_unit = $originLine->fk_unit;

+	                $pu_ht_devise = $originLine->multicurrency_subprice;

+

+	                $res = $object->addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, $rang, $special_code, $fk_parent_line, $fk_fournprice, $pa_ht, $label, $date_start, $date_end, $array_options, $fk_unit, $origin, $origin_id, $pu_ht_devise, $fk_remise_except);

+

+	                if ($res > 0) {

+	                    $importCount++;

+	                } else {

+	                    $error++;

+	                }

+	            }

+	            else {

+	                $error++;

+	            }

+	        }

+

+	        if ($error)

+	        {

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

+	        }

+	    }

 	}

 

 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';

@@ -772,10 +803,11 @@
 				$outputlangs->setDefaultLang($newlang);

 			}

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

-			if ($ret > 0) $object->fetch_thirdparty();

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

-		}

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

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

+		}

+	}

+

+	elseif ($action == "setabsolutediscount" && $usercancreate) {

 		if ($_POST["remise_id"]) {

 			if ($object->id > 0) {

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

@@ -784,32 +816,28 @@
 				}

 			}

 		}

-	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha') !== '') {

-		// 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->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);

-		}

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

+	}

+

+	// Add line

+	elseif ($action == 'addline' && $usercancreate) {

 		// Set if we used free entry or predefined product

 		$predef = '';

-		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');

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

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

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

+		$price_ht = GETPOST('price_ht');

+		$price_ht_devise = GETPOST('multicurrency_price_ht');

 		$prod_entry_mode = GETPOST('prod_entry_mode');

 		if ($prod_entry_mode == 'free')

 		{

 			$idprod = 0;

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

-		} else {

+		}

+		else

+		{

 			$idprod = GETPOST('idprod', 'int');

 			$tva_tx = '';

 		}

 

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

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

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

 		if (empty($remise_percent)) $remise_percent = 0;

 

@@ -829,7 +857,7 @@
 			$error++;

 		}

 

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

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

 		{

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

 			$error++;

@@ -893,10 +921,11 @@
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];

 					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility

 					{

-						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];

-						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];

-					}

-				} // If price per customer

+					    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];

+					    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];

+					}

+				}

+				// If price per customer

 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))

 				{

 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';

@@ -911,7 +940,6 @@
 						if (count($prodcustprice->lines) > 0) {

 							$pu_ht = price($prodcustprice->lines[0]->price);

 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);

-							$price_min =  price($prodcustprice->lines[0]->price_min);

 							$price_base_type = $prodcustprice->lines[0]->price_base_type;

 							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);

 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';

@@ -919,7 +947,8 @@
 							if (empty($tva_tx)) $tva_npr = 0;

 						}

 					}

-				} // If price per quantity

+				}

+				// If price per quantity

 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))

 				{

 					if ($prod->prices_by_qty[0])	// yes, this product has some prices per quantity

@@ -935,14 +964,17 @@
 							if ($priceforthequantityarray['price_base_type'] == 'HT')

 							{

 								$pu_ht = $priceforthequantityarray['unitprice'];

-							} else {

+							}

+							else

+							{

 								$pu_ttc = $priceforthequantityarray['unitprice'];

 							}

 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.

 							break;

 						}

 					}

-				} // If price per quantity and customer

+				}

+				// If price per quantity and customer

 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

 				{

 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) // yes, this product has some prices per quantity

@@ -958,7 +990,9 @@
 							if ($priceforthequantityarray['price_base_type'] == 'HT')

 							{

 								$pu_ht = $priceforthequantityarray['unitprice'];

-							} else {

+							}

+							else

+							{

 								$pu_ttc = $priceforthequantityarray['unitprice'];

 							}

 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.

@@ -971,10 +1005,11 @@
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));

 

 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?

-				if (!empty($price_ht) || $price_ht === '0') {

+				if (!empty($price_ht)) {

 					$pu_ht = price2num($price_ht, 'MU');

 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');

-				} // On reevalue prix selon taux tva car taux tva transaction peut etre different

+				}

+				// On reevalue prix selon taux tva car taux tva transaction peut etre different

 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).

 				elseif ($tmpvat != $tmpprodvat) {

 					if ($price_base_type != 'HT') {

@@ -1106,7 +1141,7 @@
 						if ($ret > 0) {

 							$object->fetch_thirdparty();

 						}

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

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

 					}

 

 					unset($_POST['prod_entry_mode']);

@@ -1148,30 +1183,31 @@
 				}

 			}

 		}

-	} // Update a line within proposal

+	}

+

+	// Update a line within proposal

 	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))

 	{

 		// Define info_bits

 		$info_bits = 0;

-		if (preg_match('/\*/', GETPOST('tva_tx'))) {

+		if (preg_match('/\*/', GETPOST('tva_tx')))

 			$info_bits |= 0x01;

-		}

-

-		// Clean parameters

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

+

+			// Clean parameters

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

 

 		// Define vat_rate

 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 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);

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

+		$pu_ht = GETPOST('price_ht');

 

 		// Add buying price

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

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

 

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

+		$pu_ht_devise = GETPOST('multicurrency_subprice');

 

 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));

 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));

@@ -1234,10 +1270,7 @@
 					}

 				}

 			}

-

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

-

-			$result = $object->updateline(GETPOST('lineid', 'int'), $pu_ht, $qty, GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);

+			$result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);

 

 			if ($result >= 0) {

 				$db->commit();

@@ -1251,8 +1284,7 @@
 						$outputlangs->setDefaultLang($newlang);

 					}

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

-					if ($ret > 0) $object->fetch_thirdparty();

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

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

 				}

 

 				unset($_POST['qty']);

@@ -1290,46 +1322,70 @@
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {

 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition

 		exit();

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

-		// Set project

-		$object->setProject(GETPOST('projectid', 'int'));

-	} // Delivery time

+	}

+

+	elseif ($action == 'classin' && $usercancreate) {

+        // Set project

+        $object->setProject(GETPOST('projectid', 'int'));

+	}

+

+	// Delivery time

 	elseif ($action == 'setavailability' && $usercancreate) {

 		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));

-	} // Origin of the commercial proposal

+	}

+

+	// Origin of the commercial proposal

 	elseif ($action == 'setdemandreason' && $usercancreate) {

 		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));

-	} // Terms of payment

+	}

+

+	// Terms of payment

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

 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));

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

+	}

+

+	elseif ($action == 'setremisepercent' && $usercancreate) {

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

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

+	}

+

+	elseif ($action == 'setremiseabsolue' && $usercancreate) {

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

-	} // Payment choice

+	}

+

+	// Payment choice

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

 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));

-	} // Multicurrency Code

+	}

+

+	// Multicurrency Code

 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {

 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));

-	} // Multicurrency rate

+	}

+

+	// Multicurrency rate

 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {

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

-	} // bank account

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

+	}

+

+	// bank account

 	elseif ($action == 'setbankaccount' && $usercancreate) {

 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));

-	} // shipping method

+	}

+

+	// shipping method

 	elseif ($action == 'setshippingmethod' && $usercancreate) {

 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));

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

+	}

+

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

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

 

 		// Fill array 'array_options' with data from update form

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

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

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

 		if (!$error)

 		{

-			$result = $object->updateExtraField(GETPOST('attribute', 'restricthtml'), 'PROPAL_MODIFY', $user);

+			$result = $object->insertExtraFields('PROPAL_MODIFY');

 			if ($result < 0)

 			{

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

@@ -1345,8 +1401,7 @@
 		{

 			if ($object->id > 0) {

 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));

-				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

-				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));

+				$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);

 			}

 

 			if ($result >= 0) {

@@ -1360,14 +1415,18 @@
 					setEventMessages($object->error, $object->errors, 'errors');

 				}

 			}

-		} // Toggle the status of a contact

+		}

+

+		// Toggle the status of a contact

 		elseif ($action == 'swapstatut') {

 			if ($object->fetch($id) > 0) {

 				$result = $object->swapContactStatus(GETPOST('ligne'));

 			} else {

 				dol_print_error($db);

 			}

-		} // Delete a contact

+		}

+

+		// Delete a contact

 		elseif ($action == 'deletecontact') {

 			$object->fetch($id);

 			$result = $object->delete_contact($lineid);

@@ -1477,7 +1536,9 @@
 				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;

 			}

 		}

-	} else {

+	}

+	else

+	{

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

 	}

 

@@ -1493,7 +1554,7 @@
 		print '<input type="hidden" name="projectid" value="'.$projectid.'">';

 	}

 

-	print dol_get_fiche_head();

+	dol_fiche_head();

 

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

 

@@ -1513,16 +1574,18 @@
 		print $soc->getNomUrl(1);

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

 		print '</td>';

+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {

+			$shipping_method_id = $soc->shipping_method_id;

+		}

 	} else {

 		print '<td>';

-		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');

+		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');

 		// reload page to retrieve customer informations

-		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))

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

 		{

 			print '<script type="text/javascript">

 			$(document).ready(function() {

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

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

 					var socid = $(this).val();

 					// reload page

 					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&ref_client="+$("input[name=ref_client]").val();

@@ -1537,7 +1600,7 @@
 

 	if ($socid > 0)

 	{

-		// Contacts (ask contact only if thirdparty already defined).

+        // Contacts (ask contact only if thirdparty already defined).

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

 		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);

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

@@ -1560,16 +1623,16 @@
 	print '</td></tr>';

 

 	// Validaty duration

-	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';

+	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOST('duree_validite', 'int') ? GETPOST('duree_validite', 'int') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';

 

 	// Terms of payment

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

-	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id), 'cond_reglement_id', -1, 1);

+	$form->select_conditions_paiements($soc->cond_reglement_id, 'cond_reglement_id', -1, 1);

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

 

 	// Mode of payment

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

-	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id');

+	$form->select_types_paiements($soc->mode_reglement_id, 'mode_reglement_id');

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

 

 	// Bank Account

@@ -1585,18 +1648,12 @@
 	print '</td></tr>';

 

 	// Delivery delay

-	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod');

-	if (!empty($conf->commande->enabled))

-		print ' ('.$langs->trans('AfterOrder').')';

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

+	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';

 	$form->selectAvailabilityDelay('', 'availability_id', '', 1);

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

 

 	// Shipping Method

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

-		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {

-			$shipping_method_id = $soc->shipping_method_id;

-		}

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

 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);

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

@@ -1622,7 +1679,7 @@
 		$langs->load("projects");

 		print '<tr>';

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

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

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

 		print ' <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 paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';

 		print '</td>';

 		print '</tr>';

@@ -1643,8 +1700,7 @@
 	print '<td>'.$langs->trans("DefaultModel").'</td>';

 	print '<td>';

 	$liste = ModelePDFPropales::liste_modeles($db);

-	$preselected = ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF);

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

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

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

 

 	// Multicurrency

@@ -1726,9 +1782,9 @@
 

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

 		{

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

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

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

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

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

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

 		}

 	}

 

@@ -1782,13 +1838,13 @@
 		print '</table>';

 	}

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 

 	$langs->load("bills");

 	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 button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';

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

 	print '</div>';

 

 	print "</form>";

@@ -1816,7 +1872,7 @@
 	$soc->fetch($object->socid);

 

 	$head = propal_prepare_head($object);

-	print dol_get_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal');

+	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), -1, 'propal');

 

 	$formconfirm = '';

 

@@ -1829,18 +1885,18 @@
 			// 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.client=1 OR s.client=2 OR s.client=3)'))

 		);

-		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->delivery_date)) {

-			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->delivery_date);

+		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->date_livraison)) {

+			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->date_livraison);

 		}

 		// Incomplete payment. We ask if reason = discount or other

 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);

 	}

 

-	if ($action == 'closeas')

+	if ($action == 'statut')

 	{

 		//Form to close proposal (signed or not)

 		$formquestion = array(

-			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED))),

+			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array(2=>$object->LibStatut(Propal::STATUS_SIGNED), 3=>$object->LibStatut(Propal::STATUS_NOTSIGNED))),

 			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)

 		);

 

@@ -1853,17 +1909,25 @@
 			));

 		}

 

-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);

-	} // Confirm delete

+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);

+	}

+

+	// Confirm delete

 	elseif ($action == 'delete') {

 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);

-	} // Confirm reopen

+	}

+

+	// Confirm reopen

 	elseif ($action == 'reopen') {

 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1);

-	} // Confirmation delete product/service line

+	}

+

+	// Confirmation delete product/service line

 	elseif ($action == 'ask_deleteline') {

 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);

-	} // Confirm validate proposal

+	}

+

+	// Confirm validate proposal

 	elseif ($action == 'validate') {

 		$error = 0;

 

@@ -2054,9 +2118,9 @@
 	// Delivery date

 	$langs->load('deliveries');

 	print '<tr><td>';

-	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');

+	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $usercancreate, 'datepicker');

 	print '</td><td>';

-	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');

+	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $usercancreate, 'datepicker');

 	print '</td>';

 	print '</tr>';

 

@@ -2216,21 +2280,21 @@
 		print '</tr>';

 	}

 

-	$tmparray = $object->getTotalWeightVolume();

-	$totalWeight = $tmparray['weight'];

-	$totalVolume = $tmparray['volume'];

-	if ($totalWeight) {

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

-		print '<td>';

-		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');

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

-	}

-	if ($totalVolume) {

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

-		print '<td>';

-		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');

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

-	}

+    $tmparray = $object->getTotalWeightVolume();

+    $totalWeight = $tmparray['weight'];

+    $totalVolume = $tmparray['volume'];

+    if ($totalWeight) {

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

+        print '<td>';

+        print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');

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

+    }

+    if ($totalVolume) {

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

+        print '<td>';

+        print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');

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

+    }

 

 	// Incoterms

 	if (!empty($conf->incoterm->enabled))

@@ -2247,7 +2311,9 @@
 		if ($action != 'editincoterm')

 		{

 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);

-		} else {

+		}

+		else

+		{

 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);

 		}

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

@@ -2362,7 +2428,7 @@
 	print '<div class="div-table-responsive-no-min">';

 	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))

 	{

-		print '<table id="tablelines" class="noborder noshadow" width="100%">';

+	    print '<table id="tablelines" class="noborder noshadow" width="100%">';

 	}

 

 	if (!empty($object->lines))

@@ -2373,27 +2439,25 @@
 	// Form to add new line

 	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines')

 	{

-		if ($action != 'editline') {

+		if ($action != 'editline')

+		{

 			// Add products/services form

 			$object->formAddObjectLine(1, $mysoc, $soc);

 

 			$parameters = array();

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

-		} else {

-			$parameters = array();

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

 		}

 	}

 

 	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))

 	{

-		print '</table>';

+	    print '</table>';

 	}

 	print '</div>';

 

 	print "</form>\n";

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 

 

 	/*

@@ -2411,13 +2475,14 @@
 			if ($action != 'editline')

 			{

 				// Validate

-				if (($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)

-					|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0))

+				if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)

 				{

 					if ($usercanvalidate)

 					{

 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';

-					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';

+					}

+					else

+						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';

 				}

 				// Create event

 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.

@@ -2440,7 +2505,8 @@
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {

 						if ($usercansend) {

 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';

-						} else print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';

+						} else

+							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';

 					}

 				}

 

@@ -2492,26 +2558,28 @@
 						if ($usercanclose)

 						{

 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';

-						} else {

+						}

+						else

+						{

 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';

 						}

 					}

 				}

 

-				// Close as accepted/refused

+				// Set accepted/refused

 				if ($object->statut == Propal::STATUS_VALIDATED && $usercanclose) {

-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';

+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';

 					print '>'.$langs->trans('SetAcceptedRefused').'</a>';

 				}

 

 				// Clone

 				if ($usercancreate) {

-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken().'&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';

+					print '<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>';

 				}

 

 				// Delete

 				if ($usercandelete) {

-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';

+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';

 					print '>'.$langs->trans('Delete').'</a>';

 				}

 			}

@@ -2536,7 +2604,7 @@
 		$genallowed = $usercanread;

 		$delallowed = $usercancreate;

 

-		print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);

+		print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);

 

 		// Show links to link elements

 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));

@@ -2544,7 +2612,7 @@
 		$compatibleImportElementsList = false;

 		if ($user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT)

 		{

-			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements

+		    $compatibleImportElementsList = array('commande', 'propal'); // import from linked elements

 		}

 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);

 

--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_contact.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_contact.php
@@ -38,7 +38,7 @@
 $id = GETPOST('id', 'int');

 $ref = GETPOST('ref', 'alpha');

 $lineid = GETPOST('lineid', 'int');

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

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

 

 // Security check

 if ($user->socid) $socid = $user->socid;

@@ -55,7 +55,8 @@
 		$langs->load("errors");

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

 		$error++;

-	} elseif ($ret < 0)

+	}

+	elseif ($ret < 0)

 	{

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

 		$error++;

@@ -64,7 +65,9 @@
 if (!$error)

 {

 	$object->fetch_thirdparty();

-} else {

+}

+else

+{

 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');

 	exit;

 }

@@ -76,34 +79,41 @@
 

 if ($action == 'addcontact' && $user->rights->propale->creer)

 {

-	if ($object->id > 0)

-	{

-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));

-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));

-	}

+    if ($object->id > 0)

+    {

+    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));

+  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);

+    }

 

 	if ($result >= 0)

 	{

 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

 		exit;

-	} else {

+	}

+	else

+	{

 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')

 		{

 			$langs->load("errors");

 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');

-		} else {

+		}

+		else

+		{

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

 		}

 	}

-} // Toggle the status of a contact

+}

+

+// Toggle the status of a contact

 elseif ($action == 'swapstatut' && $user->rights->propale->creer)

 {

 	if ($object->id > 0)

 	{

-		$result = $object->swapContactStatus(GETPOST('ligne'));

-	}

-} // Deletes a contact

+	    $result = $object->swapContactStatus(GETPOST('ligne'));

+	}

+}

+

+// Deletes a contact

 elseif ($action == 'deletecontact' && $user->rights->propale->creer)

 {

 	$result = $object->delete_contact($lineid);

@@ -112,7 +122,9 @@
 	{

 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

 		exit;

-	} else {

+	}

+	else

+	{

 		dol_print_error($db);

 	}

 }

@@ -136,8 +148,8 @@
 

 if ($object->id > 0)

 {

-	$head = propal_prepare_head($object);

-	print dol_get_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');

+    $head = propal_prepare_head($object);

+	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');

 

 

 	// Proposal card

@@ -154,42 +166,42 @@
 	// Project

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

 	{

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

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

-		if ($user->rights->propal->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 .= '';

-			}

-		}

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

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

+	    if ($user->rights->propal->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 .= '';

+	        }

+	    }

 	}

 	$morehtmlref .= '</div>';

 

 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 

 

 	// Contacts lines (modules that overwrite templates must declare this into descriptor)

--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_document.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_document.php
@@ -78,9 +78,9 @@
 

 if ($object->id > 0)

 {

-	$object->fetch_thirdparty();

-	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

-	include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';

+    $object->fetch_thirdparty();

+    $upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

+    include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';

 }

 

 

@@ -97,7 +97,7 @@
 	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);

 

 	$head = propal_prepare_head($object);

-	print dol_get_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');

+	dol_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');

 

 	// Build file list

 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);

@@ -122,36 +122,36 @@
 	// Project

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

 	{

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

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

-		if ($user->rights->propal->creer)

-		{

-			if ($action != 'classify') {

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

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

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

+	    if ($user->rights->propal->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 .= '';

-			}

-		}

+            }

+            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 .= '';

+	        }

+	    }

 	}

 	$morehtmlref .= '</div>';

 

@@ -172,14 +172,16 @@
 	print '</div>';

 

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 

 	$modulepart = 'propal';

 	$permission = $user->rights->propal->creer;

 	$permtoedit = $user->rights->propal->creer;

 	$param = '&id='.$object->id;

 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';

-} else {

+}

+else

+{

 	print $langs->trans("ErrorUnknown");

 }

 

--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_index.php
@@ -1,9 +1,8 @@
 <?php

-/* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>

- * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>

- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>

- * Copyright (C) 2019		Nicolas ZABOURI			<info@inovea-conseil.com>

- * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>

+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>

+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>

+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>

+ * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -20,12 +19,22 @@
  */

 

 /**

- *	\file		htdocs/comm/propal/index.php

- *	\ingroup	propal

- *	\brief	Home page of proposal area

+ *	\file       htdocs/comm/propal/index.php

+ *	\ingroup    propal

+ *	\brief      Home page of proposal area

  */

 

 require '../../main.inc.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';

+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';

+

+$hookmanager = new HookManager($db);

+

+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array

+$hookmanager->initHooks(array('proposalindex'));

+

+// Load translation files required by the page

+$langs->loadLangs(array('propal', 'companies'));

 

 // Security check

 $socid = GETPOST('socid', 'int');

@@ -34,24 +43,13 @@
 	$action = '';

 	$socid = $user->socid;

 }

-restrictedArea($user, 'propal');

-

-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';

-require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';

-

-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array

-$hookmanager = new HookManager($db);

-$hookmanager->initHooks(array('proposalindex'));

-

-// Load translation files required by the page

-$langs->loadLangs(array('propal', 'companies'));

-

+$result = restrictedArea($user, 'propal');

+

+

+/*

+ * View

+ */

 $now = dol_now();

-$max = 5;

-

-/*

- * View

- */

 $propalstatic = new Propal($db);

 $companystatic = new Societe($db);

 $form = new Form($db);

@@ -62,218 +60,195 @@
 

 print load_fiche_titre($langs->trans("ProspectionArea"), '', 'propal');

 

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

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

-

-// This is useless due to the global search combo

-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))

-{

-	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';

-	print '<div class="div-table-responsive-no-min">';

-	print '<input type="hidden" name="token" value="'.newToken().'">';

-	print '<table class="noborder nohover centpercent">';

-

-	print '<tr class="liste_titre">';

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

-	print '</tr>';

-

-	print '<tr class="oddeven">';

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

-	print '<td><input type="text" class="flat" name="sall" size=18></td>';

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

-	print '</tr>';

-

-	print '</table>';

-	print '</div>';

-	print '</form>';

-	print '<br>';

-}

+//print '<table width="100%" class="notopnoleftnoright">';

+//print '<tr><td valign="top" width="30%" class="notopnoleft">';

+print '<div class="fichecenter"><div class="fichethirdleft">';

+

+

+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.'/comm/propal/list.php">';

+    print '<div class="div-table-responsive-no-min">';

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

+    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("Proposal").':</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 "</table></div></form><br>\n";

+}

+

 

 /*

  * Statistics

  */

-$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);

 

 $sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";

 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

 $sql .= ", ".MAIN_DB_PREFIX."propal as p";

 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";

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

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

+$sql .= " AND p.entity IN (".getEntity('propal').")";

 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;

-$sql .= " AND p.fk_statut IN (".implode(" ,", $listofstatus).")";

+$sql .= " AND p.fk_statut IN (0,1,2,3,4)";

 $sql .= " GROUP BY p.fk_statut";

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

 if ($resql)

 {

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

-	$i = 0;

-	$total = 0;

-	$totalinprocess = 0;

-	$dataseries = array();

-	$colorseries = array();

-	$vals = array();

-

-	while ($i < $num)

+    $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)

+    {

+        $obj = $db->fetch_object($resql);

+        if ($obj)

+        {

+            $vals[$obj->status] = $obj->nb;

+            $totalinprocess += $obj->nb;

+

+            $total += $obj->nb;

+        }

+        $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 nohover centpercent">';

+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td></tr>'."\n";

+    $listofstatus = array(0, 1, 2, 3, 4);

+    foreach ($listofstatus as $status)

+    {

+    	$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

+    	if ($status == Propal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;

+    	if ($status == Propal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;

+    	if ($status == Propal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;

+    	if ($status == Propal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;

+    	if ($status == Propal::STATUS_BILLED) $colorseries[$status] = $badgeStatus6;

+

+        if (empty($conf->use_javascript_ajax))

+        {

+            print '<tr class="oddeven">';

+            print '<td>'.$propalstatic->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 align="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('idgraphthirdparties');

+        print $dolgraph->show($total ? 0 : 1);

+

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

+    }

+    //if ($totalinprocess != $total)

+    //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td class="right">'.$totalinprocess.'</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);

+}

+

+

+/*

+ * Draft proposals

+ */

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

+{

+	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";

+	$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";

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

+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

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

+	$sql .= " AND c.entity IN (".getEntity('propal').")";

+	$sql .= " AND c.fk_statut = 0";

+	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;

+

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

+	if ($resql)

 	{

-		$obj = $db->fetch_object($resql);

-		if ($obj)

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

+		if ($num)

 		{

-			$vals[$obj->status] = $obj->nb;

-			$totalinprocess += $obj->nb;

-

-			$total += $obj->nb;

-		}

-		$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 nohover centpercent">';

-

-	print '<tr class="liste_titre">';

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

-	print '</tr>';

-

-	foreach ($listofstatus as $status) {

-		$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

-		if ($status == Propal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;

-		if ($status == Propal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;

-		if ($status == Propal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;

-		if ($status == Propal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;

-		if ($status == Propal::STATUS_BILLED) $colorseries[$status] = $badgeStatus6;

-

-		if (empty($conf->use_javascript_ajax)) {

-			print '<tr class="oddeven">';

-			print '<td>'.$propalstatic->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";

+			print '<div class="div-table-responsive-no-min">';

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

+			print '<tr class="liste_titre">';

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

+			print '<td colspan="2">'.$langs->trans("DraftPropals").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?search_status=0"><span class="badge">'.$num.'</span></a></td></tr>';

+

+			$i = 0;

+			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

+			while ($i < $nbofloop)

+			{

+				$obj = $db->fetch_object($resql);

+				print '<tr class="oddeven">';

+

+				$propalstatic->id = $obj->rowid;

+				$propalstatic->ref = $obj->ref;

+				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';

+

+				$companystatic->id = $obj->socid;

+				$companystatic->name = $obj->socname;

+				$companystatic->client = $obj->client;

+				$companystatic->canvas = $obj->canvas;

+				print '<td>'.$companystatic->getNomUrl(1, 'customer', 24).'</td>';

+

+				print '</tr>';

+				$i++;

+			}

+			if ($num > $nbofloop)

+			{

+				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";

+			}

+			elseif ($total > 0)

+			{

+				print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";

+			}

+			print "</table>";

+			print "</div><br>";

 		}

 	}

-

-	if ($conf->use_javascript_ajax) {

-		print '<tr>';

-		print '<td align="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('idgraphthirdparties');

-		print $dolgraph->show($total ? 0 : 1);

-

-		print '</td>';

-		print '</tr>';

-	}

-

-	//if ($totalinprocess != $total)

-	//{

-	//	print '<tr class="liste_total">';

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

-	//	print '<td class="right">'.$totalinprocess.'</td>';

-	//	print '</tr>';

-	//}

-

-	print '<tr class="liste_total">';

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

-	print '<td class="right">'.$total.'</td>';

-	print '</tr>';

-

-	print '</table>';

-	print '</div>';

-	print '<br>';

-} else {

-	dol_print_error($db);

-}

-

-

-/*

- * Draft proposals

- */

-if (!empty($conf->propal->enabled)) {

-	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc";

-	$sql .= ", s.rowid as socid, s.nom as name, s.client, s.canvas, s.code_client, s.email, s.entity, s.code_compta";

-	$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";

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

-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";

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

-	$sql .= " AND p.fk_statut =".Propal::STATUS_DRAFT;

-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

-	if ($socid) $sql .= " AND p.fk_soc = ".$socid;

-

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

-	if ($resql) {

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

-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

-		startSimpleTable("DraftPropals", "comm/propal/list.php", "search_status=".Propal::STATUS_DRAFT, 2, $num);

-

-		if ($num) {

-			$total = 0;

-			$i = 0;

-

-			while ($i < $nbofloop) {

-				$obj = $db->fetch_object($resql);

-

-				$propalstatic->id = $obj->rowid;

-				$propalstatic->ref = $obj->ref;

-				$propalstatic->ref_client = $obj->ref_client;

-				$propalstatic->total_ht = $obj->total_ht;

-				$propalstatic->total_tva = $obj->total_tva;

-				$propalstatic->total_ttc = $obj->total_ttc;

-

-				$companystatic->id = $obj->socid;

-				$companystatic->name = $obj->name;

-				$companystatic->client = $obj->client;

-				$companystatic->code_client = $obj->code_client;

-				$companystatic->code_fournisseur = $obj->code_fournisseur;

-				$companystatic->canvas = $obj->canvas;

-				$companystatic->entity = $obj->entity;

-				$companystatic->email = $obj->email;

-				$companystatic->code_compta = $obj->code_compta;

-

-				print '<tr class="oddeven">';

-				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';

-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';

-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';

-				print '</tr>';

-

-				$i++;

-				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);

-			}

-		}

-

-		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");

-		finishSimpleTable(true);

-		$db->free($resql);

-	} else {

-		dol_print_error($db);

-	}

-}

-

-print '</div>';

-

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

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

+}

+

+

+//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';

+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';

+

+

+$max = 5;

 

 /*

  * Last modified proposals

  */

 

-$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, date_cloture as datec";

-$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client";

+$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";

+$sql .= " date_cloture as datec";

 $sql .= " FROM ".MAIN_DB_PREFIX."propal as c";

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

 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

-$sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";

-$sql .= " AND c.fk_soc = s.rowid";

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

+$sql .= " AND c.entity IN (".getEntity('propal').")";

 //$sql.= " AND c.fk_statut > 2";

 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;

@@ -281,127 +256,155 @@
 $sql .= $db->plimit($max, 0);

 

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

-if ($resql) {

+if ($resql)

+{

+	print '<div class="div-table-responsive-no-min">';

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

+	print '<tr class="liste_titre">';

+	print '<td colspan="4">'.$langs->trans("LastModifiedProposals", $max).'</td></tr>';

+

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

-	startSimpleTable($langs->trans("LastModifiedProposals", $max), "", "", 3);

-

-	if ($num) {

+	if ($num)

+	{

 		$i = 0;

-		while ($i < $num) {

+		while ($i < $num)

+		{

 			$obj = $db->fetch_object($resql);

+

+			print '<tr class="oddeven">';

+			print '<td width="20%" class="nowrap">';

 

 			$propalstatic->id = $obj->rowid;

 			$propalstatic->ref = $obj->ref;

+

+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';

+			print '<td width="96" class="nobordernopadding nowrap">';

+			print $propalstatic->getNomUrl(1);

+			print '</td>';

+

+			print '<td width="16" class="nobordernopadding nowrap">';

+			print '&nbsp;';

+			print '</td>';

+

+			print '<td width="16" class="nobordernopadding right">';

+			$filename = dol_sanitizeFileName($obj->ref);

+			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);

+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;

+			print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);

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

+

+			print '</td>';

 

 			$companystatic->id = $obj->socid;

 			$companystatic->name = $obj->socname;

 			$companystatic->client = $obj->client;

 			$companystatic->canvas = $obj->canvas;

-

-			$filename = dol_sanitizeFileName($obj->ref);

-			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);

-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;

-

-			print '<tr class="oddeven">';

-

-			print '<td width="20%" class="nowrap">';

-			print '<table class="nobordernopadding">';

-			print '<tr class="nocellnopadd">';

-			print '<td width="96" class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';

-			print '<td width="16" class="nobordernopadding nowrap"></td>';

-			print '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';

+			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';

+

+			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';

+

+			print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';

 			print '</tr>';

-			print '</table>';

-			print '</td>';

-

-			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';

-			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';

-			print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';

-

-			print '</tr>';

-

 			$i++;

 		}

 	}

-

-	finishSimpleTable(true);

-	$db->free($resql);

-} else {

-	dol_print_error($db);

-}

-

-

-/*

- * Open (validated) proposals

- */

-if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {

+	print "</table>";

+	print "</div><br>";

+}

+else dol_print_error($db);

+

+

+/*

+ * Open proposals

+ */

+if (!empty($conf->propal->enabled) && $user->rights->propale->lire)

+{

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

+

+	$now = dol_now();

+

 	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";

 	$sql .= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";

 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";

 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";

 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

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

-	$sql .= " AND p.entity IN (".getEntity($propalstatic->element).")";

-	$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;

+	$sql .= " AND p.entity IN (".getEntity('propal').")";

+	$sql .= " AND p.fk_statut = 1";

 	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;

 	$sql .= " ORDER BY p.rowid DESC";

 

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

-	if ($resql) {

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

+	if ($result)

+	{

 		$total = 0;

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

-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

-		startSimpleTable("ProposalsOpened", "comm/propal/list.php", "search_status=".Propal::STATUS_VALIDATED, 4, $num);

-

-		if ($num > 0) {

-			$i = 0;

-			while ($i < $nbofloop) {

-				$obj = $db->fetch_object($resql);

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

+		$i = 0;

+		if ($num > 0)

+		{

+			print '<div class="div-table-responsive-no-min">';

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

+			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></td></tr>';

+

+			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));

+			while ($i < $nbofloop)

+			{

+				$obj = $db->fetch_object($result);

+

+				print '<tr class="oddeven">';

+

+				// Ref

+				print '<td class="nowrap" width="140">';

 

 				$propalstatic->id = $obj->propalid;

 				$propalstatic->ref = $obj->ref;

+

+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';

+				print '<td class="nobordernopadding nowrap">';

+				print $propalstatic->getNomUrl(1);

+				print '</td>';

+				print '<td width="18" class="nobordernopadding nowrap">';

+				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));

+				print '</td>';

+				print '<td width="16" align="center" class="nobordernopadding">';

+				$filename = dol_sanitizeFileName($obj->ref);

+				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);

+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;

+				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);

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

+

+				print "</td>";

 

 				$companystatic->id = $obj->socid;

 				$companystatic->name = $obj->socname;

 				$companystatic->client = $obj->client;

 				$companystatic->canvas = $obj->canvas;

-

-				$filename = dol_sanitizeFileName($obj->ref);

-				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);

-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;

-

-				$warning = ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) ? img_warning($langs->trans("Late")) : '';

-

-				print '<tr class="oddeven">';

-

-				// Ref

-				print '<td class="nowrap" width="140">';

-				print '<table class="nobordernopadding">';

-				print '<tr class="nocellnopadd">';

-				print '<td class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';

-				print '<td width="18" class="nobordernopadding nowrap">'.$warning.'</td>';

-				print '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';

-				print '</tr>';

-				print '</table>';

-				print '</td>';

-

-				print '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';

-				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';

-				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';

-				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';

-

-				print '</tr>';

-

+				print '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>'."\n";

+

+				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";

+

+				print '<td class="right">'.price($obj->total_ttc).'</td>';

+

+				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";

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

 				$i++;

-				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);

-			}

+				$total += $obj->total_ttc;

+			}

+			if ($num > $nbofloop)

+			{

+				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";

+			}

+			elseif ($total > 0)

+			{

+				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";

+			}

+			print "</table>";

+			print "</div><br>";

 		}

-

-		addSummaryTableLine(5, $num, $nbofloop, $total, "None", true);

-		finishSimpleTable(true);

-		$db->free($resql);

-	} else {

+	}

+	else

+	{

 		dol_print_error($db);

 	}

 }

@@ -409,7 +412,6 @@
 /*

  * Proposals to process

  */

-

 /*

 if (! empty($conf->propal->enabled))

 {

@@ -484,9 +486,7 @@
 /*

  * Proposal that are in a shipping process

  */

-

-/*

-if (! empty($conf->propal->enabled))

+/*if (! empty($conf->propal->enabled))

 {

 	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";

 	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";

@@ -555,9 +555,8 @@
 }

 */

 

-print '</div>';

-print '</div>';

-print '</div>';

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

+print '</div></div></div>';

 

 $parameters = array('user' => $user);

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

--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_info.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_info.php
@@ -46,8 +46,8 @@
 $object = new Propal($db);

 if (!$object->fetch($id, $ref) > 0)

 {

-	dol_print_error($db);

-	exit;

+    dol_print_error($db);

+    exit;

 }

 

 

@@ -63,7 +63,7 @@
 $object->fetch_thirdparty();

 

 $head = propal_prepare_head($object);

-print dol_get_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');

+dol_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');

 

 $object->info($object->id);

 

@@ -82,36 +82,36 @@
 // Project

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

 {

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

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

-	if ($user->rights->propal->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 .= '';

-		}

-	}

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

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

+    if ($user->rights->propal->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 .= '';

+        }

+    }

 }

 $morehtmlref .= '</div>';

 

@@ -126,7 +126,7 @@
 

 print '</div>';

 

-print dol_get_fiche_end();

+dol_fiche_end();

 

 // End of page

 llxFooter();

--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_list.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_list.php
@@ -50,7 +50,7 @@
 

 $socid = GETPOST('socid', 'int');

 

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

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

 $massaction = GETPOST('massaction', 'alpha');

 $show_files = GETPOST('show_files', 'int');

 $confirm = GETPOST('confirm', 'alpha');

@@ -78,7 +78,7 @@
 $search_product_category = GETPOST('search_product_category', 'int');

 $search_town = GETPOST('search_town', 'alpha');

 $search_zip = GETPOST('search_zip', 'alpha');

-$search_state = GETPOST("search_state");

+$search_state = trim(GETPOST("search_state"));

 $search_country = GETPOST("search_country", 'int');

 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');

 $search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));

@@ -88,7 +88,7 @@
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));

 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));

 $search_availability = GETPOST('search_availability', 'int');

-$search_categ_cus = GETPOST("search_categ_cus", 'int');

+$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));

 $search_btn = GETPOST('button_search', 'alpha');

 $search_remove_btn = GETPOST('button_removefilter', 'alpha');

 

@@ -110,11 +110,6 @@
 $pagenext = $page + 1;

 if (!$sortfield) $sortfield = 'p.ref';

 if (!$sortorder) $sortorder = 'DESC';

-

-$permissiontoread = $user->rights->propal->lire;

-$permissiontoadd = $user->rights->propal->write;

-$permissiontodelete = $user->rights->propal->supprimer;

-$permissiontoclose = $user->rights->propal->cloturer;

 

 // Security check

 $module = 'propal';

@@ -188,12 +183,17 @@
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),

 	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),

 	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),

-	'p.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),

-	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),

 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),

 );

 // Extra fields

-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]));

+	}

+}

 

 

 /*

@@ -251,81 +251,15 @@
 }

 if ($object_statut != '') $search_status = $object_statut;

 

-

 if (empty($reshook))

 {

 	$objectclass = 'Propal';

 	$objectlabel = 'Proposals';

+	$permissiontoread = $user->rights->propal->lire;

+	$permissiontodelete = $user->rights->propal->supprimer;

+	$permissiontoclose = $user->rights->propal->cloturer;

 	$uploaddir = $conf->propal->multidir_output[$conf->entity];

 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

-}

-

-// Mass action validate (after a confirmation question, it is $action that is used).

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

-	if (GETPOST('confirm') == 'yes') {

-		$tmpproposal = new Propal($db);

-

-		$db->begin();

-		$error = 0;

-		foreach ($toselect as $checked) {

-			if ($tmpproposal->fetch($checked)) {

-				if ($tmpproposal->statut == $tmpproposal::STATUS_DRAFT) {

-					if ($tmpproposal->valid($user)) {

-						setEventMessage($tmpproposal->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');

-					} else {

-						setEventMessage($langs->trans('CantBeValidated'), 'errors');

-						$error++;

-					}

-				} else {

-					setEventMessage($tmpproposal->ref." ".$langs->trans('IsNotADraft'), 'errors');

-					$error++;

-				}

-			} else {

-				dol_print_error($db);

-				$error++;

-			}

-		}

-		if ($error) {

-			$db->rollback();

-		} else {

-			$db->commit();

-		}

-	}

-}

-

-// Mass action sign (after a confirmation question, it is $action that is used).

-if ($action == "sign") {

-	if (GETPOST('confirm') == 'yes') {

-		$tmpproposal = new Propal($db);

-

-		$db->begin();

-		$error = 0;

-		foreach ($toselect as $checked) {

-			if ($tmpproposal->fetch($checked)) {

-				if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED) {

-					$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;

-

-					if ($tmpproposal->update($user)) {

-						setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');

-					} else {

-						dol_print_error($db);

-						$error++;

-					}

-				} else {

-					setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeSign'), 'errors');

-					$error++;

-				}

-			} else {

-				dol_print_error($db);

-				$error++;

-			}

-		}

-		if ($error) {

-			$db->rollback();

-		} else {

-			$db->commit();

-		}

-	}

 }

 

 

@@ -348,7 +282,7 @@
 //llxHeader('',$langs->trans('Proposal'),$help_url);

 

 $sql = 'SELECT';

-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';

+if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';

 $sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';

 $sql .= " typent.code as typent_code,";

 $sql .= " ava.rowid as availability,";

@@ -399,13 +333,13 @@
 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($db->escape($search_country)).')';

-if ($search_type_thirdparty)		$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';

+if ($search_country)				$sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';

+if ($search_type_thirdparty)		$sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';

 if ($search_ref)					$sql .= natural_search('p.ref', $search_ref);

 if ($search_refcustomer)			$sql .= natural_search('p.ref_client', $search_refcustomer);

 if ($search_refproject)				$sql .= natural_search('pr.ref', $search_refproject);

 if ($search_project)				$sql .= natural_search('pr.title', $search_project);

-if ($search_availability)			$sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')';

+if ($search_availability)			$sql .= " AND p.fk_availability IN (".$db->escape($search_availability).')';

 

 if ($search_societe)				$sql .= natural_search('s.nom', $search_societe);

 if ($search_login)					$sql .= natural_search("u.login", $search_login);

@@ -427,7 +361,7 @@
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;

 if ($search_status != '' && $search_status != '-1')

 {

-	$sql .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';

+	$sql .= ' AND p.fk_statut IN ('.$db->escape($search_status).')';

 }

 if ($search_date_start)             $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";

 if ($search_date_end)               $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";

@@ -480,7 +414,9 @@
 		$soc->fetch($socid);

 		$title = $langs->trans('ListOfProposals').' - '.$soc->name;

 		if (empty($search_societe)) $search_societe = $soc->name;

-	} else {

+	}

+	else

+	{

 		$title = $langs->trans('ListOfProposals');

 	}

 

@@ -538,17 +474,17 @@
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),

 		'builddoc'=>$langs->trans("PDFMerge"),

 		'presend'=>$langs->trans("SendByMail"),

-		'prevalidate'=>$langs->trans("Validate"),

-		'presign'=>$langs->trans("Sign"),

 	);

 	if ($user->rights->propal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");

 	if ($user->rights->propal->cloturer) $arrayofmassactions['closed'] = $langs->trans("Close");

 	if (in_array($massaction, array('presend', 'predelete', 'closed'))) $arrayofmassactions = array();

 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);

 

-	$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';

-	if (!empty($socid)) $url .= '&socid='.$socid;

-	$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->rights->propal->creer);

+	$newcardbutton = '';

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

+	{

+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/propal/card.php?action=create');

+	}

 

 	// Fields title search

 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';

@@ -568,16 +504,6 @@
 	$trackid = 'pro'.$object->id;

 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';

 

-	if ($massaction == 'prevalidate')

-	{

-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);

-	}

-

-	if ($massaction == 'presign')

-	{

-		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);

-	}

-

 	if ($sall)

 	{

 		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);

@@ -606,7 +532,7 @@
 		$moreforfilter .= '</div>';

 	}

 	// If the user can view products

-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))

+	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))

 	{

 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 		$moreforfilter .= '<div class="divsearchfield">';

@@ -615,7 +541,7 @@
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);

 		$moreforfilter .= '</div>';

 	}

-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)

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

 	{

 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 		$moreforfilter .= '<div class="divsearchfield">';

@@ -702,10 +628,12 @@
 	{

 		print '<td class="liste_titre center">';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

+		print $langs->trans('From').' ';

+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);

 		print '</div>';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

+		print $langs->trans('to').' ';

+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);

 		print '</div>';

 		print '</td>';

 	}

@@ -714,10 +642,12 @@
 	{

 		print '<td class="liste_titre center">';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

+		print $langs->trans('From').' ';

+		print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1);

 		print '</div>';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));

+		print $langs->trans('to').' ';

+		print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1);

 		print '</div>';

 		print '</td>';

 	}

@@ -726,10 +656,12 @@
 	{

 		print '<td class="liste_titre center">';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

+		print $langs->trans('From').' ';

+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);

 		print '</div>';

 		print '<div class="nowrap">';

-		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));

+		print $langs->trans('to').' ';

+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);

 		print '</div>';

 		print '</td>';

 	}

@@ -854,18 +786,6 @@
 	// Date cloture

 	if (!empty($arrayfields['p.date_cloture']['checked']))

 	{

-		print '<td class="liste_titre">';

-		print '</td>';

-	}

-	if (!empty($arrayfields['p.note_public']['checked']))

-	{

-		// Note public

-		print '<td class="liste_titre">';

-		print '</td>';

-	}

-	if (!empty($arrayfields['p.note_private']['checked']))

-	{

-		// Note private

 		print '<td class="liste_titre">';

 		print '</td>';

 	}

@@ -924,8 +844,6 @@
 	if (!empty($arrayfields['p.datec']['checked']))     		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);

 	if (!empty($arrayfields['p.tms']['checked']))       		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);

 	if (!empty($arrayfields['p.date_cloture']['checked']))		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);

-	if (!empty($arrayfields['p.note_public']['checked']))       print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

-	if (!empty($arrayfields['p.note_private']['checked']))      print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');

 	if (!empty($arrayfields['p.fk_statut']['checked']))			print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);

 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');

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

@@ -1110,7 +1028,9 @@
 			{

 				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');

 				print '</td>';

-			} else {

+			}

+			else

+			{

 				print '<td>&nbsp;</td>';

 			}

 			if (!$i) $totalarray['nbfield']++;

@@ -1122,7 +1042,9 @@
 			{

 				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');

 				print '</td>';

-			} else {

+			}

+			else

+			{

 				print '<td>&nbsp;</td>';

 			}

 			if (!$i) $totalarray['nbfield']++;

@@ -1247,7 +1169,8 @@
 				if ($nbofsalesrepresentative > 3)   // We print only number

 				{

 					print $nbofsalesrepresentative;

-				} elseif ($nbofsalesrepresentative > 0)

+				}

+				elseif ($nbofsalesrepresentative > 0)

 				{

 					$userstatic = new User($db);

 					$j = 0;

@@ -1269,7 +1192,9 @@
 					}

 				}

 				//else print $langs->trans("NoSalesRepresentativeAffected");

-			} else {

+			}

+			else

+			{

 				print '&nbsp';

 			}

 			print '</td>';

@@ -1306,22 +1231,6 @@
 			print '</td>';

 			if (!$i) $totalarray['nbfield']++;

 		}

-		// Note public

-		if (!empty($arrayfields['p.note_public']['checked']))

-		{

-			print '<td class="center">';

-			print dol_escape_htmltag($obj->note_public);

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

-		// Note private

-		if (!empty($arrayfields['p.note_private']['checked']))

-		{

-			print '<td class="center">';

-			print dol_escape_htmltag($obj->note_private);

-			print '</td>';

-			if (!$i) $totalarray['nbfield']++;

-		}

 		// Status

 		if (!empty($arrayfields['p.fk_statut']['checked']))

 		{

@@ -1370,7 +1279,9 @@
 	$delallowed = $user->rights->propal->creer;

 

 	print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);

-} else {

+}

+else

+{

 	dol_print_error($db);

 }

 

--- /tmp/dsg/dolibarr/htdocs/comm/propal/github_note.php
+++ /tmp/dsg/dolibarr/htdocs/comm/propal/client_note.php
@@ -38,7 +38,7 @@
 

 $id = GETPOST('id', 'int');

 $ref = GETPOST('ref', 'alpha');

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

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

 

 // Security check

 if ($user->socid) $socid = $user->socid;

@@ -75,8 +75,8 @@
 	{

 		if ($object->fetch_thirdparty() > 0)

 		{

-			$head = propal_prepare_head($object);

-			print dol_get_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');

+		    $head = propal_prepare_head($object);

+			dol_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');

 

 			$cssclass = 'titlefield';

 			//if ($action == 'editnote_public') $cssclass='titlefieldcreate';

@@ -97,36 +97,36 @@
 			// Project

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

 			{

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

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

-				if ($user->rights->propal->creer)

-				{

-					if ($action != 'classify') {

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

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

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

+			    if ($user->rights->propal->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 .= '';

-					}

-				}

+		            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 .= '';

+			        }

+			    }

 			}

 			$morehtmlref .= '</div>';

 

@@ -140,7 +140,7 @@
 

 			print '</div>';

 

-			print dol_get_fiche_end();

+			dol_fiche_end();

 		}

 	}

 }