mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
Laurent Destailleur (aka Eldy)
commit
e400883ad1
|
|
@ -322,7 +322,7 @@ class Categorie extends CommonObject
|
|||
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,),
|
||||
'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => 1, 'visible' => 0, 'default' => '1', 'notnull' => 1, 'index' => 1, 'position' => 5),
|
||||
'fk_parent' => array('type' => 'integer', 'label' => 'Fkparent', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
|
||||
'label' => array('type' => 'varchar(180)', 'label' => 'Label', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',),
|
||||
'label' => array('type' => 'varchar(180)', 'label' => 'Label', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150', 'showoncombobox' => 1),
|
||||
'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 0, 'alwayseditable' => 1,),
|
||||
'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'position' => 35, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1,),
|
||||
'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,),
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
|
|||
$langs->load("boxes");
|
||||
$donationstatic = new Don($db);
|
||||
|
||||
$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut as status";
|
||||
$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut as status, d.fk_soc as socid";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
|
||||
$sql .= " WHERE d.entity IN (".getEntity('donation').")";
|
||||
// Add where from hooks
|
||||
|
|
@ -484,9 +484,17 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
|
|||
$donationstatic->statut = $obj->status;
|
||||
$donationstatic->status = $obj->status;
|
||||
|
||||
$label = $donationstatic->getFullName($langs);
|
||||
if ($obj->societe) {
|
||||
$label .= ($label ? ' - ' : '').$obj->societe;
|
||||
if (!empty($obj->socid)) {
|
||||
$companystatic = new Societe($db);
|
||||
$ret = $companystatic->fetch($obj->socid);
|
||||
if ($ret > 0) {
|
||||
$label = $companystatic->getNomUrl(1);
|
||||
}
|
||||
} else {
|
||||
$label = $donationstatic->getFullName($langs);
|
||||
if ($obj->societe) {
|
||||
$label .= ($label ? ' - ' : '').$obj->societe;
|
||||
}
|
||||
}
|
||||
|
||||
print '<tr class="oddeven tdoverflowmax100">';
|
||||
|
|
|
|||
|
|
@ -2065,7 +2065,7 @@ class ExtraFields
|
|||
} elseif ($type == 'price') {
|
||||
//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
|
||||
if ($value || $value == '0') {
|
||||
$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
|
||||
$value = price($value, 0, $outputlangs, 0, getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'), -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
|
||||
}
|
||||
} elseif ($type == 'pricecy') {
|
||||
$currency = $conf->currency;
|
||||
|
|
@ -2076,7 +2076,7 @@ class ExtraFields
|
|||
$value = $pricetmp[0];
|
||||
}
|
||||
if ($value || $value == '0') {
|
||||
$value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
|
||||
$value = price($value, 0, $outputlangs, 0, getDolGlobalInt('MAIN_MAX_DECIMALS_TOT'), -1, $currency);
|
||||
}
|
||||
} elseif ($type == 'select') {
|
||||
$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');
|
||||
|
|
@ -2313,7 +2313,17 @@ class ExtraFields
|
|||
$tmpobject = new $classname($this->db);
|
||||
'@phan-var-force CommonObject $tmpobject';
|
||||
$tmpobject->fetch($value);
|
||||
$value = $tmpobject->getNomUrl(3);
|
||||
|
||||
if (get_class($tmpobject) == 'Categorie') {
|
||||
// For category object, rendering must use the same method than the one deinfed into showCategories()
|
||||
$color = $tmpobject->color;
|
||||
$sfortag = '<span class="noborderoncategories"' . ($color ? ' style="background: #' . $color . ';"' : ' style="background: #bbb"') . '>';
|
||||
$sfortag .= $tmpobject->getNomUrl(3);
|
||||
$sfortag .= '</span>';
|
||||
$value = $sfortag;
|
||||
} else {
|
||||
$value = $tmpobject->getNomUrl(3);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
dol_syslog('Error bad setup of extrafield', LOG_WARNING);
|
||||
|
|
|
|||
|
|
@ -9587,7 +9587,11 @@ class Form
|
|||
foreach ($categories as $c) {
|
||||
$ways = $c->print_all_ways(' >> ', ($nolink ? 'none' : ''), 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
|
||||
foreach ($ways as $way) {
|
||||
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
|
||||
$color = $c->color;
|
||||
$sfortag = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($color ? ' style="background: #' . $color . ';"' : ' style="background: #bbb"') . '>';
|
||||
$sfortag .= $way;
|
||||
$sfortag .= '</li>';
|
||||
$toprint[] = $sfortag;
|
||||
}
|
||||
}
|
||||
if (empty($toprint)) {
|
||||
|
|
|
|||
|
|
@ -1597,9 +1597,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
|
|||
}
|
||||
}
|
||||
} else {
|
||||
if (empty($nophperrors)) {
|
||||
$ok = false; // to avoid false positive
|
||||
}
|
||||
$ok = true; // nothing to delete when glob is on must return ok
|
||||
dol_syslog("No files to delete found", LOG_DEBUG);
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -195,8 +195,8 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
|
|||
<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></textarea>
|
||||
</td><td>
|
||||
<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("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
|
||||
<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue2')?></span>
|
||||
<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 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="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>
|
||||
|
|
|
|||
|
|
@ -257,8 +257,8 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
|
|||
<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($param_chain); ?></textarea>
|
||||
</td><td>
|
||||
<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("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
|
||||
<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 1, 0, '', 0, 2, 'helpvalue2')?></span>
|
||||
<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist").(getDolGlobalInt('MAIN_FEATUREES_LEVEL') > 0 ? '<br>'.$langs->trans("ExtrafieldParamHelpsellist2") : ''), 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="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>
|
||||
|
|
|
|||
|
|
@ -254,6 +254,7 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
|
|||
|
||||
//TODO Improve element and rights detection
|
||||
if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra) {
|
||||
// Show the extrafield in create or edit mode
|
||||
$fieldid = 'id';
|
||||
if ($object->table_element == 'societe') {
|
||||
$fieldid = 'socid';
|
||||
|
|
@ -269,6 +270,8 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
|
|||
|
||||
print '</form>';
|
||||
} else {
|
||||
// Show the extrafield in view mode
|
||||
|
||||
//var_dump($tmpkeyextra.'-'.$value.'-'.$object->table_element);
|
||||
print $extrafields->showOutputField($tmpkeyextra, $value, '', $object->table_element, null, $object);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -422,7 +422,7 @@ if ($action == 'create') {
|
|||
print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
|
||||
print '<td>';
|
||||
$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
|
||||
print $form->select_company('', 'socid', $filter, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
|
||||
print $form->select_company($socid, 'socid', $filter, 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
|
||||
// Option to reload page to retrieve customer information. Note, this clear other input
|
||||
if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
|
||||
print '<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ $max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT', 5);
|
|||
* Last modified donations
|
||||
*/
|
||||
|
||||
$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.societe, c.lastname, c.firstname, c.tms as datem, c.amount";
|
||||
$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.societe, c.lastname, c.firstname, c.tms as datem, c.amount, c.fk_soc as socid";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."don as c";
|
||||
$sql .= " WHERE c.entity IN (".getEntity("don").")";
|
||||
//$sql.= " AND c.fk_statut > 2";
|
||||
|
|
@ -245,9 +245,17 @@ if ($resql) {
|
|||
print '</td>';
|
||||
|
||||
print '<td class="nobordernopadding">';
|
||||
print $obj->societe;
|
||||
print($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
|
||||
print dolGetFirstLastname($obj->firstname, $obj->lastname);
|
||||
if (!empty($obj->socid)) {
|
||||
$companystatic = new Societe($db);
|
||||
$ret = $companystatic->fetch($obj->socid);
|
||||
if ($ret > 0) {
|
||||
print $companystatic->getNomUrl(1);
|
||||
}
|
||||
} else {
|
||||
print $obj->societe;
|
||||
print($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
|
||||
print dolGetFirstLastname($obj->firstname, $obj->lastname);
|
||||
}
|
||||
print '</td>';
|
||||
|
||||
print '<td class="right nobordernopadding nowraponall amount">';
|
||||
|
|
|
|||
|
|
@ -475,8 +475,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
|
|||
ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
|
||||
ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
|
||||
ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
|
||||
ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax extra.fieldcode=... (where fieldcode is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
|
||||
ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
|
||||
ExtrafieldParamHelpsellist=List of values coming from a table<br><br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a condition. It must use the USF syntax. Example: (active:=:1) to display only active value<br><br>You can also use $ID$ in filter which is the current id of current object<br>If you want to filter on extrafields use syntax extra.fieldcode=... (where fieldcode is the code of extrafield)
|
||||
ExtrafieldParamHelpsellist2=<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
|
||||
ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]
|
||||
ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
|
||||
LibraryToBuildPDF=Library used for PDF generation
|
||||
LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
|
||||
|
|
|
|||
|
|
@ -437,4 +437,5 @@ ErrorThisContactXIsAlreadyDefinedAsThisType=%s is already defined as contact for
|
|||
ErrorThisGroupIsAlreadyDefinedAsThisType=The contacts with this group are already defined as contact for this type.
|
||||
EmptyMessageNotAllowedError=Empty message is not allowed
|
||||
ErrorIsNotInError=%s is not in error
|
||||
ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
|
||||
ErrorFilenameExtensionNotAllowed=File %s has a forbidden file extension
|
||||
ErrorNoValueForSelectListType=Error, a value for this type of field is mandatory
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ if ($action == 'remove_file' && $user->hasRight('projet', 'creer')) {
|
|||
$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
|
||||
$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
|
||||
|
||||
$ret = dol_delete_file($file);
|
||||
$ret = dol_delete_file($file, 1);
|
||||
if ($ret) {
|
||||
setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -7378,10 +7378,10 @@ span#select2-boxbookmark-container {
|
|||
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 3px 5px 2px 5px;
|
||||
padding: 3px 5px 3px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
/* line-height: 1em; */
|
||||
color: #333;
|
||||
cursor: default;
|
||||
border: 1px solid #aaaaaa;
|
||||
|
|
|
|||
|
|
@ -7228,10 +7228,10 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
|
|||
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 3px 5px 2px 5px;
|
||||
padding: 3px 5px 3px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
/* line-height: 1em; */
|
||||
color: #444;
|
||||
cursor: default;
|
||||
border: 1px solid #ddd;
|
||||
|
|
@ -7328,6 +7328,7 @@ select.multiselectononeline {
|
|||
box-shadow: none;
|
||||
-webkit-box-shadow: none !important;
|
||||
box-shadow: none !important;
|
||||
margin-top: 1px !important;
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
span.noborderoncategories a, li.noborderoncategories a {
|
||||
|
|
|
|||
|
|
@ -2569,32 +2569,32 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
}
|
||||
|
||||
if ($object->socid > 0 && !($object->contact_id > 0)) { // external user but no link to a contact
|
||||
print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300');
|
||||
print img_picto('', 'contact');
|
||||
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($object->socid, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300');
|
||||
print img_picto('', 'contact', 'class="pictofixedwidth"');
|
||||
//print $form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
|
||||
print $form->select_contact(0, 0, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
|
||||
if ($object->ldap_sid) {
|
||||
print ' ('.$langs->trans("DomainUser").')';
|
||||
}
|
||||
} elseif ($object->socid > 0 && $object->contact_id > 0) { // external user with a link to a contact
|
||||
print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
|
||||
print img_picto('', 'contact');
|
||||
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($object->socid, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
|
||||
print img_picto('', 'contact', 'class="pictofixedwidth"');
|
||||
//print $form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
|
||||
print $form->select_contact(0, $object->contact_id, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
|
||||
if ($object->ldap_sid) {
|
||||
print ' ('.$langs->trans("DomainUser").')';
|
||||
}
|
||||
} elseif (!($object->socid > 0) && $object->contact_id > 0) { // internal user with a link to a contact
|
||||
print img_picto('', 'company').$form->select_company(0, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
|
||||
print img_picto('', 'contact');
|
||||
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(0, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
|
||||
print img_picto('', 'contact', 'class="pictofixedwidth"');
|
||||
//print $form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
|
||||
print $form->select_contact(0, $object->contact_id, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
|
||||
if ($object->ldap_sid) {
|
||||
print ' ('.$langs->trans("DomainUser").')';
|
||||
}
|
||||
} else { // $object->socid is not > 0 here
|
||||
print img_picto('', 'company').$form->select_company(0, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
|
||||
print img_picto('', 'contact');
|
||||
print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(0, 'socid', '', ' ', 0, 0, array(), 0, 'maxwidth300'); // We keep thirdparty empty, contact is already set
|
||||
print img_picto('', 'contact', 'class="pictofixedwidth"');
|
||||
//print $form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, 'maxwidth300', false, 1);
|
||||
print $form->select_contact(0, 0, 'contactid', 1, '', '', 1, 'minwidth100imp widthcentpercentminusxx maxwidth300', true, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ class FilesLibTest extends CommonClassTest
|
|||
// Again to test there is error when deleting a non existing file with option disableglob
|
||||
$result = dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
|
||||
print __METHOD__." result=".$result."\n";
|
||||
$this->assertFalse($result, 'delete file that does not exists with disableglo must return ko');
|
||||
$this->assertFalse($result, 'delete file that does not exists with disabling glob must return ko');
|
||||
|
||||
// Again to test there is no error when deleting a non existing file without option disableglob
|
||||
$result = dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user