--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_dynamic_prices.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_dynamic_prices.php
@@ -2,2 +2 @@
-/* Copyright (C) 2015	    Ion Agorria             <ion@agorria.com>

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

+/* Copyright (C) 2015	  Ion Agorria		  <ion@agorria.com>

@@ -25 +23,0 @@
-// Load Dolibarr environment

@@ -36 +34 @@
-$action = GETPOST('action', 'aZ09');

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

@@ -42,3 +40 @@
-if (!$user->admin) {

-	accessforbidden();

-}

+if (!$user->admin) accessforbidden();

@@ -49,4 +45,4 @@
-	$res = $price_globals->fetch($selection);

-	if ($res < 1) {

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

-	}

+    $res = $price_globals->fetch($selection);

+    if ($res < 1) {

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

+    }

@@ -56,4 +52,4 @@
-	$res = $price_updaters->fetch($selection);

-	if ($res < 1) {

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

-	}

+    $res = $price_updaters->fetch($selection);

+    if ($res < 1) {

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

+    }

@@ -68,76 +64,76 @@
-	//Global variable actions

-	if ($action == 'create_variable' || $action == 'edit_variable') {

-		$price_globals->code = GETPOSTISSET('code') ? GETPOST('code', 'alpha') : $price_globals->code;

-		$price_globals->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_globals->description;

-		$price_globals->value = GETPOSTISSET('value') ? GETPOST('value', 'int') : $price_globals->value;

-		//Check if record already exists only when saving

-		if (!empty($save)) {

-			foreach ($price_globals->listGlobalVariables() as $entry) {

-				if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {

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

-					$save = null;

-				}

-			}

-		}

-	}

-	if ($action == 'create_variable' && !empty($save)) {

-		$res = $price_globals->create($user);

-		if ($res > 0) {

-			$action = '';

-		} else {

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

-		}

-	} elseif ($action == 'edit_variable' && !empty($save)) {

-		$res = $price_globals->update($user);

-		if ($res > 0) {

-			$action = '';

-		} else {

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

-		}

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

-		$res = $price_globals->delete($selection, $user);

-		if ($res > 0) {

-			$action = '';

-		} else {

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

-		}

-	}

-

-	//Updaters actions

-	if ($action == 'create_updater' || $action == 'edit_updater') {

-		$price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;

-		$price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;

-		$price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;

-		$price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;

-		$price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;

-	}

-	if ($action == 'create_updater' && !empty($save)) {

-		//Verify if process() works

-		$res = $price_updaters->process();

-		if ($res > 0) {

-			$res = $price_updaters->create($user);

-		}

-		if ($res > 0) {

-			$action = '';

-		} else {

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

-		}

-	} elseif ($action == 'edit_updater' && !empty($save)) {

-		//Verify if process() works

-		$res = $price_updaters->process();

-		if ($res > 0) {

-			$res = $price_updaters->update($user);

-		}

-		if ($res > 0) {

-			$action = '';

-		} else {

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

-		}

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

-		$res = $price_updaters->delete($selection, $user);

-		if ($res > 0) {

-			$action = '';

-		} else {

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

-		}

-	}

+    //Global variable actions

+    if ($action == 'create_variable' || $action == 'edit_variable') {

+        $price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;

+        $price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'alpha') : $price_globals->description;

+        $price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;

+        //Check if record already exists only when saving

+        if (!empty($save)) {

+            foreach ($price_globals->listGlobalVariables() as $entry) {

+                if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {

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

+                    $save = null;

+                }

+            }

+        }

+    }

+    if ($action == 'create_variable' && !empty($save)) {

+        $res = $price_globals->create($user);

+        if ($res > 0) {

+            $action = '';

+        } else {

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

+        }

+    } elseif ($action == 'edit_variable' && !empty($save)) {

+        $res = $price_globals->update($user);

+        if ($res > 0) {

+            $action = '';

+        } else {

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

+        }

+    } elseif ($action == 'delete_variable') {

+        $res = $price_globals->delete($selection, $user);

+        if ($res > 0) {

+            $action = '';

+        } else {

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

+        }

+    }

+

+    //Updaters actions

+    if ($action == 'create_updater' || $action == 'edit_updater') {

+        $price_updaters->type = GETPOSTISSET('type') ?GETPOST('type', 'int') : $price_updaters->type;

+        $price_updaters->description = GETPOSTISSET('description') ?GETPOST('description', 'alpha') : $price_updaters->description;

+        $price_updaters->parameters = GETPOSTISSET('parameters') ?GETPOST('parameters') : $price_updaters->parameters;

+        $price_updaters->fk_variable = GETPOSTISSET('fk_variable') ?GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;

+        $price_updaters->update_interval = GETPOSTISSET('update_interval') ?GETPOST('update_interval', 'int') : $price_updaters->update_interval;

+    }

+    if ($action == 'create_updater' && !empty($save)) {

+        //Verify if process() works

+        $res = $price_updaters->process();

+        if ($res > 0) {

+            $res = $price_updaters->create($user);

+        }

+        if ($res > 0) {

+            $action = '';

+        } else {

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

+        }

+    } elseif ($action == 'edit_updater' && !empty($save)) {

+        //Verify if process() works

+        $res = $price_updaters->process();

+        if ($res > 0) {

+            $res = $price_updaters->update($user);

+        }

+        if ($res > 0) {

+            $action = '';

+        } else {

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

+        }

+    } elseif ($action == 'delete_updater') {

+        $res = $price_updaters->delete($selection, $user);

+        if ($res > 0) {

+            $action = '';

+        } else {

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

+        }

+    }

@@ -145 +141 @@
-	$action = '';

+    $action = '';

@@ -155 +151 @@
-llxHeader("", "", $langs->trans("DynamicPrice"));

+llxHeader("", "", $langs->trans("CardProduct".$product->type));

@@ -164,39 +160,43 @@
-if ($action != 'create_updater' && $action != 'edit_updater') {

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

-

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

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

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

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

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

-	print '<td width="80">&nbsp;</td>'; //Space for buttons

-	print '</tr>';

-

-	$arrayglobalvars = $price_globals->listGlobalVariables();

-	if (!empty($arrayglobalvars)) {

-		foreach ($arrayglobalvars as $i => $entry) {

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

-			print '<td>'.$entry->code.'</td>';

-			print '<td>'.$entry->description.'</td>';

-			print '<td>'.price($entry->value).'</td>';

-			print '<td class="right"><a class="editfielda paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&token='.newToken().'&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';

-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';

-			print '</tr>';

-		}

-	} else {

-		print '<tr><td colspan="4"><span class="opacitymedium">';

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

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

-	}

-	print '</table>';

-

-	if (empty($action)) {

-		/*

-		 * Action bar

-		 */

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

-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';

-		print '</div>';

-		//Separator is only need for updaters table is showed after buttons

-		print '<br><br>';

-	}

+if ($action != 'create_updater' && $action != 'edit_updater')

+{

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

+

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

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

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

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

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

+    print '<td width="80">&nbsp;</td>'; //Space for buttons

+    print '</tr>';

+

+    $arrayglobalvars = $price_globals->listGlobalVariables();

+    if (!empty($arrayglobalvars))

+    {

+	    foreach ($arrayglobalvars as $i=>$entry) {

+	        $var = !$var;

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

+	        print '<td>'.$entry->code.'</td>';

+	        print '<td>'.$entry->description.'</td>';

+	        print '<td>'.price($entry->value).'</td>';

+	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';

+	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';

+	        print '</tr>';

+	    }

+    }

+    else

+    {

+    	print '<tr colspan="7"><td class="opacitymedium">';

+    	print $langs->trans("None");

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

+    }

+    print '</table>';

+

+    if (empty($action))

+    {

+        //Action Buttons

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

+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';

+        print '</div>';

+        //Separator is only need for updaters table is showed after buttons

+        print '<br><br>';

+    }

@@ -207,29 +207,31 @@
-	//Form

-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';

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

-	print '<input type="hidden" name="action" value="'.$action.'">';

-	print '<input type="hidden" name="selection" value="'.$selection.'">';

-

-	//Table

-	print '<br><table summary="listofattributes" class="border centpercent">';

-	//Code

-	print '<tr>';

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

-	print '<td class="valeur"><input type="text" name="code" class="minwidth100" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';

-	print '</tr>';

-	//Description

-	print '<tr>';

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

-	print '<td class="valeur"><input type="text" name="description" class="minwidth200" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';

-	print '</tr>';

-	//Value

-	print '<tr>';

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

-	print '<td class="valeur"><input type="text" name="value" class="minwidth100" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';

-	print '</tr>';

-	print '</table>';

-

-	//Form Buttons

-	print $form->buttonsSaveCancel();

-

-	print '</form>';

+    //Form

+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';

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

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

+    print '<input type="hidden" name="selection" value="'.$selection.'">';

+

+    //Table

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

+    //Code

+    print '<tr>';

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

+    print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';

+    print '</tr>';

+    //Description

+    print '<tr>';

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

+    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';

+    print '</tr>';

+    //Value

+    print '<tr>';

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

+    print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';

+    print '</tr>';

+    print '</table>';

+

+    //Form Buttons

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

+    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';

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

+    print '</div>';

+    print '</form>';

@@ -239,50 +241,53 @@
-if ($action != 'create_variable' && $action != 'edit_variable') {

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

-

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

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

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

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

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

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

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

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

-	print '<td width="80">&nbsp;</td>'; //Space for buttons

-	print '</tr>';

-

-	$arraypriceupdaters = $price_updaters->listUpdaters();

-	if (!empty($arraypriceupdaters)) {

-		foreach ($arraypriceupdaters as $i => $entry) {

-			$code = "";

-			if ($entry->fk_variable > 0) {

-				$res = $price_globals->fetch($entry->fk_variable);

-				if ($res > 0) {

-					$code = $price_globals->code;

-				}

-			}

-			print '<tr>';

-			print '<td>'.$code.'</td>';

-			print '<td>'.$entry->description.'</td>';

-			print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';

-			print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';

-			print '<td>'.$entry->update_interval.'</td>';

-			print '<td>'.$entry->getLastUpdated().'</td>';

-			print '<td class="right"><a class="editfielda paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';

-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';

-			print '</tr>';

-		}

-	} else {

-		print '<tr><td colspan="7"><span class="opacitymedium">';

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

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

-	}

-	print '</table>';

-

-	if (empty($action)) {

-		/*

-		 * Action bar

-		 */

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

-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater&token='.newToken().'">'.$langs->trans("AddUpdater").'</a>';

-		print '</div>';

-	}

+if ($action != 'create_variable' && $action != 'edit_variable')

+{

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

+

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

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

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

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

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

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

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

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

+    print '<td width="80">&nbsp;</td>'; //Space for buttons

+    print '</tr>';

+

+    $arraypriceupdaters = $price_updaters->listUpdaters();

+    if (!empty($arraypriceupdaters))

+    {

+	    foreach ($arraypriceupdaters as $i=>$entry) {

+	        $code = "";

+	        if ($entry->fk_variable > 0) {

+	            $res = $price_globals->fetch($entry->fk_variable);

+	            if ($res > 0) {

+	                $code = $price_globals->code;

+	            }

+	        }

+	        print '<tr>';

+	        print '<td>'.$code.'</td>';

+	        print '<td>'.$entry->description.'</td>';

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

+	        print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';

+	        print '<td>'.$entry->update_interval.'</td>';

+	        print '<td>'.$entry->getLastUpdated().'</td>';

+	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';

+	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';

+	        print '</tr>';

+	    }

+    }

+    else

+    {

+    	print '<tr><td colspan="7" class="opacitymedium">';

+    	print $langs->trans("None");

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

+    }

+    print '</table>';

+

+    if (empty($action))

+    {

+        //Action Buttons

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

+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater">'.$langs->trans("AddUpdater").'</a>';

+        print '</div>';

+    }

@@ -293,33 +298,33 @@
-	//Form

-	print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';

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

-	print '<input type="hidden" name="action" value="'.$action.'">';

-	print '<input type="hidden" name="selection" value="'.$selection.'">';

-

-	//Table

-	print '<br><table summary="listofattributes" class="border centpercent">';

-	//Code

-	print '<tr>';

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

-	$globals_list = array();

-	foreach ($price_globals->listGlobalVariables() as $entry) {

-		$globals_list[$entry->id] = $entry->code;

-	}

-	print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));

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

-	//Description

-	print '<tr>';

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

-	print '<td class="valeur"><input type="text" name="description" class="minwidth200" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';

-	print '</tr>';

-	//Type

-	print '<tr>';

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

-	$type = empty($price_updaters->type) ? 0 : $price_updaters->type;

-	$type_list = array();

-	foreach ($price_updaters->types as $val) {

-		$type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);

-	}

-	print $form->selectarray('type', $type_list, $type);

-	// This code submits form when type is changed

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

+    //Form

+    print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';

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

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

+    print '<input type="hidden" name="selection" value="'.$selection.'">';

+

+    //Table

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

+    //Code

+    print '<tr>';

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

+    $globals_list = array();

+    foreach ($price_globals->listGlobalVariables() as $entry) {

+        $globals_list[$entry->id] = $entry->code;

+    }

+    print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));

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

+    //Description

+    print '<tr>';

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

+    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';

+    print '</tr>';

+    //Type

+    print '<tr>';

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

+    $type = empty($price_updaters->type) ? 0 : $price_updaters->type;

+    $type_list = array();

+    foreach ($price_updaters->types as $val) {

+        $type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);

+    }

+    print $form->selectarray('type', $type_list, $type);

+    // This code submits form when type is changed

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

@@ -334,21 +339,23 @@
-	print '</td></tr>';

-	//Parameters

-	print '<tr>';

-	$help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';

-	print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';

-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

-	$doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');

-	$doleditor->Create();

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

-	print '</tr>';

-	//Interval

-	print '<tr>';

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

-	print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';

-	print '</tr>';

-	print '</table>';

-

-	//Form Buttons

-	print $form->buttonsSaveCancel();

-

-	print '</form>';

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

+    //Parameters

+    print '<tr>';

+    $help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';

+    print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

+    $doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');

+    $doleditor->Create();

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

+    print '</tr>';

+    //Interval

+    print '<tr>';

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

+    print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';

+    print '</tr>';

+    print '</table>';

+

+    //Form Buttons

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

+    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';

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

+    print '</div>';

+    print '</form>';

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_price_rules.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_price_rules.php
@@ -18,2 +18,2 @@
- * Page to set how to autocalculate price for each level when option PRODUCT_MULTIPRICE is on.

- * This page is a tab in the setup of module Product if option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL is set.

+ * Page to set how to autocalculate price for each level when option

+ * PRODUCT_MULTIPRICE is on.

@@ -22 +21,0 @@
-// Load Dolibarr environment

@@ -30,2 +28,0 @@
-$action = GETPOST('action', 'aZ09');

-

@@ -33 +30 @@
-if (!$user->admin || (!isModEnabled("product") && !isModEnabled("service"))) {

+if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))

@@ -35,4 +31,0 @@
-}

-

-$error = 0;

-

@@ -44 +37 @@
-if ($action == 'update') {

+if ($_POST) {

@@ -62 +54,0 @@
-		// Set $i_var_percent, the percent of price for level compared to an other level

@@ -75,4 +67,4 @@
-			$check2 = $i_var_percent && ($i_var_min_percent || (string) $i_var_min_percent === '0');

-		}

-

-		if (empty($i_var_percent) && empty($i_var_min_percent)) {

+			$check2 = $i_var_percent && $i_var_min_percent;

+		}

+

+		if (!$check1 || !$check2) {

@@ -80 +72,4 @@
-			$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".((int) $i));

+			if ($check1) {

+				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int) $i);

+			}

+

@@ -84,2 +79,2 @@
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES (";

-		$sql .= ((int) $i).", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";

+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES (

+		".(int) $i.", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")";

@@ -89,2 +84,2 @@
-			$sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules";

-			$sql .= " SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".((int) $i);

+			$sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules

+			SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".$i;

@@ -94 +88,0 @@
-				$error++;

@@ -99,5 +93,2 @@
-	if (!$error) {

-		setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');

-	}

-}

-

+	setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');

+}

@@ -122 +113 @@
-if (!isModEnabled("product")) {

+if (empty($conf->product->enabled)) {

@@ -125 +116 @@
-} elseif (!isModEnabled("service")) {

+} elseif (empty($conf->service->enabled)) {

@@ -136,3 +127,2 @@
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';

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

-print '<input type="hidden" name="action" value="update">';

+

+print '<form method="POST">';

@@ -141,5 +131,7 @@
-print dol_get_fiche_head($head, 'generator', $tab, -1, 'product');

-

-print '<span class="opacitymedium">'.$langs->trans("MultiPriceRuleDesc").'</span><br><br>';

-

-// Array that contains the number of prices available

+dol_fiche_head($head, 'generator', $tab, 0, 'product');

+

+print $langs->trans("MultiPriceRuleDesc").'<br><br>';

+

+print load_fiche_titre($langs->trans('MultipriceRules'), '', '');

+

+//Array that contains the number of prices available

@@ -150,0 +143,11 @@
+

+$genPriceOptions = function ($level) use ($price_options) {

+

+	$return = array();

+

+	for ($i = 1; $i < $level; $i++) {

+		$return[$i] = $price_options[$i];

+	}

+

+	return $return;

+};

@@ -153 +156 @@
-	<table class="noborder centpercent">

+	<table class="noborder">

@@ -163 +166 @@
-		<?php for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) : ?>

+		<?php for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++): ?>

@@ -176,9 +179 @@
-					<?php

-					$return = array();

-					for ($j = 1; $j < $i; $j++) {

-						$return[$j] = $price_options[$j];

-					}

-					$texttoshow = $langs->trans('PercentVariationOver', '{s1}');

-					$texttoshow = str_replace('{s1}', Form::selectarray("fk_level[$i]", $return, (isset($rules[$i]) ? $rules[$i]->fk_level : null)), $texttoshow);

-					print $texttoshow;

-					?>

+					<?php echo $langs->trans('PercentVariationOver', Form::selectarray("fk_level[$i]", $genPriceOptions($i), (isset($rules[$i]) ? $rules[$i]->fk_level : null))) ?>

@@ -196 +191 @@
-print dol_get_fiche_end();

+dol_fiche_end();

@@ -199 +194 @@
-		<input type="submit" value="'.$langs->trans("Save").'" class="button button-save">

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

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_product.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_product.php
@@ -33 +32,0 @@
-// Load Dolibarr environment

@@ -44 +43 @@
-if (!$user->admin || (!isModEnabled("product") && !isModEnabled("service"))) {

+if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))

@@ -46,3 +45,2 @@
-}

-

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

+

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

@@ -50,2 +47,0 @@
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php

-

@@ -63,3 +59 @@
-if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || !empty($conf->global->$keyforparam)) {

-	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice

-}

+if ($conf->global->MAIN_FEATURES_LEVEL >= 1 || !empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice

@@ -67,3 +61 @@
-if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 || !empty($conf->global->$keyforparam)) {

-	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'] = $langs->trans('MultiPricesAbility').'+'.$langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')';

-}

+if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'] = $langs->trans('MultiPricesAbility').'+'.$langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')';

@@ -72 +64 @@
-if (getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {

+if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) {

@@ -86,2 +78,4 @@
-if ($action == 'setcodeproduct') {

-	if (dolibarr_set_const($db, "PRODUCT_CODEPRODUCT_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0) {

+if ($action == 'setcodeproduct')

+{

+	if (dolibarr_set_const($db, "PRODUCT_CODEPRODUCT_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0)

+	{

@@ -90 +84,3 @@
-	} else {

+	}

+	else

+	{

@@ -95 +91,2 @@
-if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0) {

+if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0)

+{

@@ -97,5 +94,4 @@
-	if (!($res > 0)) {

-		$error++;

-	}

-}

-if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0) {

+	if (!$res > 0) $error++;

+}

+if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0)

+{

@@ -103,5 +99,4 @@
-	if (!($res > 0)) {

-		$error++;

-	}

-}

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

+	if (!$res > 0) $error++;

+}

+if ($action == 'other')

+{

@@ -109,3 +104,6 @@
-	foreach ($select_pricing_rules as $tmprule => $tmplabel) { // Loop on each possible mode

-		if ($tmprule == $princingrules) { // We are on selected rule, we enable it

-			if ($princingrules == 'PRODUCT_PRICE_UNIQ') { // For this case, we disable entries manually

+	foreach ($select_pricing_rules as $rule=>$label) // Loop on each possible mode

+	{

+		if ($rule == $princingrules) // We are on selected rule, we enable it

+		{

+			if ($princingrules == 'PRODUCT_PRICE_UNIQ') // For this case, we disable entries manually

+			{

@@ -116 +114,3 @@
-			} else {

+			}

+			else

+			{

@@ -118 +118,2 @@
-				foreach ($multirule as $rulesselected) {

+				foreach ($multirule as $rulesselected)

+				{

@@ -122,3 +123,5 @@
-		} else { // We clear this mode

-			if (strpos($tmprule, '&') === false) {

-				$res = dolibarr_set_const($db, $tmprule, 0, 'chaine', 0, '', $conf->entity);

+		}

+		else	// We clear this mode

+		{

+			if (strpos($rule, '&') === false) {

+				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);

@@ -129,7 +132,4 @@
-	$value = GETPOST('price_base_type', 'alpha');

-	$res = dolibarr_set_const($db, "PRODUCT_PRICE_BASE_TYPE", $value, 'chaine', 0, '', $conf->entity);

-

-	/*$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');

-	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);*/

-

-	$value = GETPOST('PRODUIT_DESC_IN_FORM', 'alpha');

+	$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');

+	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);

+

+	$value = GETPOST('activate_viewProdDescInForm', 'alpha');

@@ -147,16 +147,28 @@
-	$value = GETPOST('activate_FillProductDescAuto', 'alpha');

-	$res = dolibarr_set_const($db, "PRODUIT_AUTOFILL_DESC", $value, 'chaine', 0, '', $conf->entity);

-

-	if (GETPOSTISSET('PRODUIT_FOURN_TEXTS')) {

-		$value = GETPOST('PRODUIT_FOURN_TEXTS', 'alpha');

-		$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);

-	}

-

-	if (GETPOSTISSET('PRODUCT_USE_SUPPLIER_PACKAGING')) {

-		$value = GETPOST('PRODUCT_USE_SUPPLIER_PACKAGING', 'alpha');

-		$res = dolibarr_set_const($db, "PRODUCT_USE_SUPPLIER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);

-	}

-}

-

-

-if ($action == 'specimen') { // For products

+	$value = GETPOST('activate_useProdFournDesc', 'alpha');

+	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);

+

+	if ($value) {

+	    $sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";

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

+	    if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') // if the field does not exist, we create it

+	    {

+	        $sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN desc_fourn text";

+	        $resql_new = $db->query($sql_new);

+	    }

+	}

+

+	$value = GETPOST('activate_useProdSupplierPackaging', 'alpha');

+	$res = dolibarr_set_const($db, "PRODUCT_USE_SUPPLIER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);

+	if ($value) {

+		$sql_test = "SELECT count(packaging) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";

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

+		if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') // if the field does not exist, we create it

+		{

+			$sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN packaging double(24,8) DEFAULT 1";

+			$resql_new = $db->query($sql_new);

+		}

+	}

+}

+

+if ($action == 'specimen') // For products

+{

@@ -169,3 +181 @@
-	$file = '';

-	$classname = '';

-	$filefound = 0;

+	$file = ''; $classname = ''; $filefound = 0;

@@ -173,3 +183,5 @@
-	foreach ($dirmodels as $reldir) {

-		$file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);

-		if (file_exists($file)) {

+	foreach ($dirmodels as $reldir)

+	{

+	    $file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);

+		if (file_exists($file))

+		{

@@ -182 +194,2 @@
-	if ($filefound) {

+	if ($filefound)

+	{

@@ -187 +200,2 @@
-		if ($module->write_file($product, $langs, '') > 0) {

+		if ($module->write_file($product, $langs, '') > 0)

+		{

@@ -190 +204,3 @@
-		} else {

+		}

+		else

+		{

@@ -194 +210,3 @@
-	} else {

+	}

+	else

+	{

@@ -201 +219,2 @@
-if ($action == 'set') {

+if ($action == 'set')

+{

@@ -205 +224,2 @@
-if ($action == 'del') {

+if ($action == 'del')

+{

@@ -207,4 +227,3 @@
-	if ($ret > 0) {

-		if (getDolGlobalString('PRODUCT_ADDON_PDF') == "$value") {

-			dolibarr_del_const($db, 'PRODUCT_ADDON_PDF', $conf->entity);

-		}

+	if ($ret > 0)

+	{

+		if ($conf->global->PRODUCT_ADDON_PDF == "$value") dolibarr_del_const($db, 'PRODUCT_ADDON_PDF', $conf->entity);

@@ -215,2 +234,4 @@
-if ($action == 'setdoc') {

-	if (dolibarr_set_const($db, "PRODUCT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {

+if ($action == 'setdoc')

+{

+	if (dolibarr_set_const($db, "PRODUCT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))

+	{

@@ -224 +245,2 @@
-	if ($ret > 0) {

+	if ($ret > 0)

+	{

@@ -230 +252,2 @@
-if ($action == 'set') {

+if ($action == 'set')

+{

@@ -233,33 +256,22 @@
-	if (GETPOST('value', 'alpha')) {

-		$res = dolibarr_set_const($db, $const, $value, 'chaine', 0, '', $conf->entity);

-	} else {

-		$res = dolibarr_del_const($db, $const, $conf->entity);

-	}

-	if (!($res > 0)) {

-		$error++;

-	}

-}

-

-// To enable a constant whithout javascript

-if (preg_match('/set_(.+)/', $action, $reg)) {

-	$keyforvar = $reg[1];

-	if ($keyforvar) {

-		$value = 1;

-		$res = dolibarr_set_const($db, $keyforvar, $value, 'chaine', 0, '', $conf->entity);

-	}

-}

-

-// To disable a constant whithout javascript

-if (preg_match('/del_(.+)/', $action, $reg)) {

-	$keyforvar = $reg[1];

-	if ($keyforvar) {

-		$res = dolibarr_del_const($db, $keyforvar, $conf->entity);

-	}

-}

-

-if ($action) {

-	if (!$error) {

-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

-	} else {

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

-	}

+	if (GETPOST('value', 'alpha')) $res = dolibarr_set_const($db, $const, $value, 'chaine', 0, '', $conf->entity);

+	else $res = dolibarr_del_const($db, $const, $conf->entity);

+	if (!$res > 0) $error++;

+}

+

+//if ($action == 'other')

+//{

+//    $value = GETPOST('activate_units', 'alpha');

+//    $res = dolibarr_set_const($db, "PRODUCT_USE_UNITS", $value, 'chaine', 0, '', $conf->entity);

+//	if (! $res > 0) $error++;

+//}

+

+if ($action)

+{

+    if (!$error)

+    {

+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

+    }

+    else

+    {

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

+    }

@@ -276 +288,2 @@
-if (!isModEnabled("product")) {

+if (empty($conf->product->enabled))

+{

@@ -279 +292,3 @@
-} elseif (!isModEnabled("service")) {

+}

+elseif (empty($conf->service->enabled))

+{

@@ -290 +305 @@
-print dol_get_fiche_head($head, 'general', $tab, -1, 'product');

+dol_fiche_head($head, 'general', $tab, -1, 'product');

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

@@ -307 +321 @@
-print '  <td class="center"></td>';

+print '  <td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';

@@ -310 +324,3 @@
-foreach ($dirproduct as $dirroot) {

+$var = true;

+foreach ($dirproduct as $dirroot)

+{

@@ -313,57 +329,57 @@
-	$handle = @opendir($dir);

-	if (is_resource($handle)) {

-		// Loop on each module find in opened directory

-		while (($file = readdir($handle)) !== false) {

-			if (substr($file, 0, 16) == 'mod_codeproduct_' && substr($file, -3) == 'php') {

-				$file = substr($file, 0, dol_strlen($file) - 4);

-

-				try {

-					dol_include_once($dirroot.$file.'.php');

-				} catch (Exception $e) {

-					dol_syslog($e->getMessage(), LOG_ERR);

-				}

-

-				$modCodeProduct = new $file();

-

-				// Show modules according to features level

-				if ($modCodeProduct->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {

-					continue;

-				}

-				if ($modCodeProduct->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {

-					continue;

-				}

-

-				print '<tr class="oddeven">'."\n";

-				print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";

-				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";

-				print '<td class="nowrap"><span class="opacitymedium">'.$modCodeProduct->getExample($langs).'</span></td>'."\n";

-

-				if (getDolGlobalString('PRODUCT_CODEPRODUCT_ADDON') && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file) {

-					print '<td class="center">'."\n";

-					print img_picto($langs->trans("Activated"), 'switch_on');

-					print "</td>\n";

-				} else {

-					$disabled = false;

-					if (isModEnabled('multicompany') && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true) {

-					}

-					print '<td class="center">';

-					if (!$disabled) {

-						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&token='.newToken().'&value='.urlencode($file).'">';

-					}

-					print img_picto($langs->trans("Disabled"), 'switch_off');

-					if (!$disabled) {

-						print '</a>';

-					}

-					print '</td>';

-				}

-

-				print '<td class="center">';

-				$s = $modCodeProduct->getToolTip($langs, null, -1);

-				print $form->textwithpicto('', $s, 1);

-				print '</td>';

-

-				print '</tr>';

-			}

-		}

-		closedir($handle);

-	}

+    $handle = @opendir($dir);

+    if (is_resource($handle))

+    {

+    	// Loop on each module find in opened directory

+    	while (($file = readdir($handle)) !== false)

+    	{

+    		if (substr($file, 0, 16) == 'mod_codeproduct_' && substr($file, -3) == 'php')

+    		{

+    			$file = substr($file, 0, dol_strlen($file) - 4);

+

+    			try {

+        			dol_include_once($dirroot.$file.'.php');

+    			}

+    			catch (Exception $e)

+    			{

+    			    dol_syslog($e->getMessage(), LOG_ERR);

+    			}

+

+    			$modCodeProduct = new $file;

+

+    			// Show modules according to features level

+    			if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;

+    			if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;

+

+    			$var = !$var;

+    			print '<tr class="oddeven">'."\n";

+    			print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";

+    			print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";

+    			print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";

+

+    			if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file)

+    			{

+    				print '<td class="center">'."\n";

+    				print img_picto($langs->trans("Activated"), 'switch_on');

+    				print "</td>\n";

+    			}

+    			else

+    			{

+    				$disabled = false;

+    				if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true);

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

+    				if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeproduct&value='.$file.'">';

+    				print img_picto($langs->trans("Disabled"), 'switch_off');

+    				if (!$disabled) print '</a>';

+    				print '</td>';

+    			}

+

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

+    			$s = $modCodeProduct->getToolTip($langs, null, -1);

+    			print $form->textwithpicto('', $s, 1);

+    			print '</td>';

+

+    			print '</tr>';

+    		}

+    	}

+    	closedir($handle);

+    }

@@ -372 +387,0 @@
-print '</div>';

@@ -378 +393 @@
-$sql .= " WHERE type = '".$db->escape($type)."'";

+$sql .= " WHERE type = '".$type."'";

@@ -381 +396,2 @@
-if ($resql) {

+if ($resql)

+{

@@ -384 +400,2 @@
-	while ($i < $num_rows) {

+	while ($i < $num_rows)

+	{

@@ -389 +406,3 @@
-} else {

+}

+else

+{

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

@@ -404 +422 @@
-print '<td class="center"></td>';

+print '<td class="center" width="80">'.$langs->trans("ShortInfo").'</td>';

@@ -410,61 +428,69 @@
-foreach ($dirmodels as $reldir) {

-	foreach (array('', '/doc') as $valdir) {

-		$dir = dol_buildpath($reldir."core/modules/product".$valdir);

-		if (is_dir($dir)) {

-			$handle = opendir($dir);

-			if (is_resource($handle)) {

-				while (($file = readdir($handle)) !== false) {

-					$filelist[] = $file;

-				}

-				closedir($handle);

-				arsort($filelist);

-

-				foreach ($filelist as $file) {

-					if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {

-						if (file_exists($dir.'/'.$file)) {

-							$name = substr($file, 4, dol_strlen($file) - 16);

-							$classname = substr($file, 0, dol_strlen($file) - 12);

-

-							require_once $dir.'/'.$file;

-							$module = new $classname($db);

-

-							$modulequalified = 1;

-							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {

-								$modulequalified = 0;

-							}

-							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {

-								$modulequalified = 0;

-							}

-

-							if ($modulequalified) {

-								print '<tr class="oddeven"><td width="100">';

-								print(empty($module->name) ? $name : $module->name);

-								print "</td><td>\n";

-								if (method_exists($module, 'info')) {

-									print $module->info($langs);

-								} else {

-									print $module->description;

-								}

-								print '</td>';

-

-								// Active

-								if (in_array($name, $def)) {

-									print '<td class="center">'."\n";

-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';

-									print img_picto($langs->trans("Enabled"), 'switch_on');

-									print '</a>';

-									print '</td>';

-								} else {

-									print '<td class="center">'."\n";

-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';

-									print "</td>";

-								}

-

-								// Defaut

-								print '<td class="center">';

-								if (getDolGlobalString('PRODUCT_ADDON_PDF') == $name) {

-									print img_picto($langs->trans("Default"), 'on');

-								} else {

-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

-								}

-								print '</td>';

+foreach ($dirmodels as $reldir)

+{

+    foreach (array('', '/doc') as $valdir)

+    {

+    	$dir = dol_buildpath($reldir."core/modules/product".$valdir);

+        if (is_dir($dir))

+        {

+            $handle = opendir($dir);

+            if (is_resource($handle))

+            {

+                while (($file = readdir($handle)) !== false)

+                {

+                    $filelist[] = $file;

+                }

+                closedir($handle);

+                arsort($filelist);

+

+                foreach ($filelist as $file)

+                {

+                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))

+                    {

+                    	if (file_exists($dir.'/'.$file))

+                    	{

+                    		$name = substr($file, 4, dol_strlen($file) - 16);

+	                        $classname = substr($file, 0, dol_strlen($file) - 12);

+

+	                        require_once $dir.'/'.$file;

+	                        $module = new $classname($db);

+

+	                        $modulequalified = 1;

+	                        if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;

+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;

+

+	                        if ($modulequalified)

+	                        {

+	                            print '<tr class="oddeven"><td width="100">';

+	                            print (empty($module->name) ? $name : $module->name);

+	                            print "</td><td>\n";

+	                            if (method_exists($module, 'info')) print $module->info($langs);

+	                            else print $module->description;

+	                            print '</td>';

+

+	                            // Active

+	                            if (in_array($name, $def))

+	                            {

+	                            	print '<td class="center">'."\n";

+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';

+	                            	print img_picto($langs->trans("Enabled"), 'switch_on');

+	                            	print '</a>';

+	                            	print '</td>';

+	                            }

+	                            else

+	                            {

+	                                print '<td class="center">'."\n";

+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';

+	                                print "</td>";

+	                            }

+

+	                            // Defaut

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

+	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)

+	                            {

+	                                print img_picto($langs->trans("Default"), 'on');

+	                            }

+	                            else

+	                            {

+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';

+	                            }

+	                            print '</td>';

@@ -473,31 +499,35 @@
-								$htmltooltip = ''.$langs->trans("Name").': '.$module->name;

-								$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));

-								if ($module->type == 'pdf') {

-									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;

-								}

-								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';

-								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);

-								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);

-

-

-								print '<td class="center">';

-								print $form->textwithpicto('', $htmltooltip, 1, 0);

-								print '</td>';

-

-								// Preview

-								print '<td class="center">';

-								if ($module->type == 'pdf') {

-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';

-								} else {

-									print img_object($langs->trans("PreviewNotAvailable"), 'generic');

-								}

-								print '</td>';

-

-								print "</tr>\n";

-							}

-						}

-					}

-				}

-			}

-		}

-	}

+		    					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;

+					    		$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));

+			                    if ($module->type == 'pdf')

+			                    {

+			                        $htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;

+			                    }

+					    		$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';

+					    		$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);

+					    		$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);

+

+

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

+	                            print $form->textwithpicto('', $htmltooltip, 1, 0);

+	                            print '</td>';

+

+	                            // Preview

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

+	                            if ($module->type == 'pdf')

+	                            {

+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';

+	                            }

+	                            else

+	                            {

+	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');

+	                            }

+	                            print '</td>';

+

+	                            print "</tr>\n";

+	                        }

+                    	}

+                    }

+                }

+            }

+        }

+    }

@@ -507,2 +536,0 @@
-print '</div>';

-

@@ -515,0 +544,2 @@
+

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

@@ -523,5 +552,0 @@
-

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

-

-

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

@@ -535 +560,41 @@
-// Enable kits (subproducts)

+/*

+ * Other parameters

+ */

+

+$rowspan = 4;

+if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $rowspan++;

+if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) $rowspan++;

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

+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled)) $rowspan++;

+

+

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

+if (empty($conf->multicompany->enabled))

+{

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

+}

+else

+{

+	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';

+}

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

+$current_rule = 'PRODUCT_PRICE_UNIQ';

+if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule = 'PRODUIT_MULTIPRICES';

+if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';

+if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES';

+if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';

+print $form->selectarray("princingrule", $select_pricing_rules, $current_rule);

+print '</td>';

+print '</tr>';

+

+

+// multiprix nombre de prix a proposer

+if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

+{

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

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

+	print '<td class="right"><input size="3" type="text" class="flat" name="value_PRODUIT_MULTIPRICES_LIMIT" value="'.$conf->global->PRODUIT_MULTIPRICES_LIMIT.'"></td>';

+	print '</tr>';

+}

+

+// sousproduits activation/desactivation

@@ -539,3 +604,2 @@
-print '<td class="right">';

-print ajax_constantonoff("PRODUIT_SOUSPRODUITS", array(), $conf->entity, 0, 0, 1, 0);

-//print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);

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

+print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);

@@ -545,98 +609 @@
-

-// Enable variants

-

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

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

-print '<td class="right">';

-//print ajax_constantonoff("PRODUIT_SOUSPRODUITS", array(), $conf->entity, 0, 0, 1, 0);

-//print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);

-if (!isModEnabled('variants')) {

-	print '<span class="opacitymedium">'.$langs->trans("ModuleMustBeEnabled", $langs->transnoentitiesnoconv("Module610Name")).'</span>';

-} else {

-	print yn(1).' <span class="opacitymedium">('.$langs->trans("ModuleIsEnabled", $langs->transnoentitiesnoconv("Module610Name")).')</span>';

-}

-print '</td>';

-print '</tr>';

-

-

-// Rule for price

-

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

-if (!isModEnabled('multicompany')) {

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

-} else {

-	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';

-}

-print '<td class="right">';

-$current_rule = 'PRODUCT_PRICE_UNIQ';

-if (getDolGlobalString('PRODUIT_MULTIPRICES')) {

-	$current_rule = 'PRODUIT_MULTIPRICES';

-}

-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY')) {

-	$current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';

-}

-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {

-	$current_rule = 'PRODUIT_CUSTOMER_PRICES';

-}

-if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {

-	$current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';

-}

-print $form->selectarray("princingrule", $select_pricing_rules, $current_rule, 0, 0, 0, '', 1, 0, 0, '', 'maxwidth400', 1);

-print '</td>';

-print '</tr>';

-

-

-// multiprix nombre de prix a proposer

-if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {

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

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

-	print '<td class="right"><input size="3" type="text" class="flat right" name="value_PRODUIT_MULTIPRICES_LIMIT" value="' . getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT').'"></td>';

-	print '</tr>';

-}

-

-// Default product price base type

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

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

-print '<td class="right">';

-print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");

-print '</td>';

-print '</tr>';

-

-// Use conditionnement in buying

-if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {

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

-	print '<td>'.$form->textwithpicto($langs->trans("UseProductSupplierPackaging"), $langs->trans("PackagingForThisProductDesc")).'</td>';

-	print '<td align="right">';

-	print ajax_constantonoff("PRODUCT_USE_SUPPLIER_PACKAGING", array(), $conf->entity, 0, 0, 0, 0);

-	//print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);

-	print '</td>';

-	print '</tr>';

-

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

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

-	print '<td class="right">';

-	print ajax_constantonoff("PRODUIT_FOURN_TEXTS", array(), $conf->entity, 0, 0, 0, 0);

-	//print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);

-	print '</td>';

-	print '</tr>';

-}

-

-print '</table>';

-print '</div>';

-

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

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

-print '</div>';

-

-

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

-

-

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

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

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

-print '<td>'.$langs->trans("Parameters").'</td>'."\n";

-print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";

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

-

-// Use Ajax form to select a product

+// Utilisation formulaire Ajax sur choix produit

@@ -646,2 +613,3 @@
-if (empty($conf->use_javascript_ajax)) {

-	print '<td class="nowrap right">';

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

+{

+	print '<td class="nowrap right" colspan="2">';

@@ -650,2 +618,4 @@
-} else {

-	print '<td class="right">';

+}

+else

+{

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

@@ -655,2 +625,2 @@
-		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',

-		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',

+	    '2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',

+	    '3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',

@@ -663 +633,2 @@
-if (!getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {

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

+{

@@ -666 +637 @@
-	print '<td class="right"><input size="3" type="text" class="flat" name="value_PRODUIT_LIMIT_SIZE" value="' . getDolGlobalString('PRODUIT_LIMIT_SIZE').'"></td>';

+	print '<td class="right"><input size="3" type="text" class="flat" name="value_PRODUIT_LIMIT_SIZE" value="'.$conf->global->PRODUIT_LIMIT_SIZE.'"></td>';

@@ -669,23 +639,0 @@
-

-// Do Not Add Product description on add lines

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

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

-print '<td class="right">';

-print '<!-- PRODUIT_AUTOFILL_DESC -->';

-print $form->selectarray(

-	"activate_FillProductDescAuto",

-	array(0=>'DoNotAutofillButAutoConcat', 1=>'AutoFillFormFieldBeforeSubmit', 2=>'DoNotUseDescriptionOfProdut'),

-	!getDolGlobalString('PRODUIT_AUTOFILL_DESC') ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,

-	0,

-	0,

-	0,

-	'',

-	1,

-	0,

-	0,

-	'',

-	'minwidth100imp maxwidth400',

-	1

-);

-print '</td>';

-print '</tr>';

@@ -696,3 +644,2 @@
-print '<td class="right">';

-$arrayofchoices = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes").' ('.$langs->trans("DesktopsOnly").')', '2' => $langs->trans("Yes").' ('.$langs->trans("DesktopsAndSmartphones").')');

-print $form->selectarray("PRODUIT_DESC_IN_FORM", $arrayofchoices, getDolGlobalInt('PRODUIT_DESC_IN_FORM'), 0);

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

+print $form->selectyesno("activate_viewProdDescInForm", $conf->global->PRODUIT_DESC_IN_FORM, 1);

@@ -707 +654 @@
-print '<td class="right">';

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

@@ -718 +665 @@
-print '<td class="right">';

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

@@ -725 +672,2 @@
-if (getDolGlobalInt('MAIN_MULTILANGS')) {

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

+{

@@ -728,2 +676,2 @@
-	print '<td class="right">';

-	print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') ? $conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE : 0), 1);

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

+	print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) ? $conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE : 0), 1);

@@ -734,2 +682,20 @@
-

-if (getDolGlobalString('PRODUCT_CANVAS_ABILITY')) {

+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled) || ! empty($conf->supplier_invoice->enabled))

+{

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

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

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

+    print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);

+    print '</td>';

+    print '</tr>';

+

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

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

+	print '<td width="60" align="right">';

+	print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);

+	print '</td>';

+	print '</tr>';

+}

+

+

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

+{

@@ -741,4 +707,5 @@
-	print '<td class="right">'.$langs->trans("Value").'</td>'."\n";

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

-

-	if (is_dir($dir)) {

+	print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";

+	print '<td width="80">&nbsp;</td></tr>'."\n";

+

+	if (is_dir($dir))

+	{

@@ -748,36 +715,45 @@
-		if (is_resource($handle)) {

-			while (($file = readdir($handle)) !== false) {

-				if (file_exists($dir.$file.'/product.'.$file.'.class.php')) {

-					$classfile = $dir.$file.'/product.'.$file.'.class.php';

-					$classname = 'Product'.ucfirst($file);

-

-					require_once $classfile;

-					$object = new $classname();

-

-					$module = $object->module;

-

-					if ($conf->$module->enabled) {

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

-

-						print $object->description;

-

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

-

-						$const = "PRODUCT_SPECIAL_".strtoupper($file);

-

-						if (getDolGlobalString($const)) {

-							print img_picto($langs->trans("Active"), 'tick');

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

-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&spe='.urlencode($file).'&value=0">'.$langs->trans("Disable").'</a>';

-						} else {

-							print '&nbsp;</td><td class="right">';

-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&spe='.urlencode($file).'&value=1">'.$langs->trans("Activate").'</a>';

-						}

-

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

-					}

-				}

-			}

-			closedir($handle);

-		}

-	} else {

+        if (is_resource($handle))

+        {

+    		while (($file = readdir($handle)) !== false)

+    		{

+    			if (file_exists($dir.$file.'/product.'.$file.'.class.php'))

+    			{

+    				$classfile = $dir.$file.'/product.'.$file.'.class.php';

+    				$classname = 'Product'.ucfirst($file);

+

+    				require_once $classfile;

+    				$object = new $classname();

+

+    				$module = $object->module;

+

+    				if ($conf->$module->enabled)

+    				{

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

+

+    					print $object->description;

+

+    					print '</td><td class="right">';

+

+    					$const = "PRODUCT_SPECIAL_".strtoupper($file);

+

+    					if ($conf->global->$const)

+    					{

+    						print img_picto($langs->trans("Active"), 'tick');

+    						print '</td><td class="right">';

+    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=0">'.$langs->trans("Disable").'</a>';

+    					}

+    					else

+    					{

+    						print '&nbsp;</td><td class="right">';

+    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=1">'.$langs->trans("Activate").'</a>';

+    					}

+

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

+    				}

+    			}

+    		}

+		    closedir($handle);

+        }

+	}

+	else

+	{

@@ -789 +764,0 @@
-print '</div>';

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_product_extrafields.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_product_extrafields.php
@@ -28 +27,0 @@
-// Load Dolibarr environment

@@ -42,3 +41 @@
-foreach ($tmptype2label as $key => $val) {

-	$type2label[$key] = $langs->transnoentitiesnoconv($val);

-}

+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);

@@ -46 +43 @@
-$action = GETPOST('action', 'aZ09');

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

@@ -50,3 +47 @@
-if (!$user->admin) {

-	accessforbidden();

-}

+if (!$user->admin) accessforbidden();

@@ -68,2 +63,3 @@
-$textobject = $langs->transnoentitiesnoconv("ProductsAndServices");

-if (!isModEnabled("product")) {

+$textobject = $langs->trans("ProductsAndServices");

+if (empty($conf->product->enabled))

+{

@@ -72 +68,3 @@
-} elseif (!isModEnabled("service")) {

+}

+elseif (empty($conf->service->enabled))

+{

@@ -88 +86 @@
-print dol_get_fiche_head($head, 'attributes', $textobject, -1, 'product');

+dol_fiche_head($head, 'attributes', $textobject, -1, 'product');

@@ -92 +90 @@
-print dol_get_fiche_end();

+dol_fiche_end();

@@ -95,2 +93,17 @@
-// Creation of an optional field

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

+// Buttons

+if ($action != 'create' && $action != 'edit')

+{

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

+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";

+    print "</div>";

+}

+

+

+/* ************************************************************************** */

+/*                                                                            */

+/* Creation of an optional field											  */

+/*                                                                            */

+/* ************************************************************************** */

+

+if ($action == 'create')

+{

@@ -100 +113 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

@@ -103,4 +116,9 @@
-// Edition of an optional field

-if ($action == 'edit' && !empty($attrname)) {

-	print "<br>";

-	print load_fiche_titre($langs->trans("FieldEdition", $attrname));

+/* ************************************************************************** */

+/*                                                                            */

+/* Edition of an optional field                                               */

+/*                                                                            */

+/* ************************************************************************** */

+if ($action == 'edit' && !empty($attrname))

+{

+    print "<br>";

+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));

@@ -108 +126 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_product_lot_extrafields.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_product_lot_extrafields.php
@@ -28 +27,0 @@
-// Load Dolibarr environment

@@ -42,3 +41 @@
-foreach ($tmptype2label as $key => $val) {

-	$type2label[$key] = $langs->transnoentitiesnoconv($val);

-}

+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);

@@ -46 +43 @@
-$action = GETPOST('action', 'aZ09');

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

@@ -50,3 +47 @@
-if (!$user->admin) {

-	accessforbidden();

-}

+if (!$user->admin) accessforbidden();

@@ -68 +63 @@
-$textobject = $langs->transnoentitiesnoconv("Batch");

+$textobject = $langs->trans("Batch");

@@ -81 +76 @@
-print dol_get_fiche_head($head, 'attributes', $textobject, -1, 'lot');

+dol_fiche_head($head, 'attributes', $textobject, -1, 'stock');

@@ -85 +80 @@
-print dol_get_fiche_end();

+dol_fiche_end();

@@ -88,2 +83,17 @@
-// Creation of an optional field

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

+// Buttons

+if ($action != 'create' && $action != 'edit')

+{

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

+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";

+    print "</div>";

+}

+

+

+/* ************************************************************************** */

+/*                                                                            */

+/* Creation of an optional field											  */

+/*                                                                            */

+/* ************************************************************************** */

+

+if ($action == 'create')

+{

@@ -93 +103 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

@@ -96,4 +106,9 @@
-// Edition of an optional field

-if ($action == 'edit' && !empty($attrname)) {

-	print "<br>";

-	print load_fiche_titre($langs->trans("FieldEdition", $attrname));

+/* ************************************************************************** */

+/*                                                                            */

+/* Edition of an optional field                                               */

+/*                                                                            */

+/* ************************************************************************** */

+if ($action == 'edit' && !empty($attrname))

+{

+    print "<br>";

+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));

@@ -101 +116 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_product_supplier_extrafields.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_product_supplier_extrafields.php
@@ -20 +20 @@
- * along with this program. If not, see <https://www.gnu.org/licenses/>.

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

@@ -29 +28,0 @@
-// Load Dolibarr environment

@@ -43,3 +42 @@
-foreach ($tmptype2label as $key => $val) {

-	$type2label[$key] = $langs->transnoentitiesnoconv($val);

-}

+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);

@@ -47 +44 @@
-$action = GETPOST('action', 'aZ09');

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

@@ -51,3 +48 @@
-if (!$user->admin) {

-	accessforbidden();

-}

+if (!$user->admin) accessforbidden();

@@ -69,2 +64,3 @@
-$textobject = $langs->transnoentitiesnoconv("ProductsAndServices");

-if (!isModEnabled("product")) {

+$textobject = $langs->trans("ProductsAndServices");

+if (empty($conf->product->enabled))

+{

@@ -73 +69,3 @@
-} elseif (!isModEnabled("service")) {

+}

+elseif (empty($conf->service->enabled))

+{

@@ -89 +87 @@
-print dol_get_fiche_head($head, 'supplierAttributes', $textobject, -1, 'product');

+dol_fiche_head($head, 'supplierAttributes', $textobject, -1, 'product');

@@ -93 +91 @@
-print dol_get_fiche_end();

+dol_fiche_end();

@@ -96,2 +94,17 @@
-// Creation of an optional field

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

+// Buttons

+if ($action != 'create' && $action != 'edit')

+{

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

+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";

+    print "</div>";

+}

+

+

+/* ************************************************************************** */

+/*                                                                            */

+/* Creation of an optional field											  */

+/*                                                                            */

+/* ************************************************************************** */

+

+if ($action == 'create')

+{

@@ -101 +114 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

@@ -104,4 +117,9 @@
-// Edition of an optional field

-if ($action == 'edit' && !empty($attrname)) {

-	print "<br>";

-	print load_fiche_titre($langs->trans("FieldEdition", $attrname));

+/* ************************************************************************** */

+/*                                                                            */

+/* Edition of an optional field                                               */

+/*                                                                            */

+/* ************************************************************************** */

+if ($action == 'edit' && !empty($attrname))

+{

+    print "<br>";

+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));

@@ -109 +127 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_product_tools.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_product_tools.php
@@ -28 +27,0 @@
-// Load Dolibarr environment

@@ -39,5 +38,3 @@
-if (!$user->admin) {

-	accessforbidden();

-}

-

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

+if (!$user->admin) accessforbidden();

+

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

@@ -54 +51,2 @@
-if ($action == 'convert') {

+if ($action == 'convert')

+{

@@ -57 +55,2 @@
-	if ($oldvatrate == $newvatrate) {

+	if ($oldvatrate == $newvatrate)

+	{

@@ -63 +62,2 @@
-	if (!$error) {

+	if (!$error)

+	{

@@ -72 +72,2 @@
-		if (preg_match('/\((.*)\)/', $oldvatrate, $reg)) {

+		if (preg_match('/\((.*)\)/', $oldvatrate, $reg))

+		{

@@ -75,3 +76 @@
-		} else {

-			$oldvatrateclean = $oldvatrate;

-		}

+		} else $oldvatrateclean = $oldvatrate;

@@ -81 +80,2 @@
-		if (preg_match('/\((.*)\)/', $newvatrate, $reg)) {

+		if (preg_match('/\((.*)\)/', $newvatrate, $reg))

+		{

@@ -84,3 +84 @@
-		} else {

-			$newvatrateclean = $newvatrate;

-		}

+		} else $newvatrateclean = $newvatrate;

@@ -89 +87,2 @@
-		if ($country_id == $mysoc->country_id) {

+		if ($country_id == $mysoc->country_id)

+		{

@@ -94,5 +93,2 @@
-			if ($vat_src_code_old) {

-				$sql .= " AND default_vat_code = '".$db->escape($vat_src_code_old)."'";

-			} else {

-				" AND default_vat_code = IS NULL";

-			}

+			if ($vat_src_code_old) $sql .= " AND default_vat_code = '".$vat_src_code_old."'";

+			else " AND default_vat_code = IS NULL";

@@ -101 +97,2 @@
-			if ($resql) {

+			if ($resql)

+			{

@@ -105 +102,2 @@
-				while ($i < $num) {

+				while ($i < $num)

+				{

@@ -110,4 +108,3 @@
-					if ($ret > 0) {

-						$ret = 0;

-						$retm = 0;

-						$updatelevel1 = false;

+					if ($ret > 0)

+					{

+						$ret = 0; $retm = 0; $updatelevel1 = false;

@@ -117 +114,2 @@
-						foreach ($listofmulti as $level => $multiprices) {

+						foreach ($listofmulti as $level => $multiprices)

+						{

@@ -119,5 +117,4 @@
-							if (empty($price_base_type)) {

-								continue; // Discard not defined price levels

-							}

-

-							if ($price_base_type == 'TTC') {

+							if (empty($price_base_type)) continue; // Discard not defined price levels

+

+							if ($price_base_type == 'TTC')

+							{

@@ -126 +123,3 @@
-							} else {

+							}

+							else

+							{

@@ -130,3 +129 @@
-							if ($newminprice > $newprice) {

-								$newminprice = $newprice;

-							}

+							if ($newminprice > $newprice) $newminprice = $newprice;

@@ -142 +139,2 @@
-							if ($retm < 0) {

+							if ($retm < 0)

+							{

@@ -147,3 +145 @@
-							if ($newlevel == 1) {

-								$updatelevel1 = true;

-							}

+							if ($newlevel == 1) $updatelevel1 = true;

@@ -154 +150,2 @@
-						if ($price_base_type == 'TTC') {

+						if ($price_base_type == 'TTC')

+						{

@@ -157 +154,3 @@
-						} else {

+						}

+						else

+						{

@@ -161,3 +160 @@
-						if ($newminprice > $newprice) {

-							$newminprice = $newprice;

-						}

+						if ($newminprice > $newprice) $newminprice = $newprice;

@@ -166 +163 @@
-						$newnpr = $objectstatic->tva_npr;

+						$newnpr = $objectstatic->recuperableonly;

@@ -169 +166,2 @@
-						if (!empty($price_base_type) && !$updatelevel1) {

+						if (!empty($price_base_type) && !$updatelevel1)

+						{

@@ -174,5 +172,2 @@
-						if ($ret < 0 || $retm < 0) {

-							$error++;

-						} else {

-							$nbrecordsmodified++;

-						}

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

+						else $nbrecordsmodified++;

@@ -180 +175 @@
-					unset($objectstatic);

+                    unset($objectstatic);

@@ -184,2 +178,0 @@
-			} else {

-				dol_print_error($db);

@@ -186,0 +180 @@
+			else dol_print_error($db);

@@ -196,6 +190,3 @@
-		if ($vat_src_code_old) {

-			$sql .= " AND default_vat_code = '".$db->escape($vat_src_code_old)."'";

-		} else {

-			" AND default_vat_code = IS NULL";

-		}

-		$sql .= " AND s.fk_pays = ".((int) $country_id);

+		if ($vat_src_code_old) $sql .= " AND default_vat_code = '".$vat_src_code_old."'";

+		else " AND default_vat_code = IS NULL";

+		$sql .= " AND s.fk_pays = '".$country_id."'";

@@ -204 +195,2 @@
-		if ($resql) {

+		if ($resql)

+		{

@@ -208 +200,2 @@
-			while ($i < $num) {

+			while ($i < $num)

+			{

@@ -213,4 +206,3 @@
-				if ($ret > 0) {

-					$ret = 0;

-					$retm = 0;

-					$updatelevel1 = false;

+				if ($ret > 0)

+				{

+					$ret = 0; $retm = 0; $updatelevel1 = false;

@@ -233 +225 @@
-					//$newnpr=$objectstatic2->tva_npr;

+					//$newnpr=$objectstatic2->recuperableonly;

@@ -242 +234,2 @@
-					if (!empty($price_base_type) && !$updatelevel1) {

+					if (!empty($price_base_type) && !$updatelevel1)

+					{

@@ -248,5 +241,2 @@
-					if ($ret < 0 || $retm < 0) {

-						$error++;

-					} else {

-						$nbrecordsmodified++;

-					}

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

+					else $nbrecordsmodified++;

@@ -258,5 +248,5 @@
-		} else {

-			dol_print_error($db);

-		}

-

-		if (!$error) {

+		}

+		else dol_print_error($db);

+

+		if (!$error)

+		{

@@ -264 +254,3 @@
-		} else {

+		}

+		else

+		{

@@ -269,7 +261,7 @@
-		if (!$error) {

-			if ($nbrecordsmodified > 0) {

-				setEventMessages($langs->trans("RecordsModified", $nbrecordsmodified), null, 'mesgs');

-			} else {

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

-			}

-		} else {

+		if (!$error)

+		{

+			if ($nbrecordsmodified > 0) setEventMessages($langs->trans("RecordsModified", $nbrecordsmodified), null, 'mesgs');

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

+		}

+		else

+		{

@@ -295 +287,2 @@
-if (empty($mysoc->country_code)) {

+if (empty($mysoc->country_code))

+{

@@ -299 +292,3 @@
-} else {

+}

+else

+{

--- /tmp/dsg/dolibarr/htdocs/product/admin/github_19.0.3_stock_extrafields.php
+++ /tmp/dsg/dolibarr/htdocs/product/admin/client_stock_extrafields.php
@@ -27 +26,0 @@
-// Load Dolibarr environment

@@ -41,3 +40 @@
-foreach ($tmptype2label as $key => $val) {

-	$type2label[$key] = $langs->transnoentitiesnoconv($val);

-}

+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);

@@ -45 +42 @@
-$action = GETPOST('action', 'aZ09');

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

@@ -49,3 +46 @@
-if (!$user->admin) {

-	accessforbidden();

-}

+if (!$user->admin) accessforbidden();

@@ -76 +71 @@
-print dol_get_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, 'stock');

+dol_fiche_head($head, 'attributes', $langs->trans("StockSetup"), -1, 'stock');

@@ -80 +75 @@
-print dol_get_fiche_end();

+dol_fiche_end();

@@ -83,6 +78,6 @@
-// Creation of an optional field

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

-	print "<br>";

-	print load_fiche_titre($langs->trans('NewAttribute'));

-

-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

+// Buttons

+if ($action != 'create' && $action != 'edit')

+{

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

+    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';

+    print "</div>";

@@ -91,4 +85,0 @@
-// Edition of an optional field

-if ($action == 'edit' && !empty($attrname)) {

-	print "<br>";

-	print load_fiche_titre($langs->trans("FieldEdition", $attrname));

@@ -96 +87,25 @@
-	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';

+/* ************************************************************************** */

+/*                                                                            */

+/* Creation of an optional field											  */

+/*                                                                            */

+/* ************************************************************************** */

+

+if ($action == 'create')

+{

+    print "<br>";

+    print load_fiche_titre($langs->trans('NewAttribute'));

+

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';

+}

+

+/* ************************************************************************** */

+/*                                                                            */

+/* Edition of an optional field                                               */

+/*                                                                            */

+/* ************************************************************************** */

+if ($action == 'edit' && !empty($attrname))

+{

+    print "<br>";

+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));

+

+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';