Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
This commit is contained in:
commit
c3dddfc96e
16 changed files with 79 additions and 56 deletions
|
|
@ -7,6 +7,7 @@ English Dolibarr ChangeLog
|
|||
For users:
|
||||
----------
|
||||
NEW: NEW Module - help to setup OpenID Connect (#30317)
|
||||
NEW: Module AI moved from experimental to stable
|
||||
NEW: Add hidden option CONTRACT_HIDE_MYCOMPANY_SIGNATURE_SECTION_PDF
|
||||
NEW: Add a tab on recurring invoice card to see the list of invoices generated from this recurring invoice (customer and supplier invoices) (#31463)
|
||||
NEW: #28871 signed_status to commande (#30359)
|
||||
|
|
|
|||
|
|
@ -240,7 +240,11 @@ if ($mode && !count($data)) {
|
|||
print '<br>';
|
||||
} else {
|
||||
if ($mode == 'memberbycountry') {
|
||||
print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc").'</span><br>';
|
||||
print '<span class="opacitymedium">'.$langs->trans("MembersByCountryDesc");
|
||||
if (getDolGlobalString("GOOGLE_SHOW_COUNTRY_GRAPH")) {
|
||||
print $langs->trans("MembersByCountryDesc2");
|
||||
}
|
||||
print '</span><br>';
|
||||
} elseif ($mode == 'memberbystate') {
|
||||
print '<span class="opacitymedium">'.$langs->trans("MembersByStateDesc").'</span><br>';
|
||||
} elseif ($mode == 'memberbytown') {
|
||||
|
|
@ -263,7 +267,7 @@ if ($mode && !count($data)) {
|
|||
|
||||
|
||||
// Show graphics
|
||||
if (count($arrayjs) && $mode == 'memberbycountry') {
|
||||
if (getDolGlobalString("GOOGLE_SHOW_COUNTRY_GRAPH") && $mode == 'memberbycountry') {
|
||||
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
|
||||
$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
|
||||
if (is_readable($color_file)) {
|
||||
|
|
|
|||
|
|
@ -126,29 +126,33 @@ if ($action != '') {
|
|||
* View
|
||||
*/
|
||||
|
||||
$form = new Form($db);
|
||||
|
||||
llxHeader();
|
||||
|
||||
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
|
||||
print load_fiche_titre($langs->trans("OpenIDconnectSetup"), $linkback, 'title_setup');
|
||||
print "<br>\n";
|
||||
|
||||
$head = openid_connect_prepare_head();
|
||||
|
||||
print dol_get_fiche_head($head, 'settings', $langs->trans("Parameters"), 0, 'action');
|
||||
print dol_get_fiche_head($head, 'settings', $langs->trans("Parameters"), -1, 'action');
|
||||
|
||||
print $langs->trans("SeeWikiDocForHelpInSetupOpenIDCOnnect");
|
||||
print ' - ';
|
||||
print img_picto('', 'url', 'class="pictofixedwidth"').'<a target="_blank" href="https://wiki.dolibarr.org/index.php?title=Authentication,_SSO_and_SSL#Mode_openid_connect">';
|
||||
print $langs->trans("SeeHere");
|
||||
print '</a>';
|
||||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
print '<br>';
|
||||
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
|
||||
print '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="action" value="set">';
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="tagtable noborder liste nobottomiftotal">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Parameters").'</td>'."\n";
|
||||
print '<td align="center"> </td>'."\n";
|
||||
print '<td align="right">'.$langs->trans("Value").'</td>'."\n";
|
||||
print '<th class="liste_titre">'.$langs->trans("Parameters").'</th>'."\n";
|
||||
print '<th class="liste_titre"></th>'."\n";
|
||||
print '<th class="liste_titre"></th>'."\n";
|
||||
print "</tr>\n";
|
||||
|
||||
// MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM
|
||||
|
|
@ -232,6 +236,7 @@ print '<input class="minwidth300" value="'.dol_escape_htmltag(getDolGlobalString
|
|||
print '</td></tr>' . "\n";
|
||||
|
||||
print '</table>'."\n";
|
||||
print '</div>';
|
||||
|
||||
print '<br>';
|
||||
print '<div align="center">';
|
||||
|
|
@ -242,7 +247,5 @@ print '</form>';
|
|||
|
||||
print '<br>';
|
||||
|
||||
print dol_get_fiche_end();
|
||||
|
||||
llxFooter();
|
||||
$db->close();
|
||||
|
|
|
|||
|
|
@ -281,7 +281,9 @@ if ($action == 'edit' || $action == 'deleteproperty') {
|
|||
$out .= '</tr>';
|
||||
$out .= '<tr class="oddeven">';
|
||||
$out .= '<td class="col-setup-title">';
|
||||
$out .= '<span id="prePrompt" class="spanforparamtooltip">'.$langs->trans("Pre-Prompt").'</span>';
|
||||
$out .= '<span id="prePrompt" class="spanforparamtooltip">';
|
||||
$out .= $form->textwithpicto($langs->trans("Pre-Prompt"), $langs->trans("Pre-PromptHelp"));
|
||||
$out .= '</span>';
|
||||
$out .= '</td>';
|
||||
$out .= '<td>';
|
||||
$out .= '<textarea class="flat minwidth500 quatrevingtpercent" id="prePromptInput" name="prePrompt" rows="3"></textarea>';
|
||||
|
|
@ -289,7 +291,9 @@ if ($action == 'edit' || $action == 'deleteproperty') {
|
|||
$out .= '</tr>';
|
||||
$out .= '<tr class="oddeven">';
|
||||
$out .= '<td class="col-setup-title">';
|
||||
$out .= '<span id="postPrompt" class="spanforparamtooltip">'.$langs->trans("Post-Prompt").'</span>';
|
||||
$out .= '<span id="postPrompt" class="spanforparamtooltip">';
|
||||
$out .= $form->textwithpicto($langs->trans("Post-Prompt"), $langs->trans("Post-PromptHelp"));
|
||||
$out .= '</span>';
|
||||
$out .= '</td>';
|
||||
$out .= '<td>';
|
||||
$out .= '<textarea class="flat minwidth500 quatrevingtpercent" id="postPromptInput" name="postPrompt" rows="3"></textarea>';
|
||||
|
|
@ -297,7 +301,9 @@ if ($action == 'edit' || $action == 'deleteproperty') {
|
|||
$out .= '</tr>';
|
||||
$out .= '<tr class="oddeven">';
|
||||
$out .= '<td class="col-setup-title">';
|
||||
$out .= '<span id="blacklists" class="spanforparamtooltip">'.$langs->trans("BlackListWords").' '.img_help(1, 'Words must be separated by a coma (",")').'</span>';
|
||||
$out .= '<span id="blacklists" class="spanforparamtooltip">';
|
||||
$out .= $form->textwithpicto($langs->trans("BlackListWords"), $langs->trans("BlackListWordsAIHelp").'.<br>'.$langs->trans("BlackListWordsHelp"));
|
||||
$out .= '</span>';
|
||||
$out .= '</td>';
|
||||
$out .= '<td>';
|
||||
$out .= '<textarea class="flat minwidth500 quatrevingtpercent" id="blacklistsInput" name="blacklists" rows="3"></textarea>';
|
||||
|
|
|
|||
|
|
@ -1397,7 +1397,7 @@ if ($action == 'create') {
|
|||
}
|
||||
|
||||
// Title
|
||||
print '<tr><td'.(!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
|
||||
print '<tr><td'.(getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? '' : ' class="fieldrequired titlefieldcreate"').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
|
||||
|
||||
// Full day
|
||||
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td>';
|
||||
|
|
@ -1430,10 +1430,11 @@ if ($action == 'create') {
|
|||
print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr><td></td><td>';
|
||||
// Recurring event
|
||||
$userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0);
|
||||
if ($userepeatevent) {
|
||||
print '<tr><td></td><td>';
|
||||
|
||||
// Repeat
|
||||
//print ' ';
|
||||
print '<div class="opacitymedium inline-block small">';
|
||||
|
|
@ -1514,9 +1515,8 @@ if ($action == 'create') {
|
|||
});
|
||||
</script>';
|
||||
print '</div>';
|
||||
//print '</td></tr>';
|
||||
print '</td></tr>';
|
||||
}
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr><td class=""> </td><td></td></tr>';
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class modAi extends DolibarrModules
|
|||
$this->descriptionlong = "AiDescriptionLong";
|
||||
|
||||
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
|
||||
$this->version = 'experimental';
|
||||
$this->version = 'dolibarr';
|
||||
|
||||
// Key used in llx_const table to save module status enabled/disabled (where BOOKCAL is value of property name of module in uppercase)
|
||||
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
|
||||
|
|
|
|||
|
|
@ -2507,7 +2507,7 @@ AiDescription=AI (Artificial Intelligence) features
|
|||
AiDescriptionLong=Provides AI (Artificial Intelligence) features in different parts of the application. Need external AI API.
|
||||
AI_API_KEY=Key for AI api
|
||||
AI_API_URL=Endpoint URL for AI api
|
||||
AI_API_SERVICE=Service to use for AI features
|
||||
AI_API_SERVICE=AI service to use
|
||||
AiSetup=AI module setup
|
||||
AiCustomPrompt=AI custom prompt
|
||||
AI_CONFIGURATIONS_PROMPT=Custom prompt
|
||||
|
|
@ -2519,6 +2519,7 @@ AIPromptForFeatures=AI custom prompts for features
|
|||
EnterAnIP=Enter an IP address
|
||||
ConvertInto=Convert into
|
||||
YouAreHere=You are here
|
||||
SeeWikiDocForHelpInSetupOpenIDCOnnect=You can have a look at the wiki documentation to get information on how to setup an openid connect authentication
|
||||
BARCODE_ON_SHIPPING_PDF=Show the barcode on the shipping PDF document
|
||||
BARCODE_ON_RECEPTION_PDF=Show the barcode on the reception PDF document
|
||||
BARCODE_ON_STOCKTRANSFER_PDF=Show the barcode on the stock transfer PDF document
|
||||
|
|
@ -2557,6 +2558,10 @@ MainAuthenticationOidcLogoutRedirectUrlDesc=Dolibarr logout URL to authorize on
|
|||
MainAuthenticationOidcLoginClaimName=Login claim
|
||||
MainAuthenticationOidcLoginClaimDesc=OpenID Connect claim matching the Dolibarr user login. If not set or empty, defaults to email
|
||||
BlackListWords=Black list of words
|
||||
BlackListWordsHelp=Words must be separated by a coma (",")
|
||||
BlackListWordsAIHelp=This is a list of words that will be completely removed from the result of any AI requests
|
||||
Pre-PromptHelp=This text will always be added before the text you enter to make an AI request
|
||||
Post-PromptHelp=This text will always be added after the text you enter to make an AI request
|
||||
AddBlackList=Add to black list
|
||||
FediverseSetup=Configuration of fediverse section
|
||||
ConfigImportSocialNetwork=Configuration of social networks compatible with Fediverse
|
||||
|
|
|
|||
|
|
@ -191,7 +191,8 @@ MembersStatisticsByRegion=Members statistics by region
|
|||
NbOfMembers=Total number of members
|
||||
NbOfActiveMembers=Total number of current active members
|
||||
NoValidatedMemberYet=No validated members found
|
||||
MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
|
||||
MembersByCountryDesc=This screen shows you the statistics of members by countries.
|
||||
MembersByCountryDesc2=Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
|
||||
MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
|
||||
MembersByTownDesc=This screen show you statistics of members by town.
|
||||
MembersByNature=This screen show you statistics of members by nature.
|
||||
|
|
|
|||
|
|
@ -92,8 +92,8 @@ DisableSiteFirst=Put website offline first
|
|||
MyContainerTitle=My web site title
|
||||
AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
|
||||
SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
|
||||
WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
|
||||
WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
|
||||
WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the table of web site account fo thirdparties
|
||||
WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store the web site accounts (login/pass) for each third party
|
||||
YouMustDefineTheHomePage=You must first define the default Home page
|
||||
OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting JavaScript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor might not work correctly when used on a grabbed external page.
|
||||
OnlyEditionOfSourceForGrabbedContent=Only HTML source modification is possible when content is grabbed from an external site
|
||||
|
|
|
|||
|
|
@ -191,7 +191,8 @@ MembersStatisticsByRegion=Statistiques des membres par région
|
|||
NbOfMembers=Nombre total d'adhérents
|
||||
NbOfActiveMembers=Nombre total d'adhérents actifs actuellement
|
||||
NoValidatedMemberYet=Aucun membre validé trouvé
|
||||
MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par pays. Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
|
||||
MembersByCountryDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par pays.
|
||||
MembersByCountryDesc2=Le graphique utilise toutefois le service en ligne de graphique de Google et n'est opérationnel uniquement que si une connexion internet est disponible.
|
||||
MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par département/province/canton.
|
||||
MembersByTownDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par ville.
|
||||
MembersByNature=Cet écran vous montre les statistiques sur les adhérents par nature.
|
||||
|
|
|
|||
|
|
@ -1092,7 +1092,7 @@ if ($num == 0) {
|
|||
$colspan++;
|
||||
}
|
||||
}
|
||||
if ($managedfor != 'member') {
|
||||
if ($managedfor == 'member') {
|
||||
$colspan++; // End of subscription date
|
||||
}
|
||||
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
|
||||
|
|
|
|||
|
|
@ -1344,7 +1344,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
} else {
|
||||
print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
|
||||
}
|
||||
print '</td><td'.(!getDolGlobalString('SOCIETE_USEPREFIX') ? ' colspan="3"' : '').'>';
|
||||
print '</td><td'.(getDolGlobalString('SOCIETE_USEPREFIX') ? '' : ' colspan="3"').'>';
|
||||
|
||||
print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
|
||||
print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages
|
||||
|
|
@ -1564,14 +1564,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
print '</td></tr></table>';
|
||||
print '</td>';
|
||||
|
||||
if ($conf->browser->layout == 'phone') {
|
||||
print '</tr><tr>';
|
||||
}
|
||||
|
||||
print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td><td>';
|
||||
|
||||
if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
|
||||
print '<table class="nobordernopadding"><tr><td>';
|
||||
if ($conf->browser->layout == 'phone') {
|
||||
print '<td colspan="2"></td>';
|
||||
print '</tr><tr>';
|
||||
}
|
||||
print '<td>'.$form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0).'</td>';
|
||||
print '<td>';
|
||||
print '<table class="nobordernopadding"><tr>';
|
||||
$tmpcode = $object->code_fournisseur;
|
||||
if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
|
||||
$tmpcode = $modCodeFournisseur->getNextValue($object, 1);
|
||||
|
|
@ -1581,8 +1581,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
|
|||
$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
|
||||
print $form->textwithpicto('', $s, 1);
|
||||
print '</td></tr></table>';
|
||||
print '</td>';
|
||||
} else {
|
||||
print '<td colspan="2"></td>';
|
||||
}
|
||||
print '</td></tr>';
|
||||
print '</tr>';
|
||||
|
||||
// Status
|
||||
print '<tr><td>'.$form->editfieldkey('Status', 'status', '', $object, 0).'</td><td colspan="3">';
|
||||
|
|
|
|||
|
|
@ -99,18 +99,18 @@ class SocieteAccount extends CommonObject
|
|||
public $fields = array(
|
||||
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => 'Id',),
|
||||
'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 5, 'default' => '1'),
|
||||
'login' => array('type' => 'varchar(64)', 'label' => 'Login', 'visible' => 1, 'enabled' => 1, 'notnull' => 1, 'position' => 10, 'showoncombobox' => 1, 'autofocusoncreate' => 1),
|
||||
'login' => array('type' => 'varchar(64)', 'label' => 'Login', 'visible' => 1, 'enabled' => 1, 'notnull' => 1, 'position' => 10, 'showoncombobox' => 1, 'autofocusoncreate' => 1, 'csslist' => 'tdoverflowmax150'),
|
||||
'pass_encoding' => array('type' => 'varchar(24)', 'label' => 'PassEncoding', 'visible' => 0, 'enabled' => 1, 'position' => 30),
|
||||
'pass_crypted' => array('type' => 'password', 'label' => 'Password', 'visible' => -1, 'enabled' => 1, 'position' => 31, 'notnull' => 1),
|
||||
'pass_temp' => array('type' => 'varchar(128)', 'label' => 'Temp', 'visible' => 0, 'enabled' => 0, 'position' => 32, 'notnull' => -1,),
|
||||
'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'visible' => 1, 'enabled' => 1, 'position' => 40, 'notnull' => -1, 'index' => 1, 'picto' => 'company', 'css' => 'maxwidth300 widthcentpercentminusxx'),
|
||||
'site' => array('type' => 'varchar(128)', 'label' => 'WebsiteTypeLabel', 'visible' => 0, 'enabled' => 0, 'position' => 41, 'notnull' => 1, 'default' => '', 'help' => 'Name of the website or service if this is account on an external website or service', 'csslist' => 'tdoverflowmax150', 'arrayofkeyval' => array(/* For static analysis, filled in constructor */)),
|
||||
'fk_website' => array('type' => 'integer:Website:website/class/website.class.php', 'label' => 'WebSite', 'visible' => 0, 'enabled' => 0, 'position' => 42, 'notnull' => -1, 'index' => 1, 'picto' => 'website', 'css' => 'maxwidth300 widthcentpercentminusxx'),
|
||||
'fk_website' => array('type' => 'integer:Website:website/class/website.class.php', 'label' => 'WebSite', 'visible' => 0, 'enabled' => 0, 'position' => 42, 'notnull' => -1, 'index' => 1, 'picto' => 'website', 'css' => 'maxwidth300 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
|
||||
'site_account' => array('type' => 'varchar(128)', 'label' => 'ExternalSiteAccount', 'visible' => 0, 'enabled' => 1, 'position' => 44, 'help' => 'A key to identify the account on external web site if this is an account on an external website'),
|
||||
'key_account' => array('type' => 'varchar(128)', 'label' => 'KeyAccount', 'visible' => 0, 'enabled' => 1, 'position' => 48, 'notnull' => 0, 'index' => 1, 'searchall' => 1, 'comment' => 'The id of third party in the external web site (for site_account if site_account defined)',),
|
||||
'date_last_login' => array('type' => 'datetime', 'label' => 'LastConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 50, 'notnull' => 0,),
|
||||
'date_previous_login' => array('type' => 'datetime', 'label' => 'PreviousConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 51, 'notnull' => 0,),
|
||||
'date_last_reset_password' => array('type' => 'datetime', 'label' => 'PreviousResetPassword', 'visible' => 0, 'enabled' => 1, 'position' => 53, 'notnull' => 0,),
|
||||
'date_last_login' => array('type' => 'datetime', 'label' => 'LastConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'css' => 'nowraponall'),
|
||||
'date_previous_login' => array('type' => 'datetime', 'label' => 'PreviousConnexion', 'visible' => 2, 'enabled' => 1, 'position' => 51, 'notnull' => 0, 'css' => 'nowraponall'),
|
||||
'date_last_reset_password' => array('type' => 'datetime', 'label' => 'PreviousResetPassword', 'visible' => 0, 'enabled' => 1, 'position' => 53, 'notnull' => 0, 'css' => 'nowraponall'),
|
||||
//'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>45, 'notnull'=>-1,),
|
||||
'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'visible' => -1, 'enabled' => 1, 'position' => 46, 'notnull' => -1,),
|
||||
'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'visible' => -2, 'enabled' => 1, 'position' => 500, 'notnull' => 1,),
|
||||
|
|
|
|||
|
|
@ -749,6 +749,7 @@ input:-webkit-autofill {
|
|||
/* CSS for placeholder */
|
||||
.placeholder { color: #ccc; }
|
||||
select.placeholder { color: #ccc; }
|
||||
.select2-selection__choice .placeholder { color: #aaa; }
|
||||
::-webkit-input-placeholder { color: #ccc; }
|
||||
input:-moz-placeholder { color: #ccc; }
|
||||
select.placeholder option:not(.opacitymediumbycolor):not(.opacitymedium) {
|
||||
|
|
@ -4207,6 +4208,7 @@ div .tdtop:not(.tagtdnote) {
|
|||
padding-bottom: 2px !important; */
|
||||
padding-top: 7px !important;
|
||||
padding-bottom: 0px !important;
|
||||
height: unset !important;
|
||||
}
|
||||
|
||||
table.border td, table.bordernooddeven td, div.border div div.tagtd {
|
||||
|
|
@ -6533,10 +6535,6 @@ a.cke_dialog_ui_button
|
|||
-webkit-box-shadow: 3px 3px 4px #DDD !important;
|
||||
box-shadow: 3px 3px 4px #DDD !important;
|
||||
}
|
||||
.cke_dialog_ui_hbox_last
|
||||
{
|
||||
vertical-align: bottom !important;
|
||||
}
|
||||
.cke_dialog_ui_hbox_first {
|
||||
vertical-align: middle !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -934,6 +934,7 @@ input[type=checkbox], input[type=radio] {
|
|||
/* CSS for placeholder */
|
||||
.placeholder { color: #ccc; }
|
||||
select.placeholder { color: #ccc; }
|
||||
.select2-selection__choice .placeholder { color: #aaa; }
|
||||
::-webkit-input-placeholder { color:#ccc; }
|
||||
:-moz-placeholder { color:#bbb; } /* firefox 18- */
|
||||
::-moz-placeholder { color:#bbb; } /* firefox 19+ */
|
||||
|
|
@ -3968,9 +3969,10 @@ div.tabs {
|
|||
margin-right: 6px !important;*/
|
||||
clear:both;
|
||||
height:100%;
|
||||
margin-top: 18px;
|
||||
}
|
||||
div.tabsElem {
|
||||
margin-top: 12px;
|
||||
/* margin-top: 18px; */
|
||||
} /* To avoid overlap of tabs when not browser */
|
||||
div.tabsElem a {
|
||||
font-weight: normal !important;
|
||||
|
|
@ -6428,7 +6430,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
|
|||
body.cke_show_borders {
|
||||
margin: 5px !important;
|
||||
}
|
||||
|
||||
table.cke_dialog.cke_browser_webkit {
|
||||
border-collapse: separate;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.cke_dialog {
|
||||
border: 1px #bbb solid ! important;
|
||||
}
|
||||
|
|
@ -6449,17 +6454,10 @@ a.cke_dialog_ui_button
|
|||
-webkit-box-shadow: 3px 3px 4px #f4f4f4 !important;
|
||||
box-shadow: 3px 3px 4px #f4f4f4 !important;
|
||||
}
|
||||
.cke_dialog_ui_hbox_last
|
||||
{
|
||||
vertical-align: bottom !important;
|
||||
}
|
||||
.cke_dialog_ui_hbox_last
|
||||
{
|
||||
vertical-align: bottom !important;
|
||||
}
|
||||
.cke_combo_text {
|
||||
width: 40px !important;
|
||||
}
|
||||
|
||||
/*
|
||||
.cke_editable
|
||||
{
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php';
|
|||
*/
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array("website", "other"));
|
||||
$langs->loadLangs(array("companies", "website", "other"));
|
||||
|
||||
// Get parameters
|
||||
$id = GETPOSTINT('id');
|
||||
|
|
@ -383,6 +383,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||
print '<table class="border centpercent tableforfield">'."\n";
|
||||
|
||||
// Common attributes
|
||||
$keyforbreak='note_private'; // We change column just before this field
|
||||
//unset($object->fields['fk_project']); // Hide field already shown in banner
|
||||
//unset($object->fields['fk_soc']); // Hide field already shown in banner
|
||||
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
|
||||
|
||||
// Other attributes
|
||||
|
|
|
|||
Loading…
Reference in a new issue