';
@@ -244,7 +249,7 @@ foreach ($dirmodels as $reldir) {
print $module->info();
print '';
- // Show example of numbering model
+ // Show example of numbering module
print '
';
// Ref customer
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 5833072e8be..e65a1b5e1a3 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1809,7 +1809,7 @@ if ($action == 'create') {
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', '((s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
// reload page to retrieve customer informations
if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
- print '';
+ $result .= '';
}
return $result;
@@ -467,15 +467,15 @@ class Form
/**
* Output edit in place form
*
- * @param object $object Object
- * @param string $value Value to show/edit
- * @param string $htmlname DIV ID (field name)
- * @param int $condition Condition to edit
- * @param string $inputType Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')
- * @param string $editvalue When in edit mode, use this value as $value instead of value
- * @param object $extObject External object
- * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
- * @return string HTML edit in place
+ * @param object $object Object
+ * @param string $value Value to show/edit
+ * @param string $htmlname DIV ID (field name)
+ * @param int $condition Condition to edit
+ * @param string $inputType Type of input ('string', 'numeric', 'datepicker' ('day' do not work, don't know why), 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:loadmethod:savemethod:buttononly')
+ * @param string $editvalue When in edit mode, use this value as $value instead of value
+ * @param object $extObject External object
+ * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
+ * @return string HTML edit in place
*/
protected function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null)
{
@@ -495,11 +495,11 @@ class Form
if ($condition) {
$element = false;
$table_element = false;
- $fk_element = false;
- $loadmethod = false;
- $savemethod = false;
- $ext_element = false;
- $button_only = false;
+ $fk_element = false;
+ $loadmethod = false;
+ $savemethod = false;
+ $ext_element = false;
+ $button_only = false;
$inputOption = '';
$rows = '';
$cols = '';
@@ -523,7 +523,7 @@ class Form
if (!empty($tmp[2])) {
$savemethod = $tmp[2];
}
- $out .= ''."\n";
+ $out .= '' . "\n";
} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {
$tmp = explode(':', $inputType);
$inputType = $tmp[0];
@@ -534,7 +534,7 @@ class Form
$savemethod = $tmp[2];
}
- $out .= ''."\n"; // Use for timestamp format
+ $out .= '' . "\n"; // Use for timestamp format
} elseif (preg_match('/^(select|autocomplete)/', $inputType)) {
$tmp = explode(':', $inputType);
$inputType = $tmp[0];
@@ -565,40 +565,40 @@ class Form
}
if (isModEnabled('fckeditor')) {
- $out .= ''."\n";
+ $out .= '' . "\n";
} else {
$inputType = 'textarea';
}
}
- $out .= ''."\n";
- $out .= ''."\n";
- $out .= ''."\n";
- $out .= ''."\n";
+ $out .= '' . "\n";
+ $out .= '' . "\n";
+ $out .= '' . "\n";
+ $out .= '' . "\n";
if (!empty($savemethod)) {
- $out .= ''."\n";
+ $out .= '' . "\n";
}
if (!empty($ext_element)) {
- $out .= ''."\n";
+ $out .= '' . "\n";
}
if (!empty($custommsg)) {
if (is_array($custommsg)) {
if (!empty($custommsg['success'])) {
- $out .= ''."\n";
+ $out .= '' . "\n";
}
if (!empty($custommsg['error'])) {
- $out .= ''."\n";
+ $out .= '' . "\n";
}
} else {
- $out .= ''."\n";
+ $out .= '' . "\n";
}
}
if ($inputType == 'textarea') {
- $out .= ''."\n";
- $out .= ''."\n";
+ $out .= '' . "\n";
+ $out .= '' . "\n";
}
- $out .= ''.$value.''."\n";
- $out .= ''.(!empty($editvalue) ? $editvalue : $value).''."\n";
+ $out .= '' . $value . '' . "\n";
+ $out .= '' . (!empty($editvalue) ? $editvalue : $value) . '' . "\n";
} else {
$out = $value;
}
@@ -607,32 +607,32 @@ class Form
}
/**
- * Show a text and picto with tooltip on text or picto.
+ * Show a text and picto with tooltip on text or picto.
* Can be called by an instancied $form->textwithtooltip or by a static call Form::textwithtooltip
*
- * @param string $text Text to show
- * @param string $htmltext HTML content of tooltip. Must be HTML/UTF8 encoded.
- * @param int $tooltipon 1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2
- * @param int $direction -1=image is before, 0=no image, 1=image is after
- * @param string $img Html code for image (use img_xxx() function to get it)
- * @param string $extracss Add a CSS style to td tags
- * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
- * @param string $incbefore Include code before the text
- * @param int $noencodehtmltext Do not encode into html entity the htmltext
- * @param string $tooltiptrigger ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
- * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
- * @return string Code html du tooltip (texte+picto)
- * @see textwithpicto() Use thisfunction if you can.
+ * @param string $text Text to show
+ * @param string $htmltext HTML content of tooltip. Must be HTML/UTF8 encoded.
+ * @param int $tooltipon 1=tooltip on text, 2=tooltip on image, 3=tooltip sur les 2
+ * @param int $direction -1=image is before, 0=no image, 1=image is after
+ * @param string $img Html code for image (use img_xxx() function to get it)
+ * @param string $extracss Add a CSS style to td tags
+ * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+ * @param string $incbefore Include code before the text
+ * @param int $noencodehtmltext Do not encode into html entity the htmltext
+ * @param string $tooltiptrigger ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+ * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
+ * @return string Code html du tooltip (texte+picto)
+ * @see textwithpicto() Use thisfunction if you can.
*/
public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
{
if ($incbefore) {
- $text = $incbefore.$text;
+ $text = $incbefore . $text;
}
if (!$htmltext) {
return $text;
}
- $direction = (int) $direction; // For backward compatibility when $direction was set to '' instead of 0
+ $direction = (int) $direction; // For backward compatibility when $direction was set to '' instead of 0
$tag = 'td';
if ($notabs == 2) {
@@ -646,11 +646,11 @@ class Form
$extrastyle = '';
if ($direction < 0) {
- $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : '');
+ $extracss = ($extracss ? $extracss . ' ' : '') . ($notabs != 3 ? 'inline-block' : '');
$extrastyle = 'padding: 0px; padding-left: 3px;';
}
if ($direction > 0) {
- $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : '');
+ $extracss = ($extracss ? $extracss . ' ' : '') . ($notabs != 3 ? 'inline-block' : '');
$extrastyle = 'padding: 0px; padding-right: 3px;';
}
@@ -663,53 +663,53 @@ class Form
$htmltext = str_replace('"', '"', $htmltext);
} else {
$classfortooltip = 'classfortooltiponclick';
- $textfordialog .= '
'.$htmltext.'
';
+ $textfordialog .= '
' . $htmltext . '
';
}
if ($tooltipon == 2 || $tooltipon == 3) {
- $paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
+ $paramfortooltipimg = ' class="' . $classfortooltip . ($notabs != 3 ? ' inline-block' : '') . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '"';
if ($tooltiptrigger == '') {
- $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
+ $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on img tag to store tooltip
} else {
- $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
+ $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';
}
} else {
- $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+ $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag
}
if ($tooltipon == 1 || $tooltipon == 3) {
- $paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
+ $paramfortooltiptd = ' class="' . ($tooltipon == 3 ? 'cursorpointer ' : '') . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '" ';
if ($tooltiptrigger == '') {
- $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
+ $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip
} else {
- $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
+ $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';
}
} else {
- $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+ $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag
}
if (empty($notabs)) {
$s .= '
';
} elseif ($notabs == 2) {
- $s .= '
';
+ $s .= '
';
}
// Define value if value is before
if ($direction < 0) {
- $s .= '<'.$tag.$paramfortooltipimg;
+ $s .= '<' . $tag . $paramfortooltipimg;
if ($tag == 'td') {
$s .= ' class="valigntop" width="14"';
}
- $s .= '>'.$textfordialog.$img.'';
+ $s .= '>' . $textfordialog . $img . '';
}
// Use another method to help avoid having a space in value in order to use this value with jquery
// Define label
if ((string) $text != '') {
- $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'';
+ $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '';
}
// Define value if value is after
if ($direction > 0) {
- $s .= '<'.$tag.$paramfortooltipimg;
+ $s .= '<' . $tag . $paramfortooltipimg;
if ($tag == 'td') {
$s .= ' class="valignmiddle" width="14"';
}
- $s .= '>'.$textfordialog.$img.'';
+ $s .= '>' . $textfordialog . $img . '';
}
if (empty($notabs)) {
$s .= '
';
@@ -721,18 +721,18 @@ class Form
}
/**
- * Show a text with a picto and a tooltip on picto
+ * Show a text with a picto and a tooltip on picto
*
- * @param string $text Text to show
- * @param string $htmltext Content of tooltip
- * @param int $direction 1=Icon is after text, -1=Icon is before text, 0=no icon
- * @param string $type Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'
- * @param string $extracss Add a CSS style to td, div or span tag
- * @param int $noencodehtmltext Do not encode into html entity the htmltext
- * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
- * @param string $tooltiptrigger ''=Tooltip on hover and hidden on smartphone, 'abconsmartphone'=Tooltip on hover and on click on smartphone, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')
- * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
- * @return string HTML code of text, picto, tooltip
+ * @param string $text Text to show
+ * @param string $htmltext Content of tooltip
+ * @param int $direction 1=Icon is after text, -1=Icon is before text, 0=no icon
+ * @param string $type Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'
+ * @param string $extracss Add a CSS style to td, div or span tag
+ * @param int $noencodehtmltext Do not encode into html entity the htmltext
+ * @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+ * @param string $tooltiptrigger ''=Tooltip on hover and hidden on smartphone, 'abconsmartphone'=Tooltip on hover and on click on smartphone, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')
+ * @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
+ * @return string HTML code of text, picto, tooltip
*/
public function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 3, $tooltiptrigger = '', $forcenowrap = 0)
{
@@ -799,12 +799,12 @@ class Form
/**
* Generate select HTML to choose massaction
*
- * @param string $selected Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
- * @param array $arrayofaction array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
- * @param int $alwaysvisible 1=select button always visible
- * @param string $name Name for massaction
- * @param string $cssclass CSS class used to check for select
- * @return string|void Select list
+ * @param string $selected Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
+ * @param array $arrayofaction array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
+ * @param int $alwaysvisible 1=select button always visible
+ * @param string $name Name for massaction
+ * @param string $cssclass CSS class used to check for select
+ * @return string|void Select list
*/
public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0, $name = 'massaction', $cssclass = 'checkforselect')
{
@@ -813,7 +813,7 @@ class Form
$disabled = 0;
$ret = '
';
- $ret .= '
';
if (!empty($conf->use_javascript_ajax)) {
$ret .= '
- ';
$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
- $out .= ' ';
+ $out .= ' ';
$out .= ' ';
}
@@ -2288,32 +2302,33 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
*
- * @param int $selected Preselected products
- * @param string $htmlname Name of HTML select field (must be unique in page).
- * @param int|string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)
- * @param int $limit Limit on number of returned lines
- * @param int $price_level Level of price to show
- * @param int $status Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell
- * @param int $finished 2=all, 1=finished, 0=raw material
- * @param string $selected_input_value Value of preselected input text (for use with ajax)
- * @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
- * @param array $ajaxoptions Options for ajax_autocompleter
- * @param int $socid Thirdparty Id (to get also price dedicated to this customer)
- * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
- * @param int $forcecombo Force to use combo box
- * @param string $morecss Add more css on select
- * @param int $hidepriceinlabel 1=Hide prices in label
- * @param string $warehouseStatus Warehouse status filter to count the quantity in stock. Following comma separated filter options can be used
- * 'warehouseopen' = count products from open warehouses,
- * 'warehouseclosed' = count products from closed warehouses,
- * 'warehouseinternal' = count products from warehouses for internal correct/transfer only
- * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
- * @param string $nooutput No print, return the output into a string
- * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
- * @return void|string
+ * @param int $selected Preselected products
+ * @param string $htmlname Name of HTML select field (must be unique in page).
+ * @param int|string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)
+ * @param int $limit Limit on number of returned lines
+ * @param int $price_level Level of price to show
+ * @param int $status Sell status -1=Return all products, 0=Products not on sell, 1=Products on sell
+ * @param int $finished 2=all, 1=finished, 0=raw material
+ * @param string $selected_input_value Value of preselected input text (for use with ajax)
+ * @param int $hidelabel Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
+ * @param array $ajaxoptions Options for ajax_autocompleter
+ * @param int $socid Thirdparty Id (to get also price dedicated to this customer)
+ * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+ * @param int $forcecombo Force to use combo box
+ * @param string $morecss Add more css on select
+ * @param int $hidepriceinlabel 1=Hide prices in label
+ * @param string $warehouseStatus Warehouse status filter to count the quantity in stock. Following comma separated filter options can be used
+ * 'warehouseopen' = count products from open warehouses,
+ * 'warehouseclosed' = count products from closed warehouses,
+ * 'warehouseinternal' = count products from warehouses for internal correct/transfer only
+ * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
+ * @param string $nooutput No print, return the output into a string
+ * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
+ * @return void|string
*/
public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 0, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = null, $nooutput = 0, $status_purchase = -1)
{
@@ -2340,7 +2355,7 @@ class Form
$placeholder = '';
if ($selected && empty($selected_input_value)) {
- require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
$producttmpselect = new Product($this->db);
$producttmpselect->fetch($selected);
$selected_input_value = $producttmpselect->ref;
@@ -2355,17 +2370,17 @@ class Form
}
}
// mode=1 means customers products
- $urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
- $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
+ $urloption = ($socid > 0 ? 'socid=' . $socid . '&' : '') . 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=1&status=' . $status . '&status_purchase=' . $status_purchase . '&finished=' . $finished . '&hidepriceinlabel=' . $hidepriceinlabel . '&warehousestatus=' . $warehouseStatus;
+ $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
if (isModEnabled('variants') && is_array($selected_combinations)) {
// Code to automatically insert with javascript the select of attributes under the select of product
// when a parent of variant has been selected.
$out .= '
-
';
}
if (empty($hidelabel)) {
- $out .= $langs->trans("RefOrLabel").' : ';
+ $out .= $langs->trans("RefOrLabel") . ' : ';
} elseif ($hidelabel > 1) {
- $placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
+ $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';
if ($hidelabel == 2) {
$out .= img_picto($langs->trans("Search"), 'search');
}
}
- $out .= 'global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+ $out .= 'global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';
if ($hidelabel == 3) {
$out .= img_picto($langs->trans("Search"), 'search');
}
@@ -2471,7 +2486,7 @@ class Form
* @param string $morecss Add more css on select
* @param string $nooutput No print, return the output into a string
* @param int $forcecombo Force to use combo box
- * @param array $TProducts Add filter on a defined product
+ * @param array $TProducts Add filter on a defined product
* @return void|string
*/
public function select_bom($selected = '', $htmlname = 'bom_id', $limit = 0, $status = 1, $type = 0, $showempty = '1', $morecss = '', $nooutput = '', $forcecombo = 0, $TProducts = [])
@@ -2479,29 +2494,29 @@ class Form
// phpcs:enable
global $conf, $user, $langs, $db;
- require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
$error = 0;
$out = '';
if (!$forcecombo) {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$events = array();
$out .= ajax_combobox($htmlname, $events, getDolGlobalInt("PRODUIT_USE_SEARCH_TO_SELECT"));
}
- $out .= '
' . "\n";
- $formconfirm .= "\n\n";
- $formconfirm .= '';
$formconfirm .= "\n";
} else {
- $formconfirm .= "\n\n";
+ $formconfirm .= "\n\n";
if (empty($disableformtag)) {
- $formconfirm .= '\n";
@@ -5424,7 +5461,7 @@ class Form
if (!empty($conf->use_javascript_ajax)) {
$formconfirm .= '';
- $formconfirm .= ''."\n";
+ $formconfirm .= '' . "\n";
}
$formconfirm .= "\n";
@@ -5447,28 +5484,29 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show a form to select a project
*
- * @param int $page Page
- * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
- * @param int $selected Id pre-selected project
- * @param string $htmlname Name of select field
- * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
- * @param int $maxlength Max length
- * @param int $forcefocus Force focus on field (works with javascript only)
- * @param int $nooutput No print is done. String is returned.
- * @param string $textifnoproject Text to show if no project
- * @param string $morecss More CSS
- * @return string Return html content
+ * @param int $page Page
+ * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+ * @param int $selected Id pre-selected project
+ * @param string $htmlname Name of select field
+ * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
+ * @param int $maxlength Max length
+ * @param int $forcefocus Force focus on field (works with javascript only)
+ * @param int $nooutput No print is done. String is returned.
+ * @param string $textifnoproject Text to show if no project
+ * @param string $morecss More CSS
+ * @return string Return html content
*/
public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0, $textifnoproject = '', $morecss = '')
{
// phpcs:enable
global $langs;
- require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/core/lib/project.lib.php';
+ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
$out = '';
@@ -5476,11 +5514,11 @@ class Form
$langs->load("project");
if ($htmlname != "none") {
- $out .= '';
} else {
$out .= '';
@@ -5489,7 +5527,7 @@ class Form
$projet->fetch($selected);
$out .= $projet->getNomUrl(0, '', 1);
} else {
- $out .= ''.$textifnoproject.'';
+ $out .= '' . $textifnoproject . '';
}
$out .= '';
}
@@ -5502,20 +5540,21 @@ class Form
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
- * Show a form to select payment conditions
+ * Show a form to select payment conditions
*
- * @param int $page Page
- * @param string $selected Id condition pre-selectionne
- * @param string $htmlname Name of select html field
- * @param int $addempty Add empty entry
- * @param string $type Type ('direct-debit' or 'bank-transfer')
- * @param int $filtertype If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)
- * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)
- * 0 : use default deposit percentage from entry
- * > 0 : force deposit percentage (for example, from company object)
- * @param int $nooutput No print is done. String is returned.
- * @return string HTML output or ''
+ * @param int $page Page
+ * @param string $selected Id condition pre-selectionne
+ * @param string $htmlname Name of select html field
+ * @param int $addempty Add empty entry
+ * @param string $type Type ('direct-debit' or 'bank-transfer')
+ * @param int $filtertype If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)
+ * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)
+ * 0 : use default deposit percentage from entry
+ * > 0 : force deposit percentage (for example, from company object)
+ * @param int $nooutput No print is done. String is returned.
+ * @return string HTML output or ''
*/
public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0, $type = '', $filtertype = -1, $deposit_percent = -1, $nooutput = 0)
{
@@ -5525,14 +5564,14 @@ class Form
$out = '';
if ($htmlname != "none") {
- $out .= '';
} else {
if ($selected) {
@@ -5562,26 +5601,27 @@ class Form
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show a form to select a delivery delay
*
- * @param int $page Page
- * @param string $selected Id condition pre-selectionne
- * @param string $htmlname Name of select html field
- * @param int $addempty Ajoute entree vide
- * @return void
+ * @param int $page Page
+ * @param string $selected Id condition pre-selectionne
+ * @param string $htmlname Name of select html field
+ * @param int $addempty Ajoute entree vide
+ * @return void
*/
public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)
{
// phpcs:enable
global $langs;
if ($htmlname != "none") {
- print '';
} else {
if ($selected) {
@@ -5597,21 +5637,21 @@ class Form
* Output HTML form to select list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
* List found into table c_input_reason loaded by loadCacheInputReason
*
- * @param string $page Page
- * @param string $selected Id condition pre-selectionne
- * @param string $htmlname Name of select html field
- * @param int $addempty Add empty entry
- * @return void
+ * @param string $page Page
+ * @param string $selected Id condition pre-selectionne
+ * @param string $htmlname Name of select html field
+ * @param int $addempty Add empty entry
+ * @return void
*/
public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
{
global $langs;
if ($htmlname != "none") {
- print '';
} else {
if ($selected) {
@@ -5629,18 +5669,19 @@ class Form
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show a form + html select a date
*
- * @param string $page Page
- * @param string $selected Date preselected
- * @param string $htmlname Html name of date input fields or 'none'
- * @param int $displayhour Display hour selector
- * @param int $displaymin Display minutes selector
- * @param int $nooutput 1=No print output, return string
- * @param string $type 'direct-debit' or 'bank-transfer'
- * @return string
- * @see selectDate()
+ * @param string $page Page
+ * @param string $selected Date preselected
+ * @param string $htmlname Html name of date input fields or 'none'
+ * @param int $displayhour Display hour selector
+ * @param int $displaymin Display minutes selector
+ * @param int $nooutput 1=No print output, return string
+ * @param string $type 'direct-debit' or 'bank-transfer'
+ * @return string
+ * @see selectDate()
*/
public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0, $type = '')
{
@@ -5650,17 +5691,17 @@ class Form
$ret = '';
if ($htmlname != "none") {
- $ret .= '';
} else {
if ($displayhour) {
@@ -5678,15 +5719,16 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show a select form to choose a user
*
- * @param string $page Page
- * @param string $selected Id of user preselected
- * @param string $htmlname Name of input html field. If 'none', we just output the user link.
- * @param array $exclude List of users id to exclude
- * @param array $include List of users id to include
- * @return void
+ * @param string $page Page
+ * @param string $selected Id of user preselected
+ * @param string $htmlname Name of input html field. If 'none', we just output the user link.
+ * @param array $exclude List of users id to exclude
+ * @param array $include List of users id to include
+ * @return void
*/
public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '')
{
@@ -5694,15 +5736,15 @@ class Form
global $langs;
if ($htmlname != "none") {
- print '';
} else {
if ($selected) {
- require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
$theuser = new User($this->db);
$theuser->fetch($selected);
print $theuser->getNomUrl(1);
@@ -5714,18 +5756,19 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show form with payment mode
*
- * @param string $page Page
- * @param int $selected Id mode pre-selectionne
- * @param string $htmlname Name of select html field
- * @param string $filtertype To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
- * @param int $active Active or not, -1 = all
- * @param int $addempty 1=Add empty entry
- * @param string $type Type ('direct-debit' or 'bank-transfer')
- * @param int $nooutput 1=Return string, no output
- * @return string HTML output or ''
+ * @param string $page Page
+ * @param int $selected Id mode pre-selectionne
+ * @param string $htmlname Name of select html field
+ * @param string $filtertype To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
+ * @param int $active Active or not, -1 = all
+ * @param int $addempty 1=Add empty entry
+ * @param string $type Type ('direct-debit' or 'bank-transfer')
+ * @param int $nooutput 1=Return string, no output
+ * @return string HTML output or ''
*/
public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0, $type = '', $nooutput = 0)
{
@@ -5734,14 +5777,14 @@ class Form
$out = '';
if ($htmlname != "none") {
- $out .= '';
} else {
if ($selected) {
@@ -5763,22 +5806,22 @@ class Form
/**
* Show form with transport mode
*
- * @param string $page Page
- * @param int $selected Id mode pre-select
- * @param string $htmlname Name of select html field
- * @param int $active Active or not, -1 = all
- * @param int $addempty 1=Add empty entry
- * @return void
+ * @param string $page Page
+ * @param int $selected Id mode pre-select
+ * @param string $htmlname Name of select html field
+ * @param int $active Active or not, -1 = all
+ * @param int $addempty 1=Add empty entry
+ * @return void
*/
public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
{
global $langs;
if ($htmlname != "none") {
- print '';
} else {
if ($selected) {
@@ -5791,24 +5834,25 @@ class Form
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show form with multicurrency code
*
- * @param string $page Page
- * @param string $selected code pre-selectionne
- * @param string $htmlname Name of select html field
- * @return void
+ * @param string $page Page
+ * @param string $selected code pre-selectionne
+ * @param string $htmlname Name of select html field
+ * @return void
*/
public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')
{
// phpcs:enable
global $langs;
if ($htmlname != "none") {
- print '';
} else {
dol_include_once('/core/lib/company.lib.php');
@@ -5817,14 +5861,15 @@ class Form
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
* Show form with multicurrency rate
*
- * @param string $page Page
- * @param double $rate Current rate
- * @param string $htmlname Name of select html field
- * @param string $currency Currency code to explain the rate
- * @return void
+ * @param string $page Page
+ * @param double $rate Current rate
+ * @param string $htmlname Name of select html field
+ * @param string $currency Currency code to explain the rate
+ * @return void
*/
public function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '')
{
@@ -5832,21 +5877,21 @@ class Form
global $langs, $mysoc, $conf;
if ($htmlname != "none") {
- print '';
} else {
if (!empty($rate)) {
print price($rate, 1, $langs, 1, 0);
if ($currency && $rate != 1) {
- print ' ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
+ print ' (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';
}
} else {
print 1;
@@ -5856,29 +5901,30 @@ class Form
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+
/**
- * Show a select box with available absolute discounts
+ * Show a select box with available absolute discounts
*
- * @param string $page Page URL where form is shown
- * @param int $selected Value pre-selected
- * @param string $htmlname Name of SELECT component. If 'none', not changeable. Example 'remise_id'.
- * @param int $socid Third party id
- * @param float $amount Total amount available
- * @param string $filter SQL filter on discounts
- * @param int $maxvalue Max value for lines that can be selected
- * @param string $more More string to add
- * @param int $hidelist 1=Hide list
- * @param int $discount_type 0 => customer discount, 1 => supplier discount
- * @return void
+ * @param string $page Page URL where form is shown
+ * @param int $selected Value pre-selected
+ * @param string $htmlname Name of SELECT component. If 'none', not changeable. Example 'remise_id'.
+ * @param int $socid Third party id
+ * @param float $amount Total amount available
+ * @param string $filter SQL filter on discounts
+ * @param int $maxvalue Max value for lines that can be selected
+ * @param string $more More string to add
+ * @param int $hidelist 1=Hide list
+ * @param int $discount_type 0 => customer discount, 1 => supplier discount
+ * @return void
*/
public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)
{
// phpcs:enable
global $conf, $langs;
if ($htmlname != "none") {
- print '
';
+ } else {
+ $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ }
+ }
+
+ if ($withpicto != 2) {
+ $result .= $this->ref;
+ }
+
+ $result .= $linkend;
+ //if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+ global $action, $hookmanager;
+ $hookmanager->initHooks(array($this->element.'dao'));
+ $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Return a thumb for kanban views
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @param array $arraydata Array of data
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '', $arraydata = null)
+ {
+ global $conf, $langs;
+ $return = '