Merge branch 'develop' into daraelmin-status-exclu

This commit is contained in:
daraelmin 2021-03-21 14:42:01 +01:00
commit 054864eccc
132 changed files with 576 additions and 331 deletions

View File

@ -19,8 +19,8 @@ WARNING:
Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
* The ICS value for direct debit or credit transfer is now store on each bank account instead of into the global setup.
* API /setup/shipment_methods has been replaced with API /setup/shipping_methods
* Field "tva" renamed into "total_tva" in llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
* Field "total" renamed into "total_ttc" in llx_propal, llx_supplier_proposal for better field name consistency
* Field "tva" renamed into "total_tva" for table llx_propal, llx_supplier_proposal, llx_commande, llx_commande_fournisseur for better field name consistency
* Field "total" renamed into "total_ttc" for table lx_propal, llx_supplier_proposal for better field name consistency
* If your database is PostgreSql, you must use version 9.1.0 or more (Dolibarr need the SQL function CONCAT)
* If your database is MySql or MariaDB, you need at least version 5.1

View File

@ -24,7 +24,7 @@
*/
/**
* \file htdocs/adherents/admin/adherent.php
* \file htdocs/adherents/admin/member_emails.php
* \ingroup member
* \brief Page to setup the module Foundation
*/
@ -70,9 +70,24 @@ $constantes = array(
//
if ($action == 'updateall') {
$db->begin();
$res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
$res1 = dolibarr_set_const($db, 'XXXX', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', 'alpha'), 'chaine', 0, '', $conf->entity);
if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
$res = 0;
foreach ($constantes as $constname => $value) {
$constvalue = (GETPOSTISSET('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname, 'alphanohtml') : GETPOST('constvalue'));
$consttype = (GETPOSTISSET('consttype_'.$constname) ? GETPOST('consttype_'.$constname, 'alphanohtml') : GETPOST('consttype'));
$constnote = (GETPOSTISSET('constnote_'.$constname) ? GETPOST('constnote_'.$constname, 'restricthtml') : GETPOST('constnote'));
$typetouse = empty($oldtypetonewone[$consttype]) ? $consttype : $oldtypetonewone[$consttype];
$constvalue = preg_replace('/:member$/', '', $constvalue);
$res = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
if ($res <= 0) {
$error++;
$action = 'list';
}
}
if ($error > 0) {
setEventMessages('ErrorFailedToSaveDate', null, 'errors');
$db->rollback();
} else {
@ -127,19 +142,19 @@ $head = member_admin_prepare_head();
print dol_get_fiche_head($head, 'emails', $langs->trans("Members"), -1, 'user');
// TODO Use global form
//print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
//print '<input type="hidden" name="token" value="'.newToken().'">';
//print '<input type="hidden" name="action" value="updateall">';
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="updateall">';
$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
//$helptext.='__YEAR__, __MONTH__, __DAY__'; // Not supported
form_constantes($constantes, 0, $helptext);
form_constantes($constantes, 3, $helptext);
//print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
//print '</form>';
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
print '</form>';
print dol_get_fiche_end();

View File

@ -19,7 +19,7 @@
*/
/**
* \file htdocs/adherents/admin/adherent_extrafields.php
* \file htdocs/adherents/admin/member_extrafields.php
* \ingroup member
* \brief Page to setup extra fields of members
*/

View File

@ -22,7 +22,7 @@
*/
/**
* \file htdocs/adherents/admin/adherent_type_extrafields.php
* \file htdocs/adherents/admin/member_type_extrafields.php
* \ingroup member
* \brief Page to setup extra fields of members
*/

View File

@ -92,7 +92,7 @@ if ($action == 'settemplates') {
if ($action == 'setvalue' && $user->admin) {
$db->begin();
$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "restricthtml"), 'chaine', 0, '', $conf->entity);
$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "alphawithlgt"), 'chaine', 0, '', $conf->entity);
if ($result < 0) {
$error++;
}
@ -270,7 +270,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
}
$helptext = '';
form_constantes($constantes, 2, $helptext);
form_constantes($constantes, 3, $helptext);
} else {
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';

View File

@ -445,12 +445,24 @@ if ($id > 0) {
// Employee
if ($action != 'editfk_user') {
$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
if (!empty($object->fk_user)) {
if ($object->getSommePaiement() > 0 && !empty($object->fk_user)) {
$userstatic = new User($db);
$userstatic->fetch($object->fk_user);
$morehtmlref .= $userstatic->getNomUrl(1);
$result = $userstatic->fetch($object->fk_user);
if ($result > 0) {
$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
}
} else {
$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
if (!empty($object->fk_user)) {
$userstatic = new User($db);
$result = $userstatic->fetch($object->fk_user);
if ($result > 0) {
$morehtmlref .= $userstatic->getNomUrl(1);
} else {
dol_print_error($db);
exit();
}
}
}
} else {
$morehtmlref .= '<br>'.$langs->trans('Employee').' :&nbsp;';

View File

@ -405,7 +405,7 @@ if ($action == 'create') {
print '</div>';
print "<br>\n";
dol_fiche_head();
print dol_get_fiche_head();
print '<table class="border centpercent">';
@ -512,7 +512,7 @@ if ($id) {
print '<input type="hidden" name="token" value="'.newToken().'">';
}
dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
print dol_get_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
$morehtmlref = '<div class="refidno">';
// Label of social contribution

View File

@ -851,6 +851,10 @@ class Conf
if (isset($this->projet) && !isset($this->project)) {
$this->project = $this->projet;
}
// member is new use, adherent is old use still initialised
if (isset($this->adherent) && !isset($this->member)) {
$this->member = $this->adherent;
}
// Object $mc
if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {

View File

@ -2577,7 +2577,7 @@ class Form
}
}
if ($showempty) {
$out .= '<option value="0" selected>'.$textifempty.'</option>';
$out .= '<option value="0" selected>'.($textifempty ? $textifempty : '&nbsp;').'</option>';
}
$i = 0;

View File

@ -417,7 +417,7 @@ class FormMail extends Form
$listofmimes = array();
$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) {
foreach ($this->param['fileinit'] as $file) {
$this->add_attached_files($file, basename($file), dol_mimetype($file));

View File

@ -124,7 +124,7 @@ class FormTicket
/**
* Show the form to input ticket
*
* @param int $withdolfichehead With dol_fiche_head
* @param int $withdolfichehead With dol_get_fiche_head() and dol_get_fiche_end()
* @param string $mode Mode ('create' or 'edit')
* @return void
*/

View File

@ -1488,7 +1488,7 @@ function complete_elementList_with_modules(&$elementList)
*
* @param array $tableau Array of constants array('key'=>array('type'=>type, 'label'=>label)
* where type can be 'string', 'text', 'textarea', 'html', 'yesno', 'emailtemplate:xxx', ...
* @param int $strictw3c 0=Include form into table (deprecated), 1=Form is outside table to respect W3C (deprecated), 2=No form nor button at all (form is output by caller, recommended)
* @param int $strictw3c 0=Include form into table (deprecated), 1=Form is outside table to respect W3C (deprecated), 2=No form nor button at all, 3=No form nor button at all and each field has a unique name (form is output by caller, recommended)
* @param string $helptext Help
* @return void
*/
@ -1510,7 +1510,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td class="titlefield">'.$langs->trans("Description").'</td>';
print '<td class="titlefieldcreate">'.$langs->trans("Description").'</td>';
print '<td>';
$text = $langs->trans("Value");
print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
@ -1614,24 +1614,24 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
foreach (array_keys($_Avery_Labels) as $codecards) {
$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
}
print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
print '<input type="hidden" name="consttype" value="yesno">';
print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
print '</td>';
} else {
print '<td>';
print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : '[]').'" value="'.($obj->type ? $obj->type : 'string').'">';
print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : '[]').'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
print '<input type="hidden" name="consttype'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.($obj->type ? $obj->type : 'string').'">';
print '<input type="hidden" name="constnote'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.nl2br(dol_escape_htmltag($obj->note)).'">';
if ($obj->type == 'textarea' || in_array($const, array('ADHERENT_CARD_TEXT', 'ADHERENT_CARD_TEXT_RIGHT', 'ADHERENT_ETIQUETTE_TEXT'))) {
print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" cols="50" rows="5" wrap="soft">'."\n";
print '<textarea class="flat" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" cols="50" rows="5" wrap="soft">'."\n";
print $obj->value;
print "</textarea>\n";
} elseif ($obj->type == 'html') {
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('constvalue_'.$const.(empty($strictw3c) ? '' : '[]'), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
$doleditor = new DolEditor('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
$doleditor->Create();
} elseif ($obj->type == 'yesno') {
print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, 1);
} elseif (preg_match('/emailtemplate/', $obj->type)) {
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
@ -1654,10 +1654,9 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
}
//var_dump($arraydefaultmessage);
//var_dump($arrayofmessagename);
print $form->selectarray('constvalue_'.$obj->name, $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
} else // type = 'string' ou 'chaine'
{
print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayofmessagename, $obj->value.':'.$tmp[1], 'None', 0, 0, '', 0, 0, 0, '', '', 1);
} else { // type = 'string' ou 'chaine'
print '<input type="text" class="flat minwidth300" name="constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')).'" value="'.dol_escape_htmltag($obj->value).'">';
}
print '</td>';
}

View File

@ -177,12 +177,12 @@ function member_admin_prepare_head()
$h = 0;
$head = array();
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php';
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member.php';
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php';
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_emails.php';
$head[$h][1] = $langs->trans("EMails");
$head[$h][2] = 'emails';
$h++;
@ -193,12 +193,12 @@ function member_admin_prepare_head()
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin');
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsMember");
$head[$h][2] = 'attributes';
$h++;
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php';
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_type_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsMemberType");
$head[$h][2] = 'attributes_type';
$h++;

View File

@ -28,7 +28,7 @@
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
/**
* Description and activation class for module accounting expert
* Class to describe and enable double entry accounting module
*/
class modAccounting extends DolibarrModules
{

View File

@ -27,7 +27,7 @@
* \brief Module to manage members of a foundation
* \file htdocs/core/modules/modAdherent.class.php
* \ingroup member
* \brief File descriptor or module Member
* \brief Description and activation file for the module member
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@ -66,7 +66,7 @@ class modAdherent extends DolibarrModules
);
// Config pages
$this->config_page_url = array("adherent.php@adherents");
$this->config_page_url = array("member.php@adherents");
// Dependencies
$this->hidden = false; // A condition to hide module

View File

@ -28,7 +28,7 @@
* \brief Module to manage agenda and events
* \file htdocs/core/modules/modAgenda.class.php
* \ingroup agenda
* \brief File of class to describe and enable/disable module Agenda
* \brief Description and activation file for the module agenda
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Descriptor file for Api modulee
* \file htdocs/core/modules/modApi.class.php
* \ingroup api
* \brief Description and activation file for module Api
* \brief Description and activation file for the module Api
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
*
* \file htdocs/core/modules/modAsset.class.php
* \ingroup asset
* \brief Description and activation file for module Assets
* \brief Description and activation file for the module assets
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -24,7 +24,7 @@
* \brief Module pour gerer la tenue d'un compte bancaire et rapprochements
* \file htdocs/core/modules/modBanque.class.php
* \ingroup banque
* \brief Fichier de description et activation du module Banque
* \brief Description and activation file for the module bank
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,8 +22,8 @@
* \defgroup barcode Module barcode
* \brief Module pour gerer les codes barres
* \file htdocs/core/modules/modBarcode.class.php
* \ingroup barcode,produit
* \brief Fichier de description et activation du module Barcode
* \ingroup barcode, product
* \brief Description and activation file for the module barcode
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Add a log into a block chain for some actions.
* \file htdocs/core/modules/modBlockedLog.class.php
* \ingroup blockedlog
* \brief Description and activation file for module BlockedLog
* \brief Description and activation file for the module BlockedLog
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
*
* \file htdocs/core/modules/modBom.class.php
* \ingroup bom
* \brief Description and activation file for module Bom
* \brief Description and activation file for the module Bom
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@ -286,6 +286,7 @@ class modBom extends DolibarrModules
$langs->load("mrp");
$this->export_code[$r] = $this->rights_class.'_'.$r;
$this->export_label[$r] = 'BomAndBomLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r] = array(array("bom", "read"));
$this->export_icon[$r] = 'bom';
$keyforclass = 'BOM';
$keyforclassfile = '/bom/class/bom.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module to manage Bookmarks
* \file htdocs/core/modules/modBookmark.class.php
* \ingroup bookmark
* \brief Fichier de description et activation du module Bookmarks
* \brief Description and activation file for the module Bookmarks
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module to manage points of sale
* \file htdocs/core/modules/modCashDesk.class.php
* \ingroup pos
* \brief File to enable/disable module Point Of Sales
* \brief Description and activation file for the module Point Of Sales
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Module to manage categories
* \file htdocs/core/modules/modCategorie.class.php
* \ingroup category
* \brief Fichier de description et activation du module Categorie
* \brief Description and activation file for the module Category
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module pour gerer l'appel automatique
* \file htdocs/core/modules/modClickToDial.class.php
* \ingroup clicktodial
* \brief Fichier de description et activation du module de click to Dial
* \brief Description and activation file for the module Click to Dial
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Collab module descriptor.
* \file htdocs/core/modules/modCollab.class.php
* \ingroup collab
* \brief Description and activation file for module Collab
* \brief Description and activation file for the module Collab
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -27,7 +27,7 @@
* \brief Module pour gerer le suivi des commandes
* \file htdocs/core/modules/modCommande.class.php
* \ingroup commande
* \brief Fichier de description et activation du module Commande
* \brief Description and activation file for the module command
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports)
* \file htdocs/core/modules/modComptabilite.class.php
* \ingroup comptabilite
* \brief Fichier de description et activation du module Comptabilite
* \brief Description and activation file for the module simple accountancy
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module pour gerer la tenue de contrat de services
* \file htdocs/core/modules/modContrat.class.php
* \ingroup contrat
* \brief Fichier de description et activation du module Contrat
* \brief Description and activation file for the module contract
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief cron module descriptor.
* \file htdocs/core/modules/modCron.class.php
* \ingroup cron
* \brief Description and activation file for module Jobs
* \brief Description and activation file for the module Jobs
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
*
* \file htdocs/core/modules/modDataPolicy.class.php
* \ingroup datapolicy
* \brief Description and activation file for module DATAPOLICY
* \brief Description and activation file for the module datapolicy
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modDav.class.php
* \ingroup dav
* \brief Description and activation file for module dav
* \brief Description and activation file for the module dav
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modDebugBar.class.php
* \ingroup debugbar
* \brief Description and activation file for module debugbar
* \brief Description and activation file for the module debugbar
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module pour gerer les deplacements et notes de frais
* \file htdocs/core/modules/modDeplacement.class.php
* \ingroup deplacement
* \brief Fichier de description et activation du module Deplacement et notes de frais
* \brief Description and activation file for the module trips (deprecated)
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module pour gerer des generations de documents
* \file htdocs/core/modules/modDocumentGeneration.class.php
* \ingroup document
* \brief Fichier de description et activation du module Generation document
* \brief Description and activation file for the module Generation document
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Module to manage the follow-up of the donations
* \file htdocs/core/modules/modDon.class.php
* \ingroup donations
* \brief Description and activation file for module Donation
* \brief Description and activation file for the module Donation
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module to manage dynamic prices in products
* \file htdocs/core/modules/modDynamicPrices.class.php
* \ingroup produit
* \brief File to describe module to manage dynamic prices in products
* \brief Description and activation file for the module to manage dynamic prices in products
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module for ECM (Electronic Content Management)
* \file htdocs/core/modules/modECM.class.php
* \ingroup ecm
* \brief Description and activation file for module ECM
* \brief Description and activation file for the module ECM
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modEmailCollector.class.php
* \ingroup emailcollector
* \brief Description and activation file for module emailcollector
* \brief Description and activation file for the module emailcollector
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
*
* \file htdocs/eventorganization/core/modules/modEventOrganization.class.php
* \ingroup eventorganization
* \brief Description and activation file for module EventOrganization
* \brief Description and activation file for the EventOrganization
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -24,7 +24,7 @@
* \brief Module pour gerer les expeditions de produits
* \file htdocs/core/modules/modExpedition.class.php
* \ingroup expedition
* \brief Fichier de description et activation du module Expedition
* \brief Description and activation file for the module Expedition
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module to manage expense report. Replace old module Deplacement.
* \file htdocs/core/modules/modExpenseReport.class.php
* \ingroup expensereport
* \brief Description and activation file for module ExpenseReport
* \brief Description and activation file for the module ExpenseReport
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";

View File

@ -21,7 +21,7 @@
* \brief Module generique pour realiser des exports de donnees en base
* \file htdocs/core/modules/modExport.class.php
* \ingroup export
* \brief Fichier de description et activation du module export
* \brief Description and activation file for the module export
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module pour inclure des informations externes RSS
* \file htdocs/core/modules/modExternalRss.class.php
* \ingroup externalrss
* \brief Fichier de description et activation du module externalrss
* \brief Description and activation file for the module externalrss
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module to include an external web site/tools into Dolibarr menu and into a frame page.
* \file htdocs/core/modules/modExternalSite.class.php
* \ingroup externalsite
* \brief Description and activation file for module ExternalSite
* \brief Description and activation file for the module ExternalSite
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module for FTP client module
* \file htdocs/core/modules/modFTP.class.php
* \ingroup ftp
* \brief Description and activation file for module FTP
* \brief Description and activation file for the module FTP
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,11 +20,11 @@
*/
/**
* \defgroup facture Module invoices
* \brief Module pour gerer les factures clients et/ou fournisseurs
* \defgroup facture Module customer invoices
* \brief Module to manage customer invoices
* \file htdocs/core/modules/modFacture.class.php
* \ingroup facture
* \brief Fichier de la classe de description et activation du module Facture
* \brief Description and activation file for the module customer invoices
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module pour mettre en page les zones de saisie de texte
* \file htdocs/core/modules/modFckeditor.class.php
* \ingroup fckeditor
* \brief Fichier de description et activation du module Fckeditor
* \brief Description and activation file for the module Fckeditor
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -25,7 +25,7 @@
* \brief Module to manage intervention cards
* \file htdocs/core/modules/modFicheinter.class.php
* \ingroup ficheinter
* \brief Fichier de description et activation du module Ficheinter
* \brief Description and activation file for the module Ficheinter
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -24,7 +24,7 @@
* \defgroup fournisseur Module suppliers
* \file htdocs/core/modules/modFournisseur.class.php
* \ingroup fournisseur
* \brief Description and activation file for module Supplier
* \brief Description and activation file for the module Supplier
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module to make geoip conversions
* \file htdocs/core/modules/modGeoIPMaxmind.class.php
* \ingroup geoip
* \brief File of geoipmaxmind module descriptor
* \brief Description and activation file for the module geoipmaxmind
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module to use Gravatar to show photo of users
* \file htdocs/core/modules/modGravatar.class.php
* \ingroup gravatar
* \brief Description and activation file for module Gravatar
* \brief Description and activation file for the module Gravatar
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -18,7 +18,7 @@
/**
* \file htdocs/core/modules/modHRM.class.php
* \ingroup HRM
* \brief Description and activation file for module HRM
* \brief Description and activation file for the module HRM
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";

View File

@ -26,7 +26,7 @@
* \brief Module de gestion des congés
* \file htdocs/core/modules/modHoliday.class.php
* \ingroup holiday
* \brief Description and activation file for module holiday
* \brief Description and activation file for the module holiday
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";

View File

@ -21,7 +21,7 @@
* \brief Module to make generic import of data into dolibarr database
* \file htdocs/core/modules/modImport.class.php
* \ingroup import
* \brief Fichier de description et activation du module Import
* \brief Description and activation file for the module Import
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
*
* \file htdocs/core/modules/modIncoterm.class.php
* \ingroup incoterm
* \brief Description and activation file for module MyModule
* \brief Description and activation file for the module MyModule
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
/**
* \file htdocs/core/modules/modIntracommreport.class.php
* \ingroup Intracomm report
* \brief Module to activate intracomm report module
* \brief Description and activation file for the module intracomm report
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module pour gerer les formats d'impression des etiquettes
* \file htdocs/core/modules/modLabel.class.php
* \ingroup other
* \brief Fichier de description et activation du module Label
* \brief Description and activation file for the module Labels
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module to manage LDAP interfaces with contacts or users
* \file htdocs/core/modules/modLdap.class.php
* \ingroup ldap
* \brief File to describe and activate Ldap module
* \brief Description and activation file for the module LDAP
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module to include loans management
* \file htdocs/core/modules/modLoan.class.php
* \ingroup loan
* \brief File to activate module loan
* \brief Description and activation file for the module loan
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module to manage EMailings
* \file htdocs/core/modules/modMailing.class.php
* \ingroup mailing
* \brief Fichier de description et activation du module Mailing
* \brief Description and activation file for the module Mailing
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module to manage mailman and spip
* \file htdocs/core/modules/modMailmanSpip.class.php
* \ingroup mailmanspip
* \brief Fichier de description et activation du module de click to Dial
* \brief Description and activation file for the module mailmanspip
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module to manage margins
* \file htdocs/core/modules/modMargin.class.php
* \ingroup margin
* \brief Description and activation file for module Margin
* \brief Description and activation file for the module Margin
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Add a log into a block chain for some actions.
* \file htdocs/core/modules/modBlockedLog.class.php
* \ingroup blockedlog
* \brief Description and activation file for module ModuleBuilder
* \brief Description and activation file for the module ModuleBuilder
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -24,7 +24,7 @@
*
* \file htdocs/core/modules/modMrp.class.php
* \ingroup mrp
* \brief Description and activation file for module Mrp
* \brief Description and activation file for the module Mrp
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Handle multiple currencies on company/propal/orders ...
* \file htdocs/core/modules/modMultiCurrency.class.php
* \ingroup multicurrency
* \brief Description and activation file for module MultiCurrency
* \brief Description and activation file for the module MultiCurrency
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module pour gerer les notifications (par mail ou autre)
* \file htdocs/core/modules/modNotification.class.php
* \ingroup notification
* \brief Fichier de description et activation du module Notification
* \brief Description and activation file for the module Notification
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/modOauth.class.php
* \ingroup oauth
* \brief File of class to describe and activate module Oauth
* \brief Description and activation file for the module Oauth
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module to OpenSurvey integration.
* \file htdocs/core/modules/modOpenSurvey.class.php
* \ingroup opensurvey
* \brief Description and activation file for module OpenSurvey
* \brief Description and activation file for the module OpenSurvey
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";

View File

@ -21,7 +21,7 @@
* \brief Add integration with Paybox online payment system.
* \file htdocs/core/modules/modPaybox.class.php
* \ingroup paybox
* \brief Description and activation file for module Paybox
* \brief Description and activation file for the module Paybox
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Module to manage payment by bank transfer
* \file htdocs/core/modules/modPaymentByBankTransfer.class.php
* \ingroup paymentbybanktransfer
* \brief File to describe and activate the module PaymentByBankTransfer
* \brief Description and activation file for the module PaymentByBankTransfer
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Add integration with Paypal online payment system.
* \file htdocs/core/modules/modPaypal.class.php
* \ingroup paypal
* \brief Description and activation file for module Paypal
* \brief Description and activation file for the module Paypal
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Module to manage Direct debit orders
* \file htdocs/core/modules/modPrelevement.class.php
* \ingroup prelevement
* \brief File to describe and enable the module Prelevement
* \brief Description and activation file for the module Prelevement
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/modPrinting.class.php
* \ingroup printing
* \brief File of class to describe and activate module Direct Printing
* \brief Description and activation file for the module Direct Printing
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -28,7 +28,7 @@
* \brief Module to manage catalog of predefined products
* \file htdocs/core/modules/modProduct.class.php
* \ingroup produit
* \brief File to describe module to manage catalog of predefined products
* \brief Description and activation file for the module to manage catalog of predefined products
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Management module for batch number, eat-by and sell-by date for product
* \file htdocs/core/modules/modProductBatch.class.php
* \ingroup productbatch
* \brief Description and activation file for module productbatch
* \brief Description and activation file for the module productbatch
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -26,7 +26,7 @@
* \brief Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks.
* \file htdocs/core/modules/modProjet.class.php
* \ingroup projet
* \brief Fichier de description et activation du module Projet
* \brief Description and activation file for the module project
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -26,7 +26,7 @@
* \brief Module pour gerer la tenue de propositions commerciales
* \file htdocs/core/modules/modPropale.class.php
* \ingroup propale
* \brief Fichier de description et activation du module Propale
* \brief Description and activation file for the module customer proposal
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/modReceiptPrinter.class.php
* \ingroup printing
* \brief File of class to describe and activate module Receipt Printer
* \brief Description and activation file for the module Receipt Printer
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module pour gerer les réceptions de produits
* \file htdocs/core/modules/modReception.class.php
* \ingroup reception
* \brief Fichier de description et activation du module Reception
* \brief Description and activation file for the module Reception
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
*
* \file htdocs/recruitment/core/modules/modRecruitment.class.php
* \ingroup recruitment
* \brief Description and activation file for module Recruitment
* \brief Description and activation file for the module Recruitment
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Resource module descriptor.
* \file core/modules/modResource.class.php
* \ingroup resource
* \brief Description and activation file for module Resource
* \brief Description and activation file for the module Resource
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";

View File

@ -27,7 +27,7 @@
* \brief Module to include salaries management
* \file htdocs/core/modules/modSalaries.class.php
* \ingroup salaries
* \brief File to activate module salaries
* \brief Description and activation file for the module salaries
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -25,7 +25,7 @@
* \brief Module pour gerer le suivi de services predefinis
* \file htdocs/core/modules/modService.class.php
* \ingroup service
* \brief Fichier de description et activation du module Service
* \brief Description and activation file for the module Service
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Add a SocialNetworks button.
* \file htdocs/core/modules/modSocialNetworks.class.php
* \ingroup socialnetworks
* \brief Description and activation file for module SocialNetworks
* \brief Description and activation file for the module SocialNetworks
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -25,7 +25,7 @@
* \brief Module to manage third parties (customers, prospects)
* \file htdocs/core/modules/modSociete.class.php
* \ingroup societe
* \brief Fichier de description et activation du module Societe
* \brief Description and activation file for the module societe (thirdparty)
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -23,7 +23,7 @@
* \brief Module pour gerer la tenue de stocks produits
* \file htdocs/core/modules/modStock.class.php
* \ingroup stock
* \brief Fichier de description et activation du module Stock
* \brief Description and activation file for the module Stock
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Add integration with Stripe online payment system.
* \file htdocs/core/modules/modStripe.class.php
* \ingroup stripe
* \brief Description and activation file for module Stripe
* \brief Description and activation file for the module Stripe
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -26,7 +26,7 @@
*
* \file htdocs/core/modules/modSupplierProposal.class.php
* \ingroup supplier_proposal
* \brief File to describe and activate module SupplierProposal
* \brief Description and activation file for the module supplier proposal
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -21,7 +21,7 @@
* \brief Module pour gerer les messages d'erreur dans syslog
* \file htdocs/core/modules/modSyslog.class.php
* \ingroup syslog
* \brief Fichier de description et activation du module de syslog
* \brief Description and activation file for the module syslog
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
*
* \file htdocs/core/modules/modTakePos.class.php
* \ingroup takepos
* \brief Description and activation file for module TakePos
* \brief Description and activation file for the module TakePos
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -25,7 +25,7 @@
* \brief Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales
* \file htdocs/core/modules/modTax.class.php
* \ingroup tax
* \brief Fichier de description et activation du module Taxe
* \brief Description and activation file for the module taxes
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -22,7 +22,7 @@
* \brief Module for ticket and request management.
* \file core/modules/modTicket.class.php
* \ingroup ticket
* \brief Description and activation file for module Ticket
* \brief Description and activation file for the module Ticket
*/
require_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";

View File

@ -22,7 +22,7 @@
* \brief Module pour gerer les utilisateurs
* \file htdocs/core/modules/modUser.class.php
* \ingroup user
* \brief Fichier de description et activation du module Utilisateur
* \brief Description and activation file for the module users
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -24,6 +24,7 @@
* \brief Module to manage product combinations based on product attributes
* \file htdocs/core/modules/modVariants.class.php
* \ingroup produit
* \brief Description and activation file for the module product variants
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module to enable the Dolibarr server of web services
* \file htdocs/core/modules/modWebServices.class.php
* \ingroup webservices
* \brief File to describe webservices module
* \brief Description and activation file for the module webservices
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief Module to enable client for supplier WebServices
* \file htdocs/core/modules/modWebServicesClient.class.php
* \ingroup webservices
* \brief File to describe client for supplier webservices module
* \brief Description and activation file for the module supplier webservices module
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';

View File

@ -20,7 +20,7 @@
* \brief website module descriptor.
* \file htdocs/core/modules/modWebsite.class.php
* \ingroup websites
* \brief Description and activation file for module Website
* \brief Description and activation file for the module Website
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@ -109,6 +109,12 @@ class modWebsite extends DolibarrModules
$this->rights[$r][4] = 'delete';
$r++;
$this->rights[$r][0] = 10008;
$this->rights[$r][1] = 'Export website content';
$this->rights[$r][3] = 0;
$this->rights[$r][4] = 'export';
$r++;
// Main menu entries
$r = 0;
$this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@ -130,6 +136,7 @@ class modWebsite extends DolibarrModules
$this->export_code[$r] = $this->rights_class.'_'.$r;
$this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r] = array(array("website", "export"));
$this->export_icon[$r] = 'globe';
$keyforclass = 'WebsitePage';
$keyforclassfile = '/website/class/websitepage.class.php';

Some files were not shown because too many files have changed in this diff Show More