--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_admin_extrafields_add.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_admin_extrafields_add.tpl.php
@@ -37,12 +37,10 @@
 

 $langs->load("modulebuilder");

 

-$listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php<br>Product:product/class/product.class.php<br>Project:projet/class/project.class.php';

-

 ?>

 

 <!-- BEGIN PHP TEMPLATE admin_extrafields_add.tpl.php -->

-<script>

+<script type="text/javascript">

     jQuery(document).ready(function() {

     	function init_typeoffields(type)

     	{

@@ -57,17 +55,17 @@
     		var list = jQuery("#list");

             var totalizable = jQuery("#totalizable");

     		<?php

-			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))

-			{

-				print 'jQuery("#value_choice").hide();';

-			}

-

-			if (GETPOST('type', 'alpha') == "separate")

-			{

+    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))

+    		{

+    			print 'jQuery("#value_choice").hide();';

+    		}

+

+    		if (GETPOST('type', 'alpha') == "separate")

+    		{

 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";

-				print 'jQuery("#value_choice").hide();';

-			}

-			?>

+    			print 'jQuery("#value_choice").hide();';

+    		}

+    		?>

 

     		// Case of computed field

     		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {

@@ -144,7 +142,7 @@
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">

 <input type="hidden" name="action" value="add">

 

-<?php print dol_get_fiche_head(); ?>

+<?php dol_fiche_head(); ?>

 

 <table summary="listofattributes" class="border centpercent">

 <!-- Label -->

@@ -153,7 +151,7 @@
 <tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>"> <span class="opacitymedium">(<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</span></td></tr>

 <!-- Type -->

 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">

-<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha'), 0, 0, 0, '', 0, 0, 0, '', '', 1); ?>

+<?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha')); ?>

 </td></tr>

 <!-- Size -->

 <tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size', 'alpha') ?GETPOST('size', 'alpha') : ''); ?>"></td></tr>

@@ -170,7 +168,7 @@
     <span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>

     <span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>

     <span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>

-    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>

+    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?></span>

     <span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>

     <span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>

     </td></tr>

@@ -178,12 +176,12 @@
 </td>

 </tr>

 <!-- Position -->

-<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ? GETPOST('pos', 'int') : 100; ?>"></td></tr>

+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ?GETPOST('pos', 'int') : 100; ?>"></td></tr>

 <!-- Language file -->

 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>

 <!-- Computed Value -->

 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>

-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'none') : ''); ?>"></td></tr>

+	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?>"></td></tr>

 <?php } else { ?>

 	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>

 <?php } ?>

@@ -211,10 +209,10 @@
 <?php } ?>

 </table>

 

-<?php print dol_get_fiche_end(); ?>

-

-<div class="center"><input type="submit" name="button" class="button button-save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-<input type="submit" name="button" class="button button-cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>

+<?php dol_fiche_end(); ?>

+

+<div class="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+<input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>

 

 </form>

 

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_admin_extrafields_edit.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_admin_extrafields_edit.tpl.php
@@ -36,12 +36,10 @@
 

 $langs->load("modulebuilder");

 

-$listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php<br>Product:product/class/product.class.php<br>Project:projet/class/project.class.php<br>...';

-

 ?>

 

 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->

-<script>

+<script type="text/javascript">

     jQuery(document).ready(function() {

     	function init_typeoffields(type)

     	{

@@ -56,17 +54,17 @@
     		var list = jQuery("#list");

             var totalizable = jQuery("#totalizable");

     		<?php

-			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))

-			{

-				print 'jQuery("#value_choice").hide();';

-			}

-

-			if (GETPOST('type', 'alpha') == "separate")

-			{

+    		if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))

+    		{

+    			print 'jQuery("#value_choice").hide();';

+    		}

+

+    		if (GETPOST('type', 'alpha') == "separate")

+    		{

 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";

-				print 'jQuery("#value_choice").hide();';

-			}

-			?>

+    			print 'jQuery("#value_choice").hide();';

+    		}

+    		?>

 

     		// Case of computed field

     		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {

@@ -145,9 +143,8 @@
 <input type="hidden" name="attrname" value="<?php echo $attrname; ?>">

 <input type="hidden" name="action" value="update">

 <input type="hidden" name="rowid" value="<?php echo $rowid ?>">

-<input type="hidden" name="enabled" value="<?php echo $extrafields->attributes[$elementtype]['enabled'][$attrname]; ?>">

-

-<?php print dol_get_fiche_head(); ?>

+

+<?php dol_fiche_head(); ?>

 

 <table summary="listofattributes" class="border centpercent">

 

@@ -169,7 +166,6 @@
 $help = $extrafields->attributes[$elementtype]['help'][$attrname];

 $entitycurrentorall = $extrafields->attributes[$elementtype]['entityid'][$attrname];

 $printable = $extrafields->attributes[$elementtype]['printable'][$attrname];

-$enabled = $extrafields->attributes[$elementtype]['enabled'][$attrname];

 

 if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))

 {

@@ -181,7 +177,8 @@
 			$param_chain .= $key.','.$value."\n";

 		}

 	}

-} elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))

+}

+elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))

 {

 	$paramlist = array_keys($param['options']);

 	$param_chain = $paramlist[0];

@@ -189,10 +186,8 @@
 ?>

 <!-- Label -->

 <tr><td class="titlefield fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo $label; ?>"></td></tr>

-

 <!-- Code -->

 <tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><?php echo $attrname; ?></td></tr>

-

 <!-- Type -->

 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">

 <?php

@@ -205,39 +200,33 @@
 	'html'=>array('text', 'html'),

 	'password'=>array('password', 'varchar'),

 	'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'),

-	'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),

-	'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),

-	'select'=>array('varchar', 'phone', 'mail', 'url', 'select'),

-	'date'=>array('date', 'datetime')

+    'url'=>array('varchar', 'phone', 'mail', 'url', 'select'),

+    'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'),

+    'select'=>array('varchar', 'phone', 'mail', 'url', 'select')

 );

-/* Disabled because text is text on several lines, when varchar is text on 1 line, we should not be able to convert

-if ($size <= 255 && in_array($type, array('text', 'html'))) {

-	$typewecanchangeinto['text'][] = 'varchar';

-}*/

 

 if (in_array($type, array_keys($typewecanchangeinto)))

 {

-	$newarray = array();

-	print '<select id="type" class="flat type" name="type">';

-	foreach ($type2label as $key => $val)

-	{

-		$selected = '';

-		if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';

-		if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';

-		else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';

-	}

-	print '</select>';

-	print ajax_combobox('type');

-} else {

+    $newarray = array();

+    print '<select id="type" class="flat type" name="type">';

+    foreach ($type2label as $key => $val)

+    {

+        $selected = '';

+        if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';

+        if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';

+        else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';

+    }

+    print '</select>';

+}

+else

+{

 	print $type2label[$type];

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

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

 }

 ?>

 </td></tr>

-

 <!-- Size -->

 <tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>

-

 <!--  Value (for some fields like password, select list, radio, ...) -->

 <tr id="value_choice">

 <td>

@@ -251,69 +240,50 @@
     <span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>

     <span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>

     <span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>

-    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>

+    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?></span>

     <span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>

     <span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>

     </td></tr>

     </table>

 </td>

 </tr>

-

 <!-- Position -->

 <tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo dol_escape_htmltag($pos); ?>"></td></tr>

-

 <!-- Language file -->

 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag($langfile); ?>"></td></tr>

-

 <!-- Computed value -->

 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>

 	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>

 <?php } else { ?>

 	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>

 <?php } ?>

-

 <!-- Default Value (at sql setup level) -->

 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo dol_escape_htmltag($default); ?>"></td></tr>

-

 <!-- Unique -->

 <tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique ? ' checked' : ''); ?>></td></tr>

-

 <!-- Required -->

 <tr class="extra_required"><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required ? ' checked' : ''); ?>></td></tr>

-

 <!-- Always editable -->

 <tr class="extra_alwayseditable"><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable ? ' checked' : ''); ?>></td></tr>

-

 <!-- Visibility -->

 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc")); ?>

 </td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo ($list != '' ? $list : '1'); ?>"></td></tr>

-

 <!-- Visibility for PDF-->

 <tr><td class="extra_pdf"><?php echo $form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")); ?>

 </td><td class="valeur"><input id="printable" class="minwidth100" type="text" name="printable" value="<?php echo dol_escape_htmltag($printable); ?>"></td></tr>

 <tr class="extra_totalizable"><td><?php echo $form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ($totalizable ? ' checked' : ''); ?>></td></tr>

-

 <!-- Help tooltip -->

 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag($help); ?>"></td></tr>

-

 <?php if ($conf->multicompany->enabled) { ?>

 	<!-- Multicompany entity -->

     <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>

 <?php } ?>

-

-<!-- Show Enabled property when value is not a common value -->

-<?php if ($enabled != '1') { ?>

-	<tr class="help"><td><?php echo $langs->trans("EnabledCondition"); ?></td><td class="valeur">

-	<?php echo dol_escape_htmltag($enabled); ?>

-<?php } ?>

-</td></tr>

-

 </table>

 

-<?php print dol_get_fiche_end(); ?>

-

-<div class="center"><input type="submit" name="button" class="button button-save" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-<input type="submit" name="button" class="button button-cancel" value="<?php echo $langs->trans("Cancel"); ?>"></div>

+<?php dol_fiche_end(); ?>

+

+<div class="center"><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+<input type="submit" name="button" class="button" value="<?php echo $langs->trans("Cancel"); ?>"></div>

 

 </form>

 

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_admin_extrafields_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_admin_extrafields_view.tpl.php
@@ -76,11 +76,6 @@
 {

 	foreach ($extrafields->attributes[$elementtype]['type'] as $key => $value)

 	{

-		/*if (! dol_eval($extrafields->attributes[$elementtype]['enabled'][$key], 1)) {

-			// TODO Uncomment this to exclude extrafields of modules not enabled. Add a link to "Show extrafields disabled"

-			// continue;

-		}*/

-

 		// Load language if required

 		if (!empty($extrafields->attributes[$elementtype]['langfile'][$key])) {

 			$langs->load($extrafields->attributes[$elementtype]['langfile'][$key]);

@@ -105,7 +100,8 @@
 			if (empty($extrafields->attributes[$elementtype]['entityid'][$key]))

 			{

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

-			} else {

+			}

+			else {

 				global $multicompanylabel_cache;

 				if (!is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();

 				if (empty($multicompanylabel_cache[$extrafields->attributes[$elementtype]['entityid'][$key]])) {

@@ -117,11 +113,13 @@
 			}

 			print '</td>';

 		}

-		print '<td class="right nowraponall"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';

-		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&attrname='.$key.'">'.img_delete().'</a></td>'."\n";

+		print '<td class="right nowraponall"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';

+		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&attrname='.$key.'">'.img_delete().'</a></td>'."\n";

 		print "</tr>";

 	}

-} else {

+}

+else

+{

 	$colspan = 13;

 	if (!empty($conf->multicompany->enabled))  $colspan++;

 

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_advtarget.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_advtarget.tpl.php
@@ -19,7 +19,7 @@
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 }

 

-print '<script>

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

 	$(document).ready(function() {

 

 		// Click Function

@@ -154,11 +154,11 @@
 }

 print '</td><td>';

 print $formadvtargetemaling->advMultiselectarray(

-	'cust_status', array(

+    'cust_status', array(

 		'0' => $langs->trans('ActivityCeased'),

 		'1' => $langs->trans('InActivity')

-	),

-	$array_query['cust_status']

+    ),

+    $array_query['cust_status']

 );

 print '</td><td>'."\n";

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

@@ -300,15 +300,15 @@
 				print '</td><td>'."\n";

 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'boolean')) {

-				print $form->selectarray(

-					'options_'.$key,

-					array(

+                print $form->selectarray(

+                    'options_'.$key,

+                    array(

 						'' => '',

 						'1' => $langs->trans('Yes'),

 						'0' => $langs->trans('No')

-					),

-					$array_query['options_'.$key]

-				);

+                    ),

+                    $array_query['options_'.$key]

+                );

 				print '</td><td>'."\n";

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'select')) {

 				print $formadvtargetemaling->advMultiselectarray('options_'.$key, $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key]);

@@ -346,7 +346,7 @@
 	}

 	// Other attributes

 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);

-	print $hookmanager->resPrint;

+    print $hookmanager->resPrint;

 }

 

 // State Contact

@@ -356,12 +356,12 @@
 }

 print '</td><td>';

 print $formadvtargetemaling->advMultiselectarray(

-	'contact_status',

-	array(

+    'contact_status',

+    array(

 		'0' => $langs->trans('ActivityCeased'),

 		'1' => $langs->trans('InActivity')

-	),

-	$array_query['contact_status']

+    ),

+    $array_query['contact_status']

 );

 print '</td><td>'."\n";

 print $form->textwithpicto('', $langs->trans("AdvTgtContactHelp"), 1, 'help');

@@ -409,13 +409,13 @@
 }

 print '</td><td>'."\n";

 print $form->selectarray(

-	'contact_no_email',

-	array(

+    'contact_no_email',

+    array(

 		'' => '',

 		'1' => $langs->trans('Yes'),

 		'0' => $langs->trans('No')

-	),

-	$array_query['contact_no_email']

+    ),

+    $array_query['contact_no_email']

 );

 print '</td><td>'."\n";

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

@@ -479,54 +479,57 @@
 	}

 	if (!empty($extrafields->attributes[$elementtype]['label'])) {

 		foreach ($extrafields->attributes[$elementtype]['label'] as $key => $val) {

-			print '<tr><td>'.$extrafields->attributes[$elementtype]['label'][$key];

-			if ($array_query['options_'.$key.'_cnct'] != '' || (is_array($array_query['options_'.$key.'_cnct']) && count($array_query['options_'.$key.'_cnct']) > 0)) {

+			print '<tr><td>' . $extrafields->attributes[$elementtype]['label'][$key];

+			if ($array_query['options_' . $key . '_cnct'] != '' || (is_array($array_query['options_' . $key . '_cnct']) && count($array_query['options_' . $key . '_cnct']) > 0)) {

 				print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');

 			}

 			print '</td><td>';

 			if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') || ($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {

-				print '<input type="text" name="options_'.$key.'_cnct"/></td><td>'."\n";

+				print '<input type="text" name="options_' . $key . '_cnct"/></td><td>' . "\n";

 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchTextHelp"), 1, 'help');

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') || ($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {

-				print $langs->trans("AdvTgtMinVal").'<input type="text" name="options_'.$key.'_min_cnct"/>';

-				print $langs->trans("AdvTgtMaxVal").'<input type="text" name="options_'.$key.'_max_cnct"/>';

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

+				print $langs->trans("AdvTgtMinVal") . '<input type="text" name="options_' . $key . '_min_cnct"/>';

+				print $langs->trans("AdvTgtMaxVal") . '<input type="text" name="options_' . $key . '_max_cnct"/>';

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

 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchIntHelp"), 1, 'help');

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'date') || ($extrafields->attributes[$elementtype]['type'][$key] == 'datetime')) {

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

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

-				print $form->selectDate('', 'options_'.$key.'_st_dt_cnct');

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

-				print $form->selectDate('', 'options_'.$key.'_end_dt_cnct');

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

+				print $form->selectDate('', 'options_' . $key . '_st_dt_cnct');

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

+				print $form->selectDate('', 'options_' . $key . '_end_dt_cnct');

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

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

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

 				print $form->textwithpicto('', $langs->trans("AdvTgtSearchDtHelp"), 1, 'help');

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'boolean')) {

 				print $form->selectarray(

-					'options_'.$key.'_cnct',

+					'options_' . $key . '_cnct',

 					array(

 						''  => '',

 						'1' => $langs->trans('Yes'),

 						'0' => $langs->trans('No')

 					),

-					$array_query['options_'.$key.'_cnct']

+					$array_query['options_' . $key . '_cnct']

 				);

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

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

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'select')) {

-				print $formadvtargetemaling->advMultiselectarray('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);

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

+				print $formadvtargetemaling->advMultiselectarray('options_' . $key . '_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_' . $key . '_cnct']);

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

 			} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'sellist')) {

-				print $formadvtargetemaling->advMultiselectarraySelllist('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);

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

+				print $formadvtargetemaling->advMultiselectarraySelllist('options_' . $key . '_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_' . $key . '_cnct']);

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

 			} else {

-				if (is_array($array_query['options_'.$key.'_cnct'])) {

-					print $extrafields->showInputField($key, implode(',', $array_query['options_'.$key.'_cnct']), '', '_cnct');

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

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

+				if (is_array($array_query['options_' . $key . '_cnct'])) {

+					print $extrafields->showInputField($key, implode(',', $array_query['options_' . $key . '_cnct']), '', '_cnct');

 				} else {

-					print $extrafields->showInputField($key, $array_query['options_'.$key.'_cnct'], '', '_cnct');

+					print $extrafields->showInputField($key, $array_query['options_' . $key . '_cnct'], '', '_cnct');

 				}

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

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

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

 			}

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

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

 		}

 	}

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_ajaxrow.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_ajaxrow.tpl.php
@@ -44,8 +44,7 @@
 $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);

 $filepath = (empty($filepath) ? '' : $filepath);

 

-

-if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1 && $conf->browser->layout != 'phone') { ?>

+if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1) { ?>

 <script>

 $(document).ready(function(){

 	$(".imgupforline").hide();

@@ -81,12 +80,7 @@
 						console.log("tableDND end of ajax call");

 						if (reloadpage == 1) {

 							//console.log('<?php echo $urltorefreshaftermove.' - '.$_SERVER['PHP_SELF'].' - '.dol_escape_js($_SERVER['QUERY_STRING']); ?>');

-							<?php

-							$redirectURL = empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove;

-							// remove action parameter from URL

-							$redirectURL = preg_replace('/(&|\?)action=[^&#]*/', '', $redirectURL);

-							?>

-							location.href = '<?php echo dol_escape_js($redirectURL); ?>';

+							location.href = '<?php echo dol_escape_js(empty($urltorefreshaftermove) ? ($_SERVER['PHP_SELF'].'?'.dol_escape_js($_SERVER['QUERY_STRING'])) : $urltorefreshaftermove); ?>';

 						} else {

 							$("#<?php echo $tagidfortablednd; ?> .drag").each(

 									function( intIndex ) {

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_bloc_comment.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_bloc_comment.tpl.php
@@ -38,21 +38,21 @@
 

 if ($action !== 'editcomment')

 {

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

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

 

-	// Description

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

+    // Description

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

 

-	$desc = GETPOST('comment_description');

+    $desc = GETPOST('comment_description');

 

-	$doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');

-	print $doleditor->Create(1);

+    $doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');

+    print $doleditor->Create(1);

 

-	print '</td>';

+    print '</td>';

 

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

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

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

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

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

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

 }

 

 print '</table></form>';

@@ -96,47 +96,51 @@
 		print '<div class="comment-cell comment-right">';

 		print '<div class="comment-table width100p">';

 

-		if ($action === 'editcomment' && $comment->id == $idcomment)

-		{

-			print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';

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

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

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

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

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

-		}

+        if ($action === 'editcomment' && $comment->id == $idcomment)

+        {

+            print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';

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

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

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

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

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

+        }

 

-		print '<div class="comment-description comment-cell">';

-		if ($action === 'editcomment' && $comment->id == $idcomment)

-		{

-			$doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');

-			print $doleditor->Create(1);

-		} else {

-			print $comment->description;

-		}

+        print '<div class="comment-description comment-cell">';

+        if ($action === 'editcomment' && $comment->id == $idcomment)

+        {

+            $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');

+            print $doleditor->Create(1);

+        }

+        else

+        {

+            print $comment->description;

+        }

 		print '</div>'; // End comment-description

 

-		if ($action === 'editcomment' && $comment->id == $idcomment)

-		{

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

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

+        if ($action === 'editcomment' && $comment->id == $idcomment)

+        {

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

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

 

-			print '</form>';

-		} else {

-			if ($fk_user == $user->id || $user->admin == 1)

-			{

-				print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';

-				print img_picto('', 'edit.png');

-				print '</a>';

-			}

-			if (($first && $fk_user == $user->id) || $user->admin == 1) {

-				print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';

-				print img_picto('', 'delete.png');

-				print '</a>';

-			}

-		}

+            print '</form>';

+        }

+        else

+        {

+            if ($fk_user == $user->id || $user->admin == 1)

+            {

+                print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';

+                print img_picto('', 'edit.png');

+                print '</a>';

+            }

+            if (($first && $fk_user == $user->id) || $user->admin == 1) {

+                print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';

+                print img_picto('', 'delete.png');

+                print '</a>';

+            }

+        }

 

-		print '</div>'; // End comment-table

+        print '</div>'; // End comment-table

 		print '</div>'; // End comment-right

 		print '</div>'; // End comment

 

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_bloc_showhide.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_bloc_showhide.tpl.php
@@ -32,7 +32,7 @@
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->

 

 <?php

-print '<script>'."\n";

+print '<script type="text/javascript">'."\n";

 print '$(document).ready(function() {'."\n";

 print '$("#hide-'.$blocname.'").click(function(){'."\n";

 print '		setShowHide(0);'."\n";

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_card_presend.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_card_presend.tpl.php
@@ -51,7 +51,9 @@
 		if ($object->element == 'invoice_supplier')

 		{

 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');

-		} else {

+		}

+		else

+		{

 			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');

 		}

 

@@ -75,7 +77,7 @@
 		$outputlangs = new Translate('', $conf);

 		$outputlangs->setDefaultLang($newlang);

 		// Load traductions files required by page

-		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions', 'receptions'));

+		$outputlangs->loadLangs(array('commercial', 'bills', 'orders', 'contracts', 'members', 'propal', 'products', 'supplier_proposal', 'interventions'));

 	}

 

 	$topicmail = '';

@@ -93,7 +95,7 @@
 	{

 		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument'))

 		{

-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);

 			if ($result < 0) {

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

 				exit();

@@ -101,7 +103,9 @@
 			if ($object->element == 'invoice_supplier')

 			{

 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');

-			} else {

+			}

+			else

+			{

 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');

 			}

 

@@ -114,7 +118,7 @@
 	print '<br>';

 	print load_fiche_titre($langs->trans($titreform));

 

-	print dol_get_fiche_head('');

+	dol_fiche_head('');

 

 	// Create form for email

 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

@@ -127,23 +131,6 @@
 	{

 		$formmail->fromid = $user->id;

 	}

-

-	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {

-		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;

-		$formmail->fromname = '';

-		$formmail->fromtype = 'special';

-	}

-	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {

-		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;

-		$formmail->fromname = '';

-		$formmail->fromtype = 'special';

-	}

-	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {

-		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;

-		$formmail->fromname = '';

-		$formmail->fromtype = 'special';

-	}

-

 	$formmail->trackid = $trackid;

 	if (!empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set

 	{

@@ -154,22 +141,28 @@
 

 	// Fill list of recipient with email inside <>.

 	$liste = array();

-	if ($object->element == 'expensereport') {

+	if ($object->element == 'expensereport')

+	{

 		$fuser = new User($db);

 		$fuser->fetch($object->fk_user_author);

 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";

-	} elseif ($object->element == 'societe') {

+	}

+	elseif ($object->element == 'societe')

+	{

 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {

 			$liste[$key] = $value;

 		}

-	} elseif ($object->element == 'contact') {

+	}

+	elseif ($object->element == 'contact')

+	{

 		$liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">";

-	} elseif ($object->element == 'user' || $object->element == 'member') {

+	}

+	elseif ($object->element == 'user' || $object->element == 'member')

+	{

 		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";

-	} else {

-		if (!empty($object->socid) && $object->socid > 0 && !is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) {

-			$object->fetch_thirdparty();

-		}

+	}

+	else

+	{

 		if (is_object($object->thirdparty))

 		{

 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {

@@ -196,7 +189,7 @@
 	}

 

 	$formmail->withto = $liste;

-	$formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1');

+	$formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto') ? GETPOST('sendto') : '1') : '1');

 	$formmail->withtocc = $liste;

 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;

 	$formmail->withtopic = $topicmail;

@@ -278,10 +271,10 @@
 		}

 	}

 

-	// Array of substitutions

+	// Tableau des substitutions

 	$formmail->substit = $substitutionarray;

 

-	// Array of other parameters

+	// Tableau des parametres complementaires

 	$formmail->param['action'] = 'send';

 	$formmail->param['models'] = $modelmail;

 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');

@@ -292,5 +285,5 @@
 	// Show form

 	print $formmail->get_form();

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_commonfields_add.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_commonfields_add.tpl.php
@@ -53,13 +53,9 @@
 	else print $langs->trans($val['label']);

 	print '</td>';

 	print '<td>';

-	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }

 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');

-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'restricthtml');

-	elseif ($val['type'] == 'date') $value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));

-	elseif ($val['type'] == 'datetime') $value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));

-	elseif ($val['type'] == 'boolean') $value = (GETPOST($key) == 'on' ? 1 : 0);

-	else $value = GETPOST($key, 'alphanohtml');

+	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');

+	else $value = GETPOST($key, 'alpha');

 	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);

 	else print $object->showInputField($val, $key, $value, '', '', '', 0);

 	print '</td>';

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_commonfields_edit.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_commonfields_edit.tpl.php
@@ -45,24 +45,15 @@
 	print '<tr><td';

 	print ' class="titlefieldcreate';

 	if ($val['notnull'] > 0) print ' fieldrequired';

-	if (preg_match('/^(text|html)/', $val['type'])) print ' tdtop';

+	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';

 	print '">';

 	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));

 	else print $langs->trans($val['label']);

 	print '</td>';

 	print '<td>';

-	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }

 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;

-	elseif (preg_match('/^(text|html)/', $val['type'])) {

-		$tmparray = explode(':', $val['type']);

-		if (!empty($tmparray[1])) {

-			$check = $tmparray[1];

-		} else {

-			$check = 'restricthtml';

-		}

-		$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;

-	}

-	else $value = GETPOSTISSET($key) ? GETPOST($key, 'alpha') : $object->$key;

+	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOSTISSET($key) ?GETPOST($key, 'none') : $object->$key;

+	else $value = GETPOSTISSET($key) ?GETPOST($key, 'alpha') : $object->$key;

 	//var_dump($val.' '.$key.' '.$value);

 	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);

 	else print $object->showInputField($val, $key, $value, '', '', '', 0);

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_commonfields_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_commonfields_view.tpl.php
@@ -59,12 +59,10 @@
 	print '</td>';

 	print '<td class="valuefield fieldname_'.$key;

 	if ($val['type'] == 'text') print ' wordbreak';

-	if ($val['cssview']) print ' '.$val['cssview'];

 	print '">';

-	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';

+

 	print $object->showOutputField($val, $key, $value, '', '', '', 0);

 	//print dol_escape_htmltag($object->$key, 1, 1);

-	if (in_array($val['type'], array('text', 'html'))) print '</div>';

 	print '</td>';

 	print '</tr>';

 }

@@ -85,7 +83,8 @@
 	{

 		if (!empty($keyforbreak) && $key == $keyforbreak) {

 			$alreadyoutput = 0; // key used for break on second column

-		} else {

+		}

+		else {

 			continue;

 		}

 	}

@@ -106,14 +105,9 @@
 	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));

 	else print $langs->trans($val['label']);

 	print '</td>';

-	print '<td class="valuefield fieldname_'.$key;

-	if ($val['type'] == 'text') print ' wordbreak';

-	if ($val['cssview']) print ' '.$val['cssview'];

-	print '">';

-	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';

+	print '<td>';

 	print $object->showOutputField($val, $key, $value, '', '', '', 0);

 	//print dol_escape_htmltag($object->$key, 1, 1);

-	if (in_array($val['type'], array('text', 'html'))) print '</div>';

 	print '</td>';

 	print '</tr>';

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_contacts.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_contacts.tpl.php
@@ -40,27 +40,21 @@
 $module = $object->element;

 

 // Special cases

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

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

-} elseif ($module == 'fichinter') {

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

-} elseif ($module == 'order_supplier') {

-	$permission = $user->rights->fournisseur->commande->creer;

-} elseif ($module == 'invoice_supplier') {

-	$permission = $user->rights->fournisseur->facture->creer;

-} elseif ($module == 'project') {

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

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

-	$permission = $user->rights->agenda->myactions->create;

-} elseif ($module == 'shipping') {

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

-} elseif ($module == 'reception') {

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

-} elseif ($module == 'project_task') {

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

-} elseif (!isset($permission) && isset($user->rights->$module->creer)) {

+if ($module == 'propal') { $permission = $user->rights->propale->creer; }

+elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }

+elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }

+elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }

+elseif ($module == 'project') { $permission = $user->rights->projet->creer; }

+elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; }

+elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }

+elseif ($module == 'reception') { $permission = $user->rights->reception->creer; }

+elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }

+elseif (!isset($permission) && isset($user->rights->$module->creer))

+{

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

-} elseif (!isset($permission) && isset($user->rights->$module->write)) {

+}

+elseif (!isset($permission) && isset($user->rights->$module->write))

+{

 	$permission = $user->rights->$module->write;

 }

 

@@ -108,7 +102,7 @@
 		<?php

 		$tmpobject = $object;

 		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;

-		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');

+		echo $formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');

 		?></div>

 		<div class="tagtd">&nbsp;</div>

 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>

@@ -117,7 +111,8 @@
 	    <?php

 	}

 

-	if (empty($hideaddcontactforthirdparty)) {

+	if (empty($hideaddcontactforthirdparty))

+	{

 		?>

 

 	<form class="tagtr pair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">

@@ -140,13 +135,12 @@
 		</div>

 		<div class="tagtd maxwidthonsmartphone noborderbottom">

 			<?php

-			print $form->selectcontacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');

-			$nbofcontacts = $form->num;

+			$nbofcontacts = $form->select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');

 

 			$newcardbutton = '';

 			if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer)

 			{

-				$newcardbutton .= '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$selectedCompany.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.$langs->trans('NewContact').'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';

+				$newcardbutton .= '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$object->socid.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.$langs->trans('NewContact').'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';

 			}

 			print $newcardbutton;

 			?>

@@ -155,7 +149,7 @@
 			<?php

 			$tmpobject = $object;

 			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;

-			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth100imp');

+			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'type', 'external', 'position', 0, 'minwidth100imp');

 			?>

 		</div>

 		<div class="tagtd noborderbottom">&nbsp;</div>

@@ -183,7 +177,9 @@
 	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc))

 	{

 		$contactlist = $objectsrc->liste_contact(-1, $source);

-	} else {

+	}

+	else

+	{

 		$contactlist = $object->liste_contact(-1, $source);

 	}

 

@@ -202,7 +198,9 @@
 		if ($contact['source'] == 'internal')

 		{

 			$entry->nature = $langs->trans("User");

-		} elseif ($contact['source'] == 'external') {

+		}

+		elseif ($contact['source'] == 'external')

+		{

 			$entry->nature = $langs->trans("ThirdPartyContact");

 		}

 

@@ -211,7 +209,9 @@
 			$companystatic->fetch($contact['socid']);

 			$entry->thirdparty_html = $companystatic->getNomUrl(1);

 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));

-		} elseif ($contact['socid'] < 0) {

+		}

+		elseif ($contact['socid'] < 0)

+		{

 			$entry->thirdparty_html = $conf->global->MAIN_INFO_SOCIETE_NOM;

 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);

 		}

@@ -221,7 +221,9 @@
 			$userstatic->fetch($contact['id']);

 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');

 			$entry->contact_name = strtolower($userstatic->getFullName($langs));

-		} elseif ($contact['source'] == 'external') {

+		}

+		elseif ($contact['source'] == 'external')

+		{

 			$contactstatic->fetch($contact['id']);

 			$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);

 			$entry->contact_name = strtolower($contactstatic->getFullName($langs));

@@ -230,7 +232,9 @@
 		if ($contact['source'] == 'internal')

 		{

 			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);

-		} elseif ($contact['source'] == 'external') {

+		}

+		elseif ($contact['source'] == 'external')

+		{

 			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);

 		}

 

@@ -239,8 +243,8 @@
 }

 

 

-$sortfield = GETPOST("sortfield", "aZ09comma");

-$sortorder = GETPOST("sortorder", 'aZ09comma');

+$sortfield = GETPOST("sortfield", "alpha");

+$sortorder = GETPOST("sortorder", 'alpha');

 

 if (!$sortfield) $sortfield = "nature";

 if (!$sortorder) $sortorder = "asc";

@@ -282,7 +286,7 @@
 print_liste_field_titre($arrayfields['contact']['label'], $_SERVER["PHP_SELF"], "contact_name", "", $param, "", $sortfield, $sortorder);

 print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, "", $sortfield, $sortorder);

 print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "statut", "", $param, "", $sortfield, $sortorder, 'center ');

-print_liste_field_titre('', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder, 'center maxwidthsearch ');

+print_liste_field_titre($arrayfields['link']['label'], $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder, 'center maxwidthsearch ');

 print "</tr>";

 

 foreach ($list as $entry)

@@ -298,9 +302,9 @@
 	if ($permission)

 	{

 		$href = $_SERVER["PHP_SELF"];

-		$href .= '?id='.$object->id;

-		$href .= '&action=deletecontact&token='.newToken();

-		$href .= '&lineid='.$entry->id;

+		$href .= "?id=".$object->id;

+		$href .= "&action=deletecontact";

+		$href .= "&lineid=".$entry->id;

 

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

 		print "<a href='$href'>";

@@ -317,6 +321,9 @@
 

 print "</form>";

 

+

+

+

 print "<!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->\n";

 if (is_object($hookmanager)) {

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

@@ -324,3 +331,4 @@
 	$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);

 }

 print "<!-- END PHP TEMPLATE CONTACTS -->\n";

+

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_document_actions_post_headers.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_document_actions_post_headers.tpl.php
@@ -59,7 +59,7 @@
 if ($action == 'delete')

 {

 	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles

-	print $form->formconfirm(

+    print $form->formconfirm(

 			$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),

 			$langs->trans('DeleteFile'),

 			$langs->trans('ConfirmDeleteFile'),

@@ -112,13 +112,13 @@
 

 // Show upload form (document and links)

 $formfile->form_attach_new_file(

-	$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1').(empty($moreparam) ? '' : $moreparam),

-	'',

-	0,

-	0,

-	$permission,

-	$conf->browser->layout == 'phone' ? 40 : 60,

-	$object,

+    $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject) ? '' : '&withproject=1').(empty($moreparam) ? '' : $moreparam),

+    '',

+    0,

+    0,

+    $permission,

+    $conf->browser->layout == 'phone' ? 40 : 60,

+    $object,

 	'',

 	1,

 	$savingdocmask

@@ -126,24 +126,24 @@
 

 // List of document

 $formfile->list_of_documents(

-	$filearray,

-	$object,

-	$modulepart,

-	$param,

-	0,

-	$relativepathwithnofile, // relative path with no file. For example "0/1"

-	$permission,

-	0,

-	'',

-	0,

-	'',

-	'',

-	0,

-	$permtoedit,

-	$upload_dir,

-	$sortfield,

-	$sortorder,

-	$disablemove

+    $filearray,

+    $object,

+    $modulepart,

+    $param,

+    0,

+    $relativepathwithnofile, // relative path with no file. For example "0/1"

+    $permission,

+    0,

+    '',

+    0,

+    '',

+    '',

+    0,

+    $permtoedit,

+    $upload_dir,

+    $sortfield,

+    $sortorder,

+    $disablemove

 );

 

 print "<br>";

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_extrafields_list_print_fields.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_extrafields_list_print_fields.tpl.php
@@ -14,18 +14,18 @@
 {

 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))

 	{

-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

+        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

 

-		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)

+        foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)

 		{

 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked']))

 			{

 				$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);

 				print '<td';

-				if ($align) print ' class="'.$align.'"';

-				print ' data-key="'.$key.'"';

-				print '>';

-				$tmpkey = 'options_'.$key;

+                if ($align) print ' class="'.$align.'"';

+                print ' data-key="'.$key.'"';

+                print '>';

+                $tmpkey = 'options_'.$key;

 

 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))

 				{

@@ -35,7 +35,9 @@
 						$datenotinstring = $db->jdate($datenotinstring);

 					}

 					$value = $datenotinstring;

-				} else {

+				}

+				else

+				{

 					$value = $obj->$tmpkey;

 				}

 				// If field is a computed field, we make computation to get value

@@ -53,13 +55,13 @@
 				print '</td>';

 				if (!$i) $totalarray['nbfield']++;

 

-				if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {

-					if (!$i) {

-						// we keep position for the first line

-						$totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];

-					}

-					if (is_numeric($obj->$tmpkey)) $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;

-				}

+                if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {

+                    if (!$i) {

+                        // we keep position for the first line

+                        $totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];

+                    }

+                    $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;

+                }

 				if (!empty($val['isameasure']))

 				{

 					if (!$i) $totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_extrafields_list_search_input.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_extrafields_list_search_input.tpl.php
@@ -5,8 +5,8 @@
 // Protection to avoid direct call of template

 if (empty($conf) || !is_object($conf))

 {

-	print "Error, template page can't be called as URL";

-	exit;

+    print "Error, template page can't be called as URL";

+    exit;

 }

 

 if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;

@@ -14,37 +14,40 @@
 // Loop to show all columns of extrafields for the search title line

 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...

 {

-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))

-	{

-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

-		if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';

+    if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))

+    {

+        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

+        if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';

 

-		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)

-		{

-			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {

-				$align = $extrafields->getAlignFlag($key);

-				$typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];

+        foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)

+        {

+            if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {

+                $align = $extrafields->getAlignFlag($key);

+                $typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];

 

-				print '<td class="liste_titre'.($align ? ' '.$align : '').'">';

-				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);

-				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))

-				{

-					$searchclass = '';

-					if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';

-					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';

-					print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';

-				} elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))

-				{

-					// TODO

-					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes

-				} else {

-					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')

-					$morecss = '';

-					if (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) $morecss = 'maxwidth200';

-					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);

-				}

-				print '</td>';

-			}

-		}

-	}

+                print '<td class="liste_titre'.($align ? ' '.$align : '').'">';

+                $tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);

+                if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))

+                {

+                    $searchclass = '';

+                    if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';

+                    if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';

+                    print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';

+                }

+                elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))

+                {

+                	// TODO

+                	// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes

+                }

+                else

+                {

+                    // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')

+                    $morecss = '';

+                    if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss = 'maxwidth200';

+                    echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);

+                }

+                print '</td>';

+            }

+        }

+    }

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_extrafields_list_search_param.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_extrafields_list_search_param.tpl.php
@@ -10,12 +10,12 @@
 // Loop to complete $param for extrafields

 if (!empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...

 {

-	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';

+    if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';

 

-	foreach ($search_array_options as $key => $val)

-	{

-		$crit = $val;

-		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);

-		if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);

-	}

+    foreach ($search_array_options as $key => $val)

+    {

+        $crit = $val;

+        $tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);

+        if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);

+    }

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_extrafields_list_search_sql.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_extrafields_list_search_sql.tpl.php
@@ -12,10 +12,10 @@
 // Loop to complete the sql search criterias from extrafields

 if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...

 {

-	if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

-	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';

+    if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

+    if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';

 

-	foreach ($search_array_options as $key => $val)

+    foreach ($search_array_options as $key => $val)

 	{

 		$crit = $val;

 		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);

@@ -24,19 +24,20 @@
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))

 		{

 			$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";

-		} elseif (in_array($typ, array('boolean')))

+		}

+		elseif (in_array($typ, array('boolean')))

 		{

 			if ($crit !== '-1' && $crit !== '') {

 				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." = '".$db->escape($crit)."'";

 				if ($crit == '0') $sql .= " OR ".$extrafieldsobjectprefix.$tmpkey." IS NULL";

 				$sql .= ")";

 			}

-		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))

+		}

+		elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))

 		{

 			$mode_search = 0;

 			if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric

 			if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int

-			if (in_array($typ, array('sellist')) && !is_numeric($crit)) $mode_search = 0;// Search on a foreign key string

 			if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search = 4; // Search on a multiselect field with sql type = text

 			if (is_array($crit)) $crit = implode(' ', $crit); // natural_search() expects a string

 			elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_extrafields_list_search_title.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_extrafields_list_search_title.tpl.php
@@ -15,7 +15,7 @@
 {

 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))

 	{

-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

+        if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';

 

 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)

 		{

@@ -26,11 +26,9 @@
 				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';

 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {

 					print '<th class="liste_titre thseparator"></th>';

-				} else {

-					if (!empty($extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key]) && is_object($langs)) {

-						$langs->load($extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key]);

-					}

-

+				}

+				else

+				{

 					$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];

 

 					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'" data-titlekey="'.$key.'"' : 'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', $disablesortlink, $tooltip)."\n";

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_extrafields_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_extrafields_view.tpl.php
@@ -51,67 +51,71 @@
 if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))

 {

 	$lastseparatorkeyfound = '';

-	$extrafields_collapse_num = '';

-	$extrafields_collapse_num_old = '';

-	$i = 0;

-	foreach ($extrafields->attributes[$object->table_element]['label'] as $tmpkeyextra => $tmplabelextra)

+    $extrafields_collapse_num = '';

+    $extrafields_collapse_num_old = '';

+    $i = 0;

+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)

 	{

 		$i++;

 

 		// Discard if extrafield is a hidden field on form

 

 		$enabled = 1;

-		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra]))

-		{

-			$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra], 1);

-		}

-		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra]))

-		{

-			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra], 1);

+		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$key]))

+		{

+			$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1);

+		}

+		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key]))

+		{

+			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);

 		}

 

 		$perms = 1;

-		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra]))

-		{

-			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra], 1);

-		}

-		//print $tmpkeyextra.'-'.$enabled.'-'.$perms.'-'.$tmplabelextra.$_POST["options_" . $tmpkeyextra].'<br>'."\n";

+		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))

+		{

+			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);

+		}

+		//print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'<br>'."\n";

 

 		if (empty($enabled)) continue; // 0 = Never visible field

 		if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation

 		if (empty($perms)) continue; // 0 = Not visible

 

 		// Load language if required

-		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]);

+		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);

 		if ($action == 'edit_extras')

 		{

-			$value = (GETPOSTISSET("options_".$tmpkeyextra) ? GETPOST("options_".$tmpkeyextra) : $object->array_options["options_".$tmpkeyextra]);

-		} else {

-			$value = $object->array_options["options_".$tmpkeyextra];

-			//var_dump($tmpkeyextra.' - '.$value);

+			$value = (isset($_POST["options_".$key]) ? $_POST["options_".$key] : $object->array_options["options_".$key]);

+		}

+		else

+		{

+			$value = $object->array_options["options_".$key];

+			//var_dump($key.' - '.$value);

 		}

 

 		// Print line tr of extra field

-		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate')

-		{

-			$extrafields_collapse_num = '';

-			$extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];

-			if (!empty($extrafield_param) && is_array($extrafield_param)) {

-				$extrafield_param_list = array_keys($extrafield_param['options']);

-

-				if (count($extrafield_param_list) > 0) {

-					$extrafield_collapse_display_value = intval($extrafield_param_list[0]);

-

-					if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {

-						$extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];

-					}

-				}

-			}

-

-			print $extrafields->showSeparator($tmpkeyextra, $object);

-

-			$lastseparatorkeyfound = $tmpkeyextra;

-		} else {

+		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')

+		{

+            $extrafields_collapse_num = '';

+            $extrafield_param = $extrafields->attributes[$object->table_element]['param'][$key];

+            if (!empty($extrafield_param) && is_array($extrafield_param)) {

+                $extrafield_param_list = array_keys($extrafield_param['options']);

+

+                if (count($extrafield_param_list) > 0) {

+                    $extrafield_collapse_display_value = intval($extrafield_param_list[0]);

+

+                    if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {

+                        $extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$key];

+                    }

+                }

+            }

+

+			print $extrafields->showSeparator($key, $object);

+

+			$lastseparatorkeyfound = $key;

+		}

+		else

+		{

 			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;

 			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {

 				print ' trextrafields_collapse_new';

@@ -126,15 +130,10 @@
 			print '<tr>';

 

 			print '<td class="';

-			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) print ' fieldrequired';

+			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';

 			print '">';

-			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) {

-				// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.

-				$tmptooltip = explode(':', $extrafields->attributes[$object->table_element]['help'][$tmpkeyextra]);

-				print $form->textwithpicto($langs->trans($tmplabelextra), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.$tmpkeyextra.'_'.$tmptooltip[1]));

-			} else {

-				print $langs->trans($tmplabelextra);

-			}

+			if (!empty($extrafields->attributes[$object->table_element]['help'][$key])) print $form->textwithpicto($langs->trans($label), $langs->trans($extrafields->attributes[$object->table_element]['help'][$key]));

+			else print $langs->trans($label);

 			print '</td>';

 

 			//TODO Improve element and rights detection

@@ -146,69 +145,60 @@
 			if ($object->element == 'order_supplier')   $permok = $user->rights->fournisseur->commande->creer;

 			if ($object->element == 'invoice_supplier') $permok = $user->rights->fournisseur->facture->creer;

 			if ($object->element == 'shipping')         $permok = $user->rights->expedition->creer;

-			if ($object->element == 'delivery')         $permok = $user->rights->expedition->delivery->creer;

+			if ($object->element == 'delivery')         $permok = $user->rights->expedition->livraison->creer;

 			if ($object->element == 'productlot')       $permok = $user->rights->stock->creer;

 			if ($object->element == 'facturerec') 	    $permok = $user->rights->facture->creer;

 			if ($object->element == 'mo') 	    		$permok = $user->rights->mrp->write;

 

 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));

-			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))

-				&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $tmpkeyextra)

-				&& empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))

-			{

-				$fieldid = 'id';

-				if ($object->table_element == 'societe') $fieldid = 'socid';

-				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';

+			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key]))

+				&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $key)

+			    && empty($extrafields->attributes[$object->table_element]['computed'][$key]))

+			{

+			    $fieldid = 'id';

+			    if ($object->table_element == 'societe') $fieldid = 'socid';

+			    print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$key.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';

 			}

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

 			print '</td>';

 

-			$html_id = !empty($object->id) ? $object->element.'_extras_'.$tmpkeyextra.'_'.$object->id : '';

-

-			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$tmpkeyextra.' wordbreak"'.($cols ? ' colspan="'.$cols.'"' : '').'>';

+			$html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : '';

+

+			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$key.' wordbreak"'.($cols ? ' colspan="'.$cols.'"' : '').'>';

 

 			// Convert date into timestamp format

-			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date')))

-			{

-				$datenotinstring = $object->array_options['options_'.$tmpkeyextra];

-				// print 'X'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.'x';

-				if (!is_numeric($object->array_options['options_'.$tmpkeyextra]))	// For backward compatibility

+			if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date', 'datetime')))

+			{

+				$datenotinstring = $object->array_options['options_'.$key];

+				// print 'X'.$object->array_options['options_' . $key].'-'.$datenotinstring.'x';

+				if (!is_numeric($object->array_options['options_'.$key]))	// For backward compatibility

 				{

 					$datenotinstring = $db->jdate($datenotinstring);

 				}

-				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');

-				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(12, 0, 0, GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int')) : $datenotinstring;

-			}

-			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('datetime')))

-			{

-				$datenotinstring = $object->array_options['options_'.$tmpkeyextra];

-				// print 'X'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.'x';

-				if (!is_numeric($object->array_options['options_'.$tmpkeyextra]))	// For backward compatibility

-				{

-					$datenotinstring = $db->jdate($datenotinstring);

-				}

-				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');

-				$value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(GETPOST("options_".$tmpkeyextra."hour", 'int'), GETPOST("options_".$tmpkeyextra."min", 'int'), GETPOST("options_".$tmpkeyextra."sec", 'int'), GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int'), 'tzuserrel') : $datenotinstring;

+				//print 'x'.$object->array_options['options_' . $key].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');

+				$value = isset($_POST["options_".$key]) ? dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]) : $datenotinstring;

 			}

 

 			//TODO Improve element and rights detection

-			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra)

-			{

-				$fieldid = 'id';

-				if ($object->table_element == 'societe') $fieldid = 'socid';

-				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';

+			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $key)

+			{

+			    $fieldid = 'id';

+			    if ($object->table_element == 'societe') $fieldid = 'socid';

+			    print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';

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

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

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

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

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

-				print $extrafields->showInputField($tmpkeyextra, $value, '', '', '', 0, $object->id, $object->table_element);

+				print $extrafields->showInputField($key, $value, '', '', '', 0, $object->id, $object->table_element);

 

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

 

 				print '</form>';

-			} else {

-				//var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element);

-				print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element);

+			}

+			else

+			{

+				//var_dump($key.'-'.$value.'-'.$object->table_element);

+				print $extrafields->showOutputField($key, $value, '', $object->table_element);

 			}

 

 			print '</td>';

@@ -223,7 +213,7 @@
 	{

 		print "\n";

 		print '

-				<script>

+				<script type="text/javascript">

 				    jQuery(document).ready(function() {

 				    	function showOptions(child_list, parent_list)

 				    	{

@@ -242,9 +232,6 @@
 								var parent = $(this).find("option[parent]:first").attr("parent");

 								var infos = parent.split(":");

 								var parent_list = infos[0];

-								showOptions(child_list, parent_list);

-

-								/* Activate the handler to call showOptions on each future change */

 								$("select[name=\""+parent_list+"\"]").change(function() {

 									showOptions(child_list, parent_list);

 								});

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_filemanager.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_filemanager.tpl.php
@@ -74,18 +74,20 @@
 // Toolbar

 if ($permtoadd)

 {

-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';

-	print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';

-	print '</a>';

-} else {

-	print '<a href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';

-	print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';

-	print '</a>';

+	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';

+    print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';

+    print '</a>';

+}

+else

+{

+    print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';

+    print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';

+    print '</a>';

 }

 if ($module == 'ecm')

 {

 	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));

-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';

+	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';

 	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';

 	print '</a>';

 }

@@ -101,7 +103,7 @@
 	if ((empty($section) || $section == -1) && ($module != 'medias'))

 	{

 		?>

-		<script>

+		<script type="text/javascript">

     	jQuery(document).ready(function() {

 			jQuery('#<?php echo $nameforformuserfile ?>').hide();

     	});

@@ -112,9 +114,10 @@
 	$sectiondir = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');

 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";

 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';

-	$formfile = new FormFile($db);

-	$formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);

-} else print '&nbsp;';

+    $formfile = new FormFile($db);

+    $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);

+}

+else print '&nbsp;';

 

 print '</div>';

 // End "Add new file" area

@@ -133,7 +136,7 @@
 // Ask confirmation of deletion of directory

 if ($action == 'delete_section')

 {

-	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);

+    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);

 }

 // End confirm

 

@@ -146,54 +149,56 @@
 

 	print '<!-- Title for manual directories -->'."\n";

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

-	print '<th class="liste_titre left">';

-	print '&nbsp;'.$langs->trans("ECMSections");

+    print '<th class="liste_titre left">';

+    print '&nbsp;'.$langs->trans("ECMSections");

 	print '</th></tr>';

 

-	$showonrightsize = '';

+    $showonrightsize = '';

 

 	// Manual section

 	$htmltooltip = $langs->trans("ECMAreaDesc2");

 

-	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))

-	{

-		// Show the link to "Root"

-		if ($showroot)

-		{

-			print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';

-			if ($module == 'medias') print $langs->trans("RootOfMedias");

-			else print $langs->trans("Root");

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

-		}

-

-		print '<tr><td>';

-

-		// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)

-		print '<div id="filetree" class="ecmfiletree"></div>';

-

-		if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');

-

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

-	} else { // Show filtree when ajax is disabled (rare)

-		print '<tr><td style="padding-left: 20px">';

-

-		$_POST['modulepart'] = $module;

-		$_POST['openeddir'] = GETPOST('openeddir');

-		$_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];

-

-		// Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)

-		print '<div id="filetree" class="ecmfiletree">';

-

-		// Variables that may be defined:

-		// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']

-		// $_POST['dir']

-		$mode = 'noajax';

-		if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';

-		include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';

-

-		print '</div>';

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

-	}

+    if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))

+    {

+    	// Show the link to "Root"

+    	if ($showroot)

+    	{

+    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';

+    		if ($module == 'medias') print $langs->trans("RootOfMedias");

+    		else print $langs->trans("Root");

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

+    	}

+

+    	print '<tr><td>';

+

+    	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)

+	    print '<div id="filetree" class="ecmfiletree"></div>';

+

+	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');

+

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

+    }

+    else	// Show file tree when ajax is disabled (rare)

+    {

+        print '<tr><td style="padding-left: 20px">';

+

+        $_POST['modulepart'] = $module;

+        $_POST['openeddir'] = GETPOST('openeddir');

+        $_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];

+

+        // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)

+        print '<div id="filetree" class="ecmfiletree">';

+

+        // Variables that may be defined:

+        // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']

+        // $_POST['dir']

+        $mode = 'noajax';

+        if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';

+        include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';

+

+    	print '</div>';

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

+    }

 

 

 	print "</table>";

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_list_print_total.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_list_print_total.tpl.php
@@ -15,12 +15,14 @@
 	{

 		$i++;

 		if (!empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';

-		else {

+		else

+		{

 			if ($i == 1)

 			{

 				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';

 				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';

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

+			}

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

 		}

 	}

 	print '</tr>';

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_login.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_login.tpl.php
@@ -20,12 +20,10 @@
 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);

 

 

-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);

-

 // Protection to avoid direct call of template

 if (empty($conf) || !is_object($conf)) {

-	print "Error, template page can't be called as URL";

-	exit;

+    print "Error, template page can't be called as URL";

+    exit;

 }

 

 

@@ -52,14 +50,7 @@
 	'/includes/jstz/jstz.min.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION)),

 	'/core/js/dst.js'.(empty($conf->dol_use_jmobile) ? '' : '?version='.urlencode(DOL_VERSION))

 );

-

-// We display application title instead Login term

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

-	$titleofloginpage = $conf->global->MAIN_APPLICATION_TITLE;

-} else {

-	$titleofloginpage = $langs->trans('Login');

-}

-$titleofloginpage .= ' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.

+$titleofloginpage = $langs->trans('Login').' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.

 

 $disablenofollow = 1;

 if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenofollow = 0;

@@ -88,7 +79,7 @@
 ?>

 

 <?php if (empty($conf->dol_use_jmobile)) { ?>

-<script>

+<script type="text/javascript">

 $(document).ready(function () {

 	/* Set focus on correct field */

 	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element

@@ -149,7 +140,8 @@
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">

 <?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?>

 <!-- <span class="span-icon-user">-->

-<span class="fa fa-user"></span>

+<span class="fa fa-user">

+</span>

 <input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />

 </div>

 </div>

@@ -159,35 +151,12 @@
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">

 <?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?>

 <!--<span class="span-icon-password">-->

-<span class="fa fa-key"></span>

+<span class="fa fa-key">

+</span>

 <input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />

 </div></div>

 

 <?php

-if ($captcha) {

-	// Add a variable param to force not using cache (jmobile)

-	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time

-	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');

-	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');

-	// TODO: provide accessible captcha variants

-	?>

-	<!-- Captcha -->

-	<div class="trinputlogin">

-	<div class="tagtd none valignmiddle tdinputlogin">

-

-	<span class="fa fa-unlock"></span>

-	<span class="span-icon-security inline-block">

-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />

-	</span>

-	<span class="nowrap inline-block">

-	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />

-	<a class="inline-block valignmiddle" href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a>

-	</span>

-

-	</div></div>

-	<?php

-}

-

 if (!empty($morelogincontent)) {

 	if (is_array($morelogincontent)) {

 		foreach ($morelogincontent as $format => $option)

@@ -197,13 +166,38 @@
 				echo $option;

 			}

 		}

-	} else {

+	}

+	else {

 		echo '<!-- Option by hook -->';

 		echo $morelogincontent;

 	}

 }

 

-?>

+if ($captcha) {

+	// Add a variable param to force not using cache (jmobile)

+	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time

+	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');

+	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');

+	// TODO: provide accessible captcha variants

+	?>

+	<!-- Captcha -->

+	<div class="trinputlogin">

+	<div class="tagtd nowraponall none center valignmiddle tdinputlogin">

+

+	<table class="login_table_securitycode centpercent">

+	<tr class="valignmiddle">

+	<td>

+	<span class="span-icon-security">

+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />

+	</span>

+	</td>

+	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>

+	<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>

+	</tr>

+	</table>

+

+	</div></div>

+<?php } ?>

 

 </div>

 

@@ -261,7 +255,8 @@
 

 	$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;

 	if (!empty($url)) print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';

-	else {

+	else

+	{

 		$langs->load("errors");

 		print '<font class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</font>';

 	}

@@ -293,18 +288,18 @@
 

 // Add commit strip

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

-	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

+    include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';

 	if (substr($langs->defaultlang, 0, 2) == 'fr') {

-		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/fr/feed/");

+		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/fr/feed/");

 	} else {

-		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/en/feed/");

-	}

-	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')

-	{

-		$xml = simplexml_load_string($resgetcommitstrip['content']);

-		$little = $xml->channel->item[0]->children('content', true);

-		print preg_replace('/width="650" height="658"/', '', $little->encoded);

-	}

+		$resgetcommitstrip = getURLContent("http://www.commitstrip.com/en/feed/");

+	}

+    if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')

+    {

+        $xml = simplexml_load_string($resgetcommitstrip['content']);

+        $little = $xml->channel->item[0]->children('content', true);

+        print preg_replace('/width="650" height="658"/', '', $little->encoded);

+    }

 }

 

 ?>

@@ -336,7 +331,8 @@
 			echo $option."\n";

 		}

 	}

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

+}

+elseif (!empty($moreloginextracontent)) {

 	echo '<!-- Javascript by hook -->';

 	echo $moreloginextracontent;

 }

@@ -346,7 +342,7 @@
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))

 {

 	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);

-	foreach ($tmptagarray as $tmptag) {

+	foreach($tmptagarray as $tmptag) {

 		print "\n";

 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";

 		print "

@@ -363,22 +359,23 @@
 	}

 }

 

-// TODO Replace this with a hook

-// Google Adsense (need Google module)

+// Google Adsense

 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))

 {

 	if (empty($conf->dol_use_jmobile))

 	{

 		?>

 	<div class="center"><br>

-		<script><!--

+		<script type="text/javascript"><!--

 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";

 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";

 			google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;

 			google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;

 			//-->

 		</script>

-		<script src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>

+		<script type="text/javascript"

+			src="http://pagead2.googlesyndication.com/pagead/show_ads.js">

+		</script>

 	</div>

 		<?php

 	}

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_massactions_pre.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_massactions_pre.tpl.php
@@ -69,7 +69,7 @@
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

 	$formmail = new FormMail($db);

 

-	print dol_get_fiche_head(null, '', '');

+	dol_fiche_head(null, '', '');

 

 	// Cree l'objet formulaire mail

 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

@@ -98,7 +98,9 @@
 			$fuser = new User($db);

 			$fuser->fetch($thirdpartyid);

 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";

-		} else {

+		}

+		else

+		{

 			$soc = new Societe($db);

 			$soc->fetch($thirdpartyid);

 			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {

@@ -156,11 +158,13 @@
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);

 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';

 		$arrayofmassactions = array();

-	} else {

+	}

+	else

+	{

 		print $formmail->get_form();

 	}

 

-	print dol_get_fiche_end();

+	dol_fiche_end();

 }

 // Allow Pre-Mass-Action hook (eg for confirmation dialog)

 $parameters = array(

@@ -170,7 +174,7 @@
 

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

 if ($reshook < 0) {

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

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

 } else {

-	print $hookmanager->resPrint;

+    print $hookmanager->resPrint;

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_notes.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_notes.tpl.php
@@ -57,29 +57,17 @@
 }

 

 // Special cases

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

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

-} elseif ($module == 'supplier_proposal') {

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

-} elseif ($module == 'fichinter') {

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

-} elseif ($module == 'project') {

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

-} elseif ($module == 'project_task') {

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

-} elseif ($module == 'invoice_supplier') {

-	$permission = $user->rights->fournisseur->facture->creer;

-} elseif ($module == 'order_supplier') {

-	$permission = $user->rights->fournisseur->commande->creer;

-} elseif ($module == 'societe') {

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

-} elseif ($module == 'contact') {

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

-} elseif ($module == 'shipping') {

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

-} elseif ($module == 'product') {

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

-}

+if ($module == 'propal') { $permission = $user->rights->propale->creer; }

+elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; }

+elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }

+elseif ($module == 'project') { $permission = $user->rights->projet->creer; }

+elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }

+elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }

+elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }

+elseif ($module == 'societe') { $permission = $user->rights->societe->creer; }

+elseif ($module == 'contact') { $permission = $user->rights->societe->creer; }

+elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }

+elseif ($module == 'product') { $permission = $user->rights->produit->creer; }

 //else dol_print_error('','Bad value '.$module.' for param module');

 

 if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.

@@ -87,23 +75,24 @@
 

 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";

 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";

-print '<div class="tagtr table-border-row">'."\n";

-$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_public);

-print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";

-print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);

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

-print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";

-print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";

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

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

+if ($module != 'product') {

+	// No public note yet on products

+	print '<div class="tagtr table-border-row">'."\n";

+	print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";

+	print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);

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

+	print '<div class="tagtd table-val-border-col sensiblehtmlcontent">'."\n";

+	print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";

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

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

+}

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

 	// Private notes (always hidden to external users)

 	print '<div class="tagtr table-border-row">'."\n";

-	$editmode = (GETPOST('action', 'aZ09') == 'edit'.$note_private);

-	print '<div class="tagtd tagtdnote tdtop'.($editmode ? '' : ' sensiblehtmlcontent').' table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";

+	print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";

 	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);

 	print '</div>'."\n";

-	print '<div class="tagtd wordbreak table-val-border-col'.($editmode ? '' : ' sensiblehtmlcontent').'">'."\n";

+	print '<div class="tagtd table-val-border-col sensiblehtmlcontent">'."\n";

 	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);

 	print '</div>'."\n";

 	print '</div>'."\n";

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_object_discounts.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_object_discounts.tpl.php
@@ -42,9 +42,11 @@
 {

 	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';

 	print $langs->trans($translationKey, $fixedDiscount).'.';

-} else {

+}

+else

+{

 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';

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

+	print $langs->trans($translationKey).'.';

 }

 if ($isNewObject) print ' ('.$addrelativediscount.')';

 

@@ -62,11 +64,7 @@
 			$text .= ' ('.$addabsolutediscount.')';

 		}

 

-		if ($isNewObject) {

-			print '<br>'.$text;

-		} else {

-			print '<div class="inline-block clearboth">'.$text.'</div>';

-		}

+		print '<br>'.$text;

 	} else {

 		// Discount available of type fixed amount (not credit note)

 		$more = '('.$addabsolutediscount.')';

@@ -89,11 +87,7 @@
 			$text .= '('.$addabsolutediscount.')';

 		}

 

-		if ($isNewObject) {

-			print '<br>'.$text;

-		} else {

-			print '<div class="inline-block clearboth">'.$text.'</div>';

-		}

+		print '<br>'.$text;

 	} else {  // We can add a credit note on a down payment or standard invoice or situation invoice

 		// There is credit notes discounts available

 		$more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : '';

@@ -103,7 +97,7 @@
 

 if ($absolute_discount <= 0 && $absolute_creditnote <= 0) {

 	$translationKey = !empty($discount_type) ? 'HasNoAbsoluteDiscountFromSupplier' : 'CompanyHasNoAbsoluteDiscount';

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

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

 

 	if ($isInvoice && $object->statut == $objclassname::STATUS_DRAFT && $object->type != $objclassname::TYPE_CREDIT_NOTE && $object->type != $objclassname::TYPE_DEPOSIT) {

 		print ' ('.$addabsolutediscount.')';

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_objectline_create.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_objectline_create.tpl.php
@@ -32,7 +32,6 @@
  * $senderissupplier (0 by default, 1 or 2 for supplier invoices/orders)

  * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)

  */

-

 // Protection to avoid direct call of template

 if (empty($object) || !is_object($object)) {

 	print "Error: this template page cannot be called directly as an URL";

@@ -61,19 +60,26 @@
 {

 	if ($this->table_element_line == 'commandedet') {

 		$objectline = new OrderLine($this->db);

-	} elseif ($this->table_element_line == 'propaldet') {

+	}

+	elseif ($this->table_element_line == 'propaldet') {

 		$objectline = new PropaleLigne($this->db);

-	} elseif ($this->table_element_line == 'supplier_proposaldet') {

+	}

+	elseif ($this->table_element_line == 'supplier_proposaldet') {

 		$objectline = new SupplierProposalLine($this->db);

-	} elseif ($this->table_element_line == 'facturedet') {

+	}

+	elseif ($this->table_element_line == 'facturedet') {

 		$objectline = new FactureLigne($this->db);

-	} elseif ($this->table_element_line == 'contratdet') {

+	}

+	elseif ($this->table_element_line == 'contratdet') {

 		$objectline = new ContratLigne($this->db);

-	} elseif ($this->table_element_line == 'commande_fournisseurdet') {

+	}

+	elseif ($this->table_element_line == 'commande_fournisseurdet') {

 		$objectline = new CommandeFournisseurLigne($this->db);

-	} elseif ($this->table_element_line == 'facture_fourn_det') {

+	}

+	elseif ($this->table_element_line == 'facture_fourn_det') {

 		$objectline = new SupplierInvoiceLine($this->db);

-	} elseif ($this->table_element_line == 'facturedet_rec') {

+	}

+	elseif ($this->table_element_line == 'facturedet_rec') {

 		$objectline = new FactureLigneRec($this->db);

 	}

 }

@@ -86,7 +92,7 @@
 			<td class="linecolnum center"></td>

 		<?php } ?>

 		<td class="linecoldescription minwidth500imp">

-			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>

+			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>

 		</td>

 		<?php

 		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines

@@ -106,7 +112,7 @@
 		<?php } ?>

 		<td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td>

 		<?php

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

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

 		{

 			print '<td class="linecoluseunit left">';

 			print '<span id="title_units">';

@@ -125,11 +131,13 @@
 		{

 			if (empty($user->rights->margins->creer)) {

 				$colspan++;

-			} else {

+			}

+			else {

 				print '<td class="margininfos linecolmargin1 right">';

 				if ($conf->global->MARGIN_TYPE == "1")

 					echo $langs->trans('BuyingPrice');

-				else echo $langs->trans('CostPrice');

+				else

+					echo $langs->trans('CostPrice');

 				echo '</td>';

 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';

 				if (!empty($conf->global->DISPLAY_MARK_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';

@@ -172,13 +180,15 @@
 				echo '<label for="prod_entry_mode_free">';

 				echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';

 				//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );

-				echo ((GETPOST('prod_entry_mode', 'alpha') == 'free' || !empty($conf->global->MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT)) ? ' checked' : '');

+				echo ((GETPOST('prod_entry_mode', 'alpha') == 'free' || ! empty($conf->global->MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT)) ? ' checked' : '');

 				echo '> ';

 				// Show type selector

 				echo $langs->trans("FreeLineOfType");

 				echo '</label>';

 				echo ' ';

-			} else {

+			}

+			else

+			{

 				echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';

 				// Show type selector

 				if ($forceall >= 0)

@@ -203,7 +213,9 @@
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');

 				elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');

 				else echo $langs->trans('PredefinedProductsAndServicesToSell');

-			} else {

+			}

+			else

+			{

 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');

 				elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');

 				else echo $langs->trans('PredefinedProductsAndServicesToPurchase');

@@ -215,16 +227,19 @@
 			if (empty($senderissupplier))

 			{

 				$statustoshow = 1;

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

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

+				{

 					// hide products in closed warehouse, but show products for internal transfer

 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));

-				} else {

+				}

+				else

+				{

 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));

 				}

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

 				{

 					?>

-				<script>

+				<script type="text/javascript">

 					$(document).ready(function(){

 						// On first focus on a select2 combo, auto open the menu (this allow to use the keyboard only)

 						$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {

@@ -239,19 +254,23 @@
 				</script>

 					<?php

 				}

-			} else {

-				// $senderissupplier=2 is the same as 1 but disables test on minimum qty, disable autofill qty with minimum and autofill unit price

+			}

+			else

+			{

+				// $senderissupplier=2 is the same as 1 but disables test on minimum qty and disable autofill qty with minimum

 				if ($senderissupplier != 2)

 				{

 					$ajaxoptions = array(

-						'update' => array('qty'=>'qty', 'remise_percent' => 'discount', 'idprod' => 'idprod'), // html id tags that will be edited with each ajax json response key

-						'option_disabled' => 'idthatdoesnotexists', // html id to disable once select is done

-						'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for example shown we select a disabled option into combo)

+					'update' => array('qty'=>'qty', 'remise_percent' => 'discount', 'idprod' => 'idprod'), // html id tags that will be edited with each ajax json response key

+					'option_disabled' => 'idthatdoesnotexists', // html id to disable once select is done

+					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for example shown we select a disabled option into combo)

 					);

 					$alsoproductwithnosupplierprice = 0;

-				} else {

+				}

+				else

+				{

 					$ajaxoptions = array(

-						'update' => array('remise_percent' => 'discount', 'price_ht' => 'up')			// html id tags that will be edited with each ajax json response key

+					'update' => array('remise_percent' => 'discount')			// html id tags that will be edited with each ajax json response key

 					);

 					$alsoproductwithnosupplierprice = 1;

 				}

@@ -259,7 +278,7 @@
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS))

 				{

 					?>

-				<script>

+				<script type="text/javascript">

 					$(document).ready(function(){

 						// On first focus on a select2 combo, auto open the menu (this allow to use the keyboard only)

 						$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {

@@ -306,7 +325,7 @@
 		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;

 		$toolbarname = 'dolibarr_details';

 		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';

-		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc', 'restricthtml'), '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');

+		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc', 'none'), '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');

 		$doleditor->Create();

 		// Show autofill date for recurring invoices

 		if (!empty($conf->service->enabled) && $object->element == 'facturerec')

@@ -324,17 +343,17 @@
 		{

 			$coldisplay++;

 			?>

-	<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo (GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>

+	<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo (isset($_POST["fourn_ref"]) ?GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>

         <?php }

 		print '<td class="nobottom linecolvat right">';

 		$coldisplay++;

 		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);

-		else echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);

+		else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"]) ?GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);

 		?>

 	</td>

 

 	<td class="nobottom linecoluht right"><?php $coldisplay++; ?>

-		<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (GETPOSTISSET("price_ht") ? GETPOST("price_ht", 'alpha', 2) : ''); ?>">

+		<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (isset($_POST["price_ht"]) ?GETPOST("price_ht", 'alpha', 2) : ''); ?>">

 	</td>

 

 	<?php

@@ -342,7 +361,7 @@
 		$coldisplay++;

 		?>

 		<td class="nobottom linecoluht_currency right">

-			<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (GETPOSTISSET("multicurrency_price_ht") ? GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">

+			<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (isset($_POST["multicurrency_price_ht"]) ?GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">

 		</td>

 		<?php

 	}

@@ -350,19 +369,19 @@
 		$coldisplay++;

 		?>

 		<td class="nobottom linecoluttc right">

-			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (GETPOSTISSET("price_ttc") ? GETPOST("price_ttc", 'alpha', 2) : ''); ?>">

+			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat" value="<?php echo (isset($_POST["price_ttc"]) ?GETPOST("price_ttc", 'alpha', 2) : ''); ?>">

 		</td>

 		<?php

 	}

 	$coldisplay++;

 	?>

-	<td class="nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1); ?>">

+	<td class="nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="<?php echo (isset($_POST["qty"]) ?GETPOST("qty", 'alpha', 2) : 1); ?>">

 	</td>

 	<?php

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

 		$coldisplay++;

 		print '<td class="nobottom linecoluseunit left">';

-		print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");

+		print $form->selectUnits($line->fk_unit, "units");

 		print '</td>';

 	}

 	$remise_percent = $buyer->remise_percent;

@@ -371,7 +390,7 @@
 	}

 	$coldisplay++;

 	?>

-	<td class="nobottom nowrap linecoldiscount right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (GETPOSTISSET("remise_percent") ? GETPOST("remise_percent", 'alpha', 2) : $remise_percent); ?>"><span class="hideonsmartphone">%</span></td>

+	<td class="nobottom nowrap linecoldiscount right"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat right" value="<?php echo (isset($_POST["remise_percent"]) ?GETPOST("remise_percent", 'alpha', 2) : $remise_percent); ?>"><span class="hideonsmartphone">%</span></td>

 	<?php

 	if ($this->situation_cycle_ref) {

 		$coldisplay++;

@@ -386,20 +405,20 @@
 			<td class="nobottom margininfos linecolmargin right">

 				<!-- For predef product -->

 				<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>

-					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>

+					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp" style="display: none;"></select>

 				<?php } ?>

 				<!-- For free product -->

-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 maxwidth150 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">

+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (isset($_POST["buying_price"]) ?GETPOST("buying_price", 'alpha', 2) : ''); ?>">

 			</td>

 			<?php

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

 			{

-				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';

+				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';

 				$coldisplay++;

 			}

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

 			{

-				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';

+				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';

 				$coldisplay++;

 			}

 		}

@@ -419,72 +438,25 @@
 if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required

 {

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

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

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

-	}

+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td></td>'; }

 	print '<td colspan="'.($coldisplay - (empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? 0 : 1)).'">';

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

 	$date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));

-

-	$prefillDates = false;

-

-	if (!empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && !empty($object->lines))

-	{

-		for ($i = count($object->lines) - 1; $i >= 0; $i--)

-		{

-			$lastline = $object->lines[$i];

-

-			if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end)))

-			{

-				$date_start_prefill = $lastline->date_start;

-				$date_end_prefill = $lastline->date_end;

-

-				$prefillDates = true;

-				break;

-			}

-		}

-	}

-

-

 	if (!empty($object->element) && $object->element == 'contrat')

 	{

 		print $langs->trans("DateStartPlanned").' ';

 		print $form->selectDate($date_start, "date_start", $usehm, $usehm, 1, "addproduct");

 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';

 		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");

-	} else {

+	}

+	else

+	{

 		print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';

 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);

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

 		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);

 	};

-

-	if ($prefillDates)

-	{

-		echo ' <span class="small"><a href="#" id="prefill_service_dates">'.$langs->trans('FillWithLastServiceDates').'</a></span>';

-	}

-

 	print '<script>';

-

-	if ($prefillDates)

-	{

-		?>

-        function prefill_service_dates()

-        {

-            $('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, '%d/%m/%Y')); ?>").trigger('change');

-            $('#date_end').val("<?php echo dol_escape_js(dol_print_date($date_end_prefill, '%d/%m/%Y')); ?>").trigger('change');

-

-            return false; // Prevent default link behaviour (which is go to href URL)

-        }

-

-        $(document).ready(function()

-        {

-            $('#prefill_service_dates').click(prefill_service_dates);

-        });

-

-		<?php

-	}

-

 	if (!$date_start) {

 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {

 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';

@@ -532,47 +504,47 @@
 	/* TODO This does not work for number with thousand separator that is , */

 	function checkFreeLine(e, npRate)

 	{

-		var buying_price = $("input[name='buying_price']:first");

-		var remise = $("input[name='remise_percent']:first");

-

-		var rate = $("input[name='"+npRate+"']:first");

-		if (rate.val() == '')

-			return true;

-

-		if (! $.isNumeric(rate.val().replace(',','.')))

-		{

-			alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');

-			e.stopPropagation();

-			setTimeout(function () { rate.focus() }, 50);

-			return false;

-		}

-		if (npRate == "np_markRate" && rate.val() >= 100)

-		{

-			alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');

-			e.stopPropagation();

-			setTimeout(function () { rate.focus() }, 50);

-			return false;

-		}

-

-		var price = 0;

-		remisejs=price2numjs(remise.val());

-

-		if (remisejs != 100)	// If a discount not 100 or no discount

-		{

-			if (remisejs == '') remisejs=0;

-

-			bpjs=price2numjs(buying_price.val());

-			ratejs=price2numjs(rate.val());

-

-			if (npRate == "np_marginRate")

-				price = ((bpjs * (1 + ratejs / 100)) / (1 - remisejs / 100));

-			else if (npRate == "np_markRate")

-				price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));

-		}

-

-		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formated value

-

-		return true;

+	var buying_price = $("input[name='buying_price']:first");

+	var remise = $("input[name='remise_percent']:first");

+

+	var rate = $("input[name='"+npRate+"']:first");

+	if (rate.val() == '')

+	return true;

+

+	if (! $.isNumeric(rate.val().replace(',','.')))

+	{

+	alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');

+	e.stopPropagation();

+	setTimeout(function () { rate.focus() }, 50);

+	return false;

+	}

+	if (npRate == "np_markRate" && rate.val() >= 100)

+	{

+	alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');

+	e.stopPropagation();

+	setTimeout(function () { rate.focus() }, 50);

+	return false;

+	}

+

+	var price = 0;

+	remisejs=price2numjs(remise.val());

+

+	if (remisejs != 100)	// If a discount not 100 or no discount

+	{

+	if (remisejs == '') remisejs=0;

+

+	bpjs=price2numjs(buying_price.val());

+	ratejs=price2numjs(rate.val());

+

+	if (npRate == "np_marginRate")

+	price = ((bpjs * (1 + ratejs / 100)) / (1 - remisejs / 100));

+	else if (npRate == "np_markRate")

+	price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));

+	}

+

+	$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formated value

+

+	return true;

 	}

 

 	<?php

@@ -604,39 +576,39 @@
 	});

 

 	$("#prod_entry_mode_free").on( "click", function() {

-		setforfree();

+	setforfree();

 	});

 	$("#select_type").change(function()

 	{

-		setforfree();

-		if (jQuery('#select_type').val() >= 0)

-		{

-			/* focus work on a standard textarea but not if field was replaced with CKEDITOR */

-			jQuery('#dp_desc').focus();

-			/* focus if CKEDITOR */

-			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")

-			{

-				var editor = CKEDITOR.instances['dp_desc'];

-				if (editor) { editor.focus(); }

-			}

-		}

-		console.log("Hide/show date according to product type");

-		if (jQuery('#select_type').val() == '0')

-		{

-			jQuery('#trlinefordates').hide();

-			jQuery('.divlinefordates').hide();

-		}

-		else

-		{

-			jQuery('#trlinefordates').show();

-			jQuery('.divlinefordates').show();

-		}

+	setforfree();

+	if (jQuery('#select_type').val() >= 0)

+	{

+	/* focus work on a standard textarea but not if field was replaced with CKEDITOR */

+	jQuery('#dp_desc').focus();

+	/* focus if CKEDITOR */

+	if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")

+	{

+	var editor = CKEDITOR.instances['dp_desc'];

+	if (editor) { editor.focus(); }

+	}

+	}

+	console.log("Hide/show date according to product type");

+	if (jQuery('#select_type').val() == '0')

+	{

+	jQuery('#trlinefordates').hide();

+	jQuery('.divlinefordates').hide();

+	}

+	else

+	{

+	jQuery('#trlinefordates').show();

+	jQuery('.divlinefordates').show();

+	}

 	});

 

 	$("#prod_entry_mode_predef").on( "click", function() {

-		console.log("click prod_entry_mode_predef");

-		setforpredef();

-		jQuery('#trlinefordates').show();

+	console.log("click prod_entry_mode_predef");

+	setforpredef();

+	jQuery('#trlinefordates').show();

 	});

 

 	<?php

@@ -649,7 +621,7 @@
 	/* When changing predefined product, we reload list of supplier prices required for margin combo */

 	$("#idprod, #idprodfournprice").change(function()

 	{

-		console.log("Call method change() after change on #idprod or #idprodfournprice (senderissupplier=<?php echo $senderissupplier; ?>). this.val = "+$(this).val());

+		console.log("Call method change() after change on #idprod or #idprodfournprice. this.val = "+$(this).val());

 

 		setforpredef();		// TODO Keep vat combo visible and set it to first entry into list that match result of get_default_tva

 

@@ -695,8 +667,7 @@
 			$("#buying_price").val("").show();

 

 			/* Call post to load content of combo list fournprice_predef */

-			var token = '<?php echo currentToken(); ?>';		// For AJAX Call we use old 'token' and not 'newtoken'

-			$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php?bestpricefirst=1', { 'idprod': $(this).val(), 'token': token }, function(data) {

+			$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php?bestpricefirst=1', { 'idprod': $(this).val() }, function(data) {

 				if (data && data.length > 0)

 				{

 					var options = ''; var defaultkey = ''; var defaultprice = ''; var bestpricefound = 0;

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_objectline_edit.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_objectline_edit.tpl.php
@@ -1,6 +1,6 @@
 <?php

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

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

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

  * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>

  * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>

  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>

@@ -29,7 +29,6 @@
  * $forceall (0 by default, 1 for supplier invoices/orders)

  * $senderissupplier (0 by default, 1 for supplier invoices/orders)

  * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)

- * $canchangeproduct (0 by default, 1 to allow to change the product if it is a predefined product)

  */

 

 // Protection to avoid direct call of template

@@ -43,12 +42,12 @@
 $usemargins = 0;

 if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;

 

-global $forceall, $senderissupplier, $inputalsopricewithtax, $canchangeproduct;

+global $forceall, $senderissupplier, $inputalsopricewithtax;

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

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

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

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

-if (empty($canchangeproduct)) $canchangeproduct = 0;

+

 

 // Define colspan for the button 'Add'

 $colspan = 3; // Col total ht + col edit + col delete

@@ -72,41 +71,35 @@
 

 	<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">

 	<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">

+	<input type="hidden" id="product_id" name="productid" value="<?php echo (!empty($line->fk_product) ? $line->fk_product : 0); ?>" />

 	<input type="hidden" id="special_code" name="special_code" value="<?php echo $line->special_code; ?>">

 	<input type="hidden" id="fk_parent_line" name="fk_parent_line" value="<?php echo $line->fk_parent_line; ?>">

 

 	<?php if ($line->fk_product > 0) { ?>

 		<?php

-		if (empty($canchangeproduct)) {

-			if ($line->fk_parent_line > 0) echo img_picto('', 'rightarrow');

-			?>

-			<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">

-			<?php

-			if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');

-			else print img_object($langs->trans('ShowProduct'), 'product');

-			echo ' '.$line->ref;

-			?>

-			</a>

-			<?php

-			echo ' - '.nl2br($line->product_label);

-			print '<input type="hidden" id="product_id" name="productid" value="'.(!empty($line->fk_product) ? $line->fk_product : 0).'">';

-		} else {

-			if ($senderissupplier) {

-				print $form->select_produits_fournisseurs(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');

-			} else {

-				print $form->select_produits(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');

-			}

-		}

+		if ($line->fk_parent_line > 0) echo img_picto('', 'rightarrow');

 		?>

+		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">

+		<?php

+		if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');

+		else print img_object($langs->trans('ShowProduct'), 'product');

+		echo ' '.$line->ref;

+		?>

+		</a>

+		<?php

+		echo ' - '.nl2br($line->product_label);

+		?>

+

 		<br><br>

+

 	<?php }	?>

 

 	<?php

 	if (is_object($hookmanager))

 	{

 		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);

-		$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);

-		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);

+	    $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);

+	    $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);

 	}

 

 	// Do not allow editing during a situation cycle

@@ -142,7 +135,7 @@
 	<?php

 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines

 	{

-		$coldisplay++;

+	    $coldisplay++;

 		?>

 		<td class="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>

 		<?php

@@ -161,7 +154,7 @@
 	print '></td>';

 

 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {

-		$coldisplay++;

+	    $coldisplay++;

 		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';

 	}

 

@@ -189,9 +182,9 @@
 	</td>

 

 	<?php

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

-	{

-		$coldisplay++;

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

+	{

+	    $coldisplay++;

 		print '<td class="left">';

 		print $form->selectUnits($line->fk_unit, "units");

 		print '</td>';

@@ -217,10 +210,10 @@
 	}

 	if (!empty($usemargins))

 	{

-		if (!empty($user->rights->margins->creer))

-		{

-			$coldisplay++;

-			?>

+        if (!empty($user->rights->margins->creer))

+        {

+            $coldisplay++;

+        	?>

         <td class="margininfos right">

 			<!-- For predef product -->

 			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>

@@ -231,22 +224,25 @@
 		</td>

 		<?php }

 

-		if ($user->rights->margins->creer) {

+        if ($user->rights->margins->creer) {

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

 			{

-				$margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));

+				$margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));

 				// if credit note, dont allow to modify margin

 				if ($line->subprice < 0)

 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';

-				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';

+				else

+					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';

 				$coldisplay++;

-			} elseif (!empty($conf->global->DISPLAY_MARK_RATES))

+			}

+			elseif (!empty($conf->global->DISPLAY_MARK_RATES))

 			{

-				$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));

+				$mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));

 				// if credit note, dont allow to modify margin

 				if ($line->subprice < 0)

 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';

-				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';

+				else

+					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';

 				$coldisplay++;

 			}

 		}

@@ -255,8 +251,8 @@
 

 	<!-- colspan for this td because it replace total_ht+3 td for buttons+... -->

 	<td class="center valignmiddle" colspan="<?php echo $colspan; ?>"><?php $coldisplay += $colspan; ?>

-		<input type="submit" class="button buttongen marginbottomonly button-save" id="savelinebutton marginbottomonly" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>

-		<input type="submit" class="button buttongen marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">

+		<input type="submit" class="button buttongen marginbottomonly" id="savelinebutton marginbottomonly" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>

+		<input type="submit" class="button buttongen marginbottomonly" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">

 	</td>

 </tr>

 

@@ -279,7 +275,7 @@
 	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);

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

 	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end ? 0 : 1, "updateline", 1, 0);

-	print '<script>';

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

 	if (!$line->date_start) {

 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {

 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';

@@ -304,80 +300,7 @@
 ?>

 

 

-<script>

-

-<?php

-if (!empty($usemargins) && $user->rights->margins->creer)

-{

-	?>

-	/* Some js test when we click on button "Add" */

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

-	<?php

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

-		?>

-			$("input[name='np_marginRate']:first").blur(function(e) {

-				return checkFreeLine(e, "np_marginRate");

-			});

-		<?php

-	}

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

-		?>

-			$("input[name='np_markRate']:first").blur(function(e) {

-				return checkFreeLine(e, "np_markRate");

-			});

-		<?php

-	}

-	?>

-	});

-

-	/* TODO This does not work for number with thousand separator that is , */

-	function checkFreeLine(e, npRate)

-	{

-		var buying_price = $("input[name='buying_price']:first");

-		var remise = $("input[name='remise_percent']:first");

-

-		var rate = $("input[name='"+npRate+"']:first");

-		if (rate.val() == '')

-			return true;

-

-		var ratejs = price2numjs(rate.val());

-		if (! $.isNumeric(ratejs))

-		{

-			alert('<?php echo dol_escape_js($langs->transnoentities("rateMustBeNumeric")); ?>');

-			e.stopPropagation();

-			setTimeout(function () { rate.focus() }, 50);

-			return false;

-		}

-		if (npRate == "np_markRate" && rate.val() >= 100)

-		{

-			alert('<?php echo dol_escape_js($langs->transnoentities("markRateShouldBeLesserThan100")); ?>');

-			e.stopPropagation();

-			setTimeout(function () { rate.focus() }, 50);

-			return false;

-		}

-

-		var price = 0;

-		remisejs=price2numjs(remise.val());

-

-		if (remisejs != 100)	// If a discount not 100 or no discount

-		{

-			if (remisejs == '') remisejs=0;

-

-			bpjs=price2numjs(buying_price.val());

-			ratejs=price2numjs(rate.val());

-

-			if (npRate == "np_marginRate")

-				price = ((bpjs * (1 + ratejs / 100)) / (1 - remisejs / 100));

-			else if (npRate == "np_markRate")

-				price = ((bpjs / (1 - ratejs / 100)) / (1 - remisejs / 100));

-		}

-		$("input[name='price_ht']:first").val(price);	// TODO Must use a function like php price to have here a formated value

-

-		return true;

-	}

-	<?php

-}

-?>

+<script type="text/javascript">

 

 jQuery(document).ready(function()

 {

@@ -404,9 +327,9 @@
 	});

 

     <?php

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

-	{

-		?>

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

+    {

+        ?>

 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */

 		jQuery("#tva_tx").click(function() {						/* somtimes field is a text, sometimes a combo */

 			jQuery("input[name='np_marginRate']:first").val('');

@@ -434,8 +357,7 @@
 		});

 

 		/* Init field buying_price and fournprice */

-		var token = '<?php echo currentToken(); ?>';		// For AJAX Call we use old 'token' and not 'newtoken'

-		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>, 'token': token }, function(data) {

+		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>}, function(data) {

           if (data && data.length > 0) {

 			var options = '';

 			var trouve=false;

@@ -471,8 +393,8 @@
 		}

 		}, 'json');

         <?php

-	}

-	?>

+    }

+    ?>

 });

 

 </script>

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_objectline_title.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_objectline_title.tpl.php
@@ -59,27 +59,7 @@
 }

 

 // VAT

-print '<td class="linecolvat right" style="width: 80px">';

-if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {

-	print $langs->trans('Taxes');

-} else {

-	print $langs->trans('VAT');

-}

-

-if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT)

-{

-	global $mysoc;

-

-	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=vatforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';

-	//print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';

-	if (GETPOST('mode', 'aZ09') == 'vatforalllines') {

-		print '<div class="classvatforalllines inline-block nowraponall">';

-		print $form->load_tva('vatforalllines', '', $mysoc, $object->thirdparty, 0, 0, '', false, 1);

-		print '<input class="inline-block button smallpaddingimp" type="submit" name="submitforalllines" value="'.$langs->trans("Update").'">';

-		print '</div>';

-	}

-}

-print '</td>';

+print '<td class="linecolvat right" style="width: 80px">'.$langs->trans('VAT').'</td>';

 

 // Price HT

 print '<td class="linecoluht right" style="width: 80px">'.$langs->trans('PriceUHT').'</td>';

@@ -92,7 +72,7 @@
 // Qty

 print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';

 

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

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

 {

 	print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';

 }

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_objectline_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_objectline_view.tpl.php
@@ -63,22 +63,17 @@
 $domData .= ' data-qty="'.$line->qty.'"';

 $domData .= ' data-product_type="'.$line->product_type.'"';

 

-$sign = 1;

-if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && in_array($object->element, array('facture', 'invoice_supplier')) && $object->type == $object::TYPE_CREDIT_NOTE) {

-	$sign = -1;

-}

-

-$coldisplay = 0;

-?>

+

+$coldisplay = 0; ?>

 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->

 <tr  id="row-<?php print $line->id?>" class="drag drop oddeven" <?php print $domData; ?> >

 <?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>

-	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print ($i + 1); ?></span></td>

+	<td class="linecolnum center"><?php $coldisplay++; ?><?php print ($i + 1); ?></td>

 <?php } ?>

 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>

 <?php

 if (($line->info_bits & 2) == 2) {

-	print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';

+    print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';

 	$txt = '';

 	print img_object($langs->trans("ShowReduc"), 'reduc').' ';

 	if ($line->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");

@@ -87,43 +82,51 @@
 	//else $txt=$langs->trans("Discount");

 	print $txt;

 	print '</a>';

-

 	if ($line->description)

 	{

-		if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0) {

-			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+		if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)

+		{

 			$discount = new DiscountAbsolute($this->db);

 			$discount->fetch($line->fk_remise_except);

 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));

-		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)	{

-			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+		}

+		elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)

+		{

 			$discount = new DiscountAbsolute($this->db);

 			$discount->fetch($line->fk_remise_except);

 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));

 			// Add date of deposit

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

-				print ' ('.dol_print_date($discount->datec).')';

-		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)	{

-			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+			    print ' ('.dol_print_date($discount->datec).')';

+		}

+		elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)

+		{

 			$discount = new DiscountAbsolute($this->db);

 			$discount->fetch($line->fk_remise_except);

 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));

-		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) {

-			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

+		}

+		elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)

+		{

 			$discount = new DiscountAbsolute($this->db);

 			$discount->fetch($line->fk_remise_except);

 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));

-		} else {

+		}

+		else

+		{

 			print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);

 		}

 	}

-} else {

+}

+else

+{

 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';

 

-	if ($line->fk_product > 0)

+    if ($line->fk_product > 0)

 	{

 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));

-	} else {

+	}

+	else

+	{

 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);

 		if ($type == 1) $text = img_object($langs->trans('Service'), 'service');

 		else $text = img_object($langs->trans('Product'), 'product');

@@ -136,7 +139,8 @@
 			if (preg_match('/^\(DEPOSIT\)/', $line->description)) {

 				$newdesc = preg_replace('/^\(DEPOSIT\)/', $langs->trans("Deposit"), $line->description);

 				print $text.' '.dol_htmlentitiesbr($newdesc);

-			} else {

+			}

+			else {

 				print $text.' '.dol_htmlentitiesbr($line->description);

 			}

 		}

@@ -149,7 +153,8 @@
 		if ($line->date_start_fill && $line->date_end_fill) print ' - ';

 		if ($line->date_end_fill) print $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);

 		if ($line->date_start_fill || $line->date_end_fill) print '</div>';

-	} else {

+	}

+	else {

 		if ($line->date_start || $line->date_end) print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';

 		//print get_date_range($line->date_start, $line->date_end, $format);

 	}

@@ -161,9 +166,9 @@
 	}

 }

 

-if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES))

-{

-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

+if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)

+{

+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

 	$productfourn = new ProductFournisseur($this->db);

 	$productfourn->fetch_product_fournisseur_price($line->fk_fournprice);

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

@@ -172,7 +177,9 @@
 	if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here

 	{

 		print $productfourn->getNomUrl();

-	} else {

+	}

+	else

+	{

 		print $productfourn->ref_supplier;

 	}

 }

@@ -203,14 +210,14 @@
 //print vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);

 ?></td>

 

-	<td class="linecoluht nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>

+	<td class="linecoluht nowrap right"><?php $coldisplay++; ?><?php print price($line->subprice); ?></td>

 

 <?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>

-	<td class="linecoluht_currency nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->multicurrency_subprice); ?></td>

+	<td class="linecoluht_currency nowrap right"><?php $coldisplay++; ?><?php print price($line->multicurrency_subprice); ?></td>

 <?php }

 

 if ($inputalsopricewithtax) { ?>

-	<td class="linecoluttc nowrap right"><?php $coldisplay++; ?><?php print (isset($line->pu_ttc) ? price($sign * $line->pu_ttc) : price($sign * $line->subprice)); ?></td>

+	<td class="linecoluttc nowrap right"><?php $coldisplay++; ?><?php print (isset($line->pu_ttc) ?price($line->pu_ttc) : price($line->subprice)); ?></td>

 <?php } ?>

 

 	<td class="linecolqty nowrap right"><?php $coldisplay++; ?>

@@ -224,7 +231,7 @@
 } else print '&nbsp;';

 print '</td>';

 

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

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

 {

 	print '<td class="linecoluseunit nowrap left">';

 	$label = $line->getLabelOfUnit('short');

@@ -247,13 +254,13 @@
 // Fields for situation invoices

 if ($this->situation_cycle_ref)

 {

-	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

+    include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';

 	$coldisplay++;

 	print '<td class="linecolcycleref nowrap right">'.$line->situation_percent.'%</td>';

 	$coldisplay++;

 	$locataxes_array = getLocalTaxesFromRate($line->tva.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), 0, ($senderissupplier ? $mysoc : $object->thirdparty), ($senderissupplier ? $object->thirdparty : $mysoc));

 	$tmp = calcul_price_total($line->qty, $line->pu, $line->remise_percent, $line->txtva, -1, -1, 0, 'HT', $line->info_bits, $line->type, ($senderissupplier ? $object->thirdparty : $mysoc), $locataxes_array, 100, $object->multicurrency_tx, $line->multicurrency_subprice);

-	print '<td align="right" class="linecolcycleref2 nowrap">'.price($sign * $tmp[0]).'</td>';

+	print '<td align="right" class="linecolcycleref2 nowrap">'.price($tmp[0]).'</td>';

 }

 

 if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))

@@ -264,11 +271,10 @@
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?>

 		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print (($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>

 	<?php }

-	if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>

+    if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>

   	  <td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>

     <?php }

 }

-// Price total without tax

 if ($line->special_code == 3) { ?>

 	<td class="linecoloption nowrap right"><?php $coldisplay++; ?><?php print $langs->trans('Option'); ?></td>

 <?php } else {

@@ -298,19 +304,19 @@
 

 		print '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';

 	}

-	print price($sign * $line->total_ht);

+	print price($line->total_ht);

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

 	{

-		print '</span>';

+	    print '</span>';

 	}

 	print '</td>';

 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {

-		print '<td class="linecolutotalht_currency nowrap right">'.price($sign * $line->multicurrency_total_ht).'</td>';

+		print '<td class="linecolutotalht_currency nowrap right">'.price($line->multicurrency_total_ht).'</td>';

 		$coldisplay++;

 	}

 }

 if ($outputalsopricetotalwithtax) {

-	print '<td class="linecolht nowrap right">'.price($sign * $line->total_ttc).'</td>';

+    print '<td class="linecolht nowrap right">'.price($line->total_ttc).'</td>';

 	$coldisplay++;

 }

 

@@ -347,7 +353,7 @@
 			</a>

 		<?php }

 		print '</td>';

-	} else {

+    } else {

 		print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'></td>';

 		$coldisplay++;

 	}

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_onlinepaymentlinks.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_onlinepaymentlinks.tpl.php
@@ -32,133 +32,123 @@
 print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";

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

 {

-	print '<div id="order"></div>';

-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';

+    print '<div id="order"></div>';

+    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';

 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";

 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))

 	{

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

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

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

-

-		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';

-		print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';

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

-		if (GETPOST('generate_order_ref', 'alpha'))

-		{

-			print '<br> -> <strong class="wordbreak">';

-			$url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));

-			print $url;

-			print "</strong><br>\n";

-		}

-		print '</form>';

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

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

+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';

+        print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';

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

+        if (GETPOST('generate_order_ref', 'alpha'))

+        {

+            print '<br> -> <strong class="wordbreak">';

+            $url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));

+            print $url;

+            print "</strong><br>\n";

+        }

+        print '</form>';

 	}

 	print '<br>';

 }

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

 {

-	print '<div id="invoice"></div>';

-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';

+    print '<div id="invoice"></div>';

+    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';

 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";

 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))

 	{

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

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

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

-

-		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';

-		print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';

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

-		if (GETPOST('generate_invoice_ref', 'alpha'))

-		{

-			print '<br> -> <strong class="wordbreak">';

-			$url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));

-			print $url;

-			print "</strong><br>\n";

-		}

-		print '</form>';

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

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

+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';

+        print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';

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

+        if (GETPOST('generate_invoice_ref', 'alpha'))

+        {

+            print '<br> -> <strong class="wordbreak">';

+            $url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));

+            print $url;

+            print "</strong><br>\n";

+        }

+        print '</form>';

 	}

 	print '<br>';

 }

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

 {

-	print '<div id="contractline"></div>';

-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';

+    print '<div id="contractline"></div>';

+    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';

 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";

 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))

 	{

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

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

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

-

-		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';

-		print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';

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

-		if (GETPOST('generate_contract_ref'))

-		{

-			print '<br> -> <strong class="wordbreak">';

-			$url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));

-			print $url;

-			print "</strong><br>\n";

-		}

-		print '</form>';

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

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

+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';

+        print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';

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

+        if (GETPOST('generate_contract_ref'))

+        {

+            print '<br> -> <strong class="wordbreak">';

+            $url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));

+            print $url;

+            print "</strong><br>\n";

+        }

+        print '</form>';

 	}

 	print '<br>';

 }

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

 {

-	print '<div id="membersubscription"></div>';

-	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';

+    print '<div id="membersubscription"></div>';

+    print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';

 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";

 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))

 	{

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

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

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

-

-		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';

-		print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';

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

-		if (GETPOST('generate_member_ref'))

-		{

-			print '<br> -> <strong class="wordbreak">';

-			$url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));

-			print $url;

-			print "</strong><br>\n";

-		}

-		print '</form>';

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

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

+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';

+        print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';

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

+        if (GETPOST('generate_member_ref'))

+        {

+            print '<br> -> <strong class="wordbreak">';

+            $url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));

+            print $url;

+            print "</strong><br>\n";

+        }

+        print '</form>';

 	}

 	print '<br>';

 }

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

 {

-	print '<div id="donation"></div>';

+    print '<div id="donation"></div>';

 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';

 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";

 	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))

 	{

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

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

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

-

-		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';

-		print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';

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

-		if (GETPOST('generate_donation_ref'))

-		{

-			print '<br> -> <strong class="wordbreak">';

-			$url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));

-			print $url;

-			print "</strong><br>\n";

-		}

-		print '</form>';

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

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

+	    print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';

+        print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';

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

+        if (GETPOST('generate_donation_ref'))

+        {

+            print '<br> -> <strong class="wordbreak">';

+            $url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));

+            print $url;

+            print "</strong><br>\n";

+        }

+        print '</form>';

 	}

 	print '<br>';

 }

 

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

 {

-	print "\n".'<script>';

+	print "\n".'<script type="text/javascript">';

 	print '$(document).ready(function () {

 		$("#generate_token").click(function() {

             	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_originproductline.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_originproductline.tpl.php
@@ -36,7 +36,7 @@
 	print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>';

 

 print '<td class="right">'.$this->tpl['qty'].'</td>';

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

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

 	print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';

 

 print '<td class="right">'.$this->tpl['remise_percent'].'</td>';

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_passwordforgotten.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_passwordforgotten.tpl.php
@@ -16,9 +16,6 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.

  */

 

-

-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);

-

 // Protection to avoid direct call of template

 if (empty($conf) || !is_object($conf))

 {

@@ -61,7 +58,7 @@
 <body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>

 

 <?php if (empty($conf->dol_use_jmobile)) { ?>

-<script>

+<script type="text/javascript">

 $(document).ready(function () {

 	// Set focus on correct field

 	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element

@@ -107,36 +104,13 @@
 <div class="trinputlogin">

 <div class="tagtd nowraponall center valignmiddle tdinputlogin">

 <!-- <span class="span-icon-user">-->

-<span class="fa fa-user"></span>

+<span class="fa fa-user">

+</span>

 <input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />

 </div>

 </div>

 

 <?php

-if ($captcha) {

-	// Add a variable param to force not using cache (jmobile)

-	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time

-	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');

-	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');

-	// TODO: provide accessible captcha variants

-	?>

-	<!-- Captcha -->

-	<div class="trinputlogin">

-	<div class="tagtd tdinputlogin nowraponall none valignmiddle">

-

-	<span class="fa fa-unlock"></span>

-	<span class="nofa inline-block">

-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />

-	</span>

-	<span class="nowrap inline-block">

-	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />

-	<a class="inline-block valignmiddle" href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a>

-	</span>

-

-	</div></div>

-	<?php

-}

-

 if (!empty($morelogincontent)) {

 	if (is_array($morelogincontent)) {

 		foreach ($morelogincontent as $format => $option)

@@ -146,12 +120,38 @@
 				echo $option;

 			}

 		}

-	} else {

+	}

+	else {

 		echo '<!-- Option by hook -->';

 		echo $morelogincontent;

 	}

 }

 ?>

+

+<?php if ($captcha) {

+	// Add a variable param to force not using cache (jmobile)

+	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time

+	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');

+	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');

+	?>

+	<!-- Captcha -->

+	<div class="trinputlogin">

+	<div class="tdinputlogin nowraponall none center valignmiddle tdinputlogin">

+

+	<table class="login_table_securitycode centpercent">

+	<tr class="valignmiddle">

+	<td>

+	<!-- <span class="span-icon-security"> -->

+	<span class="nofa">

+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />

+	</span>

+	</td>

+	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>

+	<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>

+	</tr></table>

+

+	</div></div>

+<?php } ?>

 

 </div>

 

@@ -220,7 +220,8 @@
 			echo $option."\n";

 		}

 	}

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

+}

+elseif (!empty($moreloginextracontent)) {

 	echo '<!-- Javascript by hook -->';

 	echo $moreloginextracontent;

 }

@@ -230,7 +231,7 @@
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))

 {

 	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);

-	foreach ($tmptagarray as $tmptag) {

+	foreach($tmptagarray as $tmptag) {

 		print "\n";

 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";

 		print "

@@ -247,22 +248,23 @@
 	}

 }

 

-// TODO Replace this with a hook

-// Google Adsense (need Google module)

+// Google Adsense

 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))

 {

 	if (empty($conf->dol_use_jmobile))

 	{

 		?>

 	<div class="center"><br>

-		<script><!--

+		<script type="text/javascript"><!--

 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";

 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";

 			google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;

 			google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;

 			//-->

 		</script>

-		<script	src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>

+		<script type="text/javascript"

+			src="http://pagead2.googlesyndication.com/pagead/show_ads.js">

+		</script>

 	</div>

 		<?php

 	}

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_resource_add.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_resource_add.tpl.php
@@ -32,8 +32,8 @@
 $out .= $formresources->select_resource_list('', 'fk_resource', '', 1, 1, 0, $events, '', 2, null);

 $out .= '</div>';

 

-$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (GETPOSTISSET('busy') ? GETPOST('busy') : 1), 1).'</div>';

-$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1).'</div>';

+$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (isset($_POST['busy']) ? $_POST['busy'] : 1), 1).'</div>';

+$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (isset($_POST['mandatory']) ? $_POST['mandatory'] : 0), 1).'</div>';

 

 $out .= '<div class="tagtd right">';

 $out .= '<input type="submit" id="add-resource-place" class="button" value="'.$langs->trans("Add").'"/>';

--- /tmp/dsg/dolibarr/htdocs/core/tpl/github_resource_view.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_resource_view.tpl.php
@@ -38,9 +38,9 @@
 

 		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid'))

 		{

-			print '<div class="tagtr oddeven">';

-			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';

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

+		    print '<div class="tagtr oddeven">';

+		    print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';

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

 			print '<input type="hidden" name="element_id" value="'.$element_id.'" />';

 

 			print '<div class="tagtd">'.$object_resource->getNomUrl(1).'</div>';

@@ -49,7 +49,9 @@
 			print '<div class="tagtd center">'.$form->selectyesno('mandatory', $linked_resource['mandatory'] ? 1 : 0, 1).'</div>';

 			print '<div class="tagtd right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';

 			print '</div>';

-		} else {

+		}

+		else

+		{

 			$class = '';

 			if ($linked_resource['rowid'] == GETPOST('lineid'))

 				$class = 'highlight';

@@ -73,11 +75,11 @@
 			print '</div>';

 

 			print '<div class="tagtd right">';

-			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=edit&token='.newToken().'&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';

+			print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';

 			print img_edit();

 			print '</a>';

 			print '&nbsp;';

-			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&token='.newToken().'&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';

+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';

 			print img_picto($langs->trans("Unlink"), 'unlink');

 			print '</a>';

 			print '</div>';

@@ -85,7 +87,8 @@
 			print '</div>';

 		}

 	}

-} else {

+}

+else {

 	print '<div class="tagtr oddeven">';

 	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';

 	print '<div class="tagtd opacitymedium"></div>';