Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur
2022-04-07 15:59:50 +02:00
parent 637f73a833
commit b8d19c9311
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/main.inc.php
View File

@@ -2410,7 +2410,7 @@ function printDropdownQuickadd()
"position" => 50, "position" => 50,
), ),
array( array(
"url" => "/compta/facture/card.php?action=create", "url" => "/contrat/card.php?action=create",
"title" => "NewContractSubscription@contracts", "title" => "NewContractSubscription@contracts",
"name" => "Contract@contracts", "name" => "Contract@contracts",
"picto" => "object_contract", "picto" => "object_contract",

20
htdocs/societe/card.php
View File

@@ -1320,16 +1320,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>'; print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>'; print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
// Parent company
if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
print '<tr>';
print '<td>'.$langs->trans('ParentCompany').'</td>';
print '<td colspan="3" class="maxwidthonsmartphone">';
print img_picto('', 'company', 'class="paddingrightonly"');
print $form->select_thirdparty_list('', 'parent_company_id', '', $langs->trans("ThirdParty"));
print '</td></tr>';
}
// Prospect/Customer // Prospect/Customer
print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>'; print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
print '<td class="maxwidthonsmartphone">'; print '<td class="maxwidthonsmartphone">';
@@ -1675,6 +1665,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3'); $parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
// Parent company
if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
print '<tr>';
print '<td>'.$langs->trans('ParentCompany').'</td>';
print '<td colspan="3" class="maxwidthonsmartphone">';
print img_picto('', 'company', 'class="paddingrightonly"');
print $form->select_company(GETPOST('parent_company_id'), 'parent_company_id');
print '</td></tr>';
}
// Assign a sale representative // Assign a sale representative
print '<tr>'; print '<tr>';
print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>'; print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';

9
htdocs/theme/eldy/dropdown.inc.php
View File

@@ -21,8 +21,8 @@ button.dropdown-item.global-search-item {
} }
#topmenu-bookmark-dropdown .dropdown-menu { #topmenu-bookmark-dropdown .dropdown-menu {
min-width: 300px; min-width: 360px;
max-width: 360px; max-width: 400px;
} }
@@ -499,4 +499,9 @@ div.quickaddblock:focus {
margin-left: 5px; margin-left: 5px;
right: 0; right: 0;
} }
#topmenu-bookmark-dropdown .dropdown-menu {
min-width: 280px;
max-width: 360px;
}
} }