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

Qual: Spelling for htdocs/[a-b]* (#27422)

Browse Source 
Mostly comments, one variable changed from misspelling to .
Also changed CNAT to C.N.A.T in comment to avoid fix from CNAT to CAN'T.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
MDW
2024-01-12 20:58:09 +01:00
committed by GitHub
parent cb2ebb1d56
commit 85ad4ecdf8
57 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/admin/account.php
View File

@@ -374,7 +374,7 @@ if ($resql) {
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$("#change_chart").on("click", function (e) { $("#change_chart").on("click", function (e) {
console.log("chartofaccounts seleted = "+$("#chartofaccounts").val()); console.log("chartofaccounts selected = "+$("#chartofaccounts").val());
// reload page // reload page
window.location.href = "'.$_SERVER["PHP_SELF"].'?valid_change_chart=1&chartofaccounts="+$("#chartofaccounts").val(); window.location.href = "'.$_SERVER["PHP_SELF"].'?valid_change_chart=1&chartofaccounts="+$("#chartofaccounts").val();
}); });
@@ -667,7 +667,7 @@ if ($resql) {
print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->'; print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
$accountparent->id = $obj->rowid2; $accountparent->id = $obj->rowid2;
$accountparent->label = $obj->label2; $accountparent->label = $obj->label2;
$accountparent->account_number = $obj->account_number2; // Sotre an account number for output $accountparent->account_number = $obj->account_number2; // Store an account number for output
print $accountparent->getNomUrl(1); print $accountparent->getNomUrl(1);
print "</td>\n"; print "</td>\n";
if (!$i) { if (!$i) {

6
htdocs/accountancy/admin/accountmodel.php
View File

@@ -457,7 +457,7 @@ if ($id) {
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
// Determine le nom du champ par rapport aux noms possibles // Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees // dans les dictionnaires de donnees
$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut $valuetoshow = ucfirst($fieldlist[$field]); // By default
$valuetoshow = $langs->trans($valuetoshow); // try to translate $valuetoshow = $langs->trans($valuetoshow); // try to translate
$class = "left"; $class = "left";
if ($fieldlist[$field] == 'code') { if ($fieldlist[$field] == 'code') {
@@ -566,7 +566,7 @@ if ($id) {
// Title line with search boxes // Title line with search boxes
print '<tr class="liste_titre liste_titre_add">'; print '<tr class="liste_titre liste_titre_add">';
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
$showfield = 1; // By defaut $showfield = 1; // By default
if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
$showfield = 0; $showfield = 0;
@@ -737,7 +737,7 @@ $db->close();
* @param array $fieldlist Array of fields * @param array $fieldlist Array of fields
* @param Object $obj If we show a particular record, obj is filled with record fields * @param Object $obj If we show a particular record, obj is filled with record fields
* @param string $tabname Name of SQL table * @param string $tabname Name of SQL table
* @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered
* @return void * @return void
*/ */
function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context = '') function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context = '')

2
htdocs/accountancy/admin/card.php
View File

@@ -329,7 +329,7 @@ if ($action == 'create') {
// Account parent // Account parent
print '<tr><td>'.$langs->trans("Accountparent").'</td>'; print '<tr><td>'.$langs->trans("Accountparent").'</td>';
print '<td>'; print '<td>';
// Note: We accept disabled account as parent account so we can build a hierarchy and use only childs // Note: We accept disabled account as parent account so we can build a hierarchy and use only children
print $formaccounting->select_account($object->account_parent, 'account_parent', 1, array(), 0, 0, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1, ''); print $formaccounting->select_account($object->account_parent, 'account_parent', 1, array(), 0, 0, 'minwidth100 maxwidth300 maxwidthonsmartphone', 1, '');
print '</td></tr>'; print '</td></tr>';

8
htdocs/accountancy/admin/categories_list.php
View File

@@ -495,7 +495,7 @@ if ($tabname[$id]) {
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
// Determine le nom du champ par rapport aux noms possibles // Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees // dans les dictionnaires de donnees
$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut $valuetoshow = ucfirst($fieldlist[$field]); // By default
$valuetoshow = $langs->trans($valuetoshow); // try to translate $valuetoshow = $langs->trans($valuetoshow); // try to translate
$class = "left"; $class = "left";
if ($fieldlist[$field] == 'type') { if ($fieldlist[$field] == 'type') {
@@ -629,7 +629,7 @@ if ($resql) {
$filterfound = 0; $filterfound = 0;
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
$showfield = 1; // By defaut $showfield = 1; // By default
if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
$showfield = 0; $showfield = 0;
} }
@@ -655,7 +655,7 @@ if ($resql) {
$filterfound = 0; $filterfound = 0;
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
$showfield = 1; // By defaut $showfield = 1; // By default
if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
$showfield = 0; $showfield = 0;
@@ -955,7 +955,7 @@ $db->close();
* @param array $fieldlist Array of fields * @param array $fieldlist Array of fields
* @param Object $obj If we show a particular record, obj is filled with record fields * @param Object $obj If we show a particular record, obj is filled with record fields
* @param string $tabname Name of SQL table * @param string $tabname Name of SQL table
* @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered
* @return void * @return void
*/ */
function fieldListAccountingCategories($fieldlist, $obj = null, $tabname = '', $context = '') function fieldListAccountingCategories($fieldlist, $obj = null, $tabname = '', $context = '')

8
htdocs/accountancy/admin/journals_list.php
View File

@@ -402,7 +402,7 @@ if ($id) {
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
// Determine le nom du champ par rapport aux noms possibles // Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees // dans les dictionnaires de donnees
$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut $valuetoshow = ucfirst($fieldlist[$field]); // By default
$valuetoshow = $langs->trans($valuetoshow); // try to translate $valuetoshow = $langs->trans($valuetoshow); // try to translate
$class = "left"; $class = "left";
if ($fieldlist[$field] == 'code') { if ($fieldlist[$field] == 'code') {
@@ -518,7 +518,7 @@ if ($id) {
foreach ($fieldlist as $field => $value) { foreach ($fieldlist as $field => $value) {
// Determine le nom du champ par rapport aux noms possibles // Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees // dans les dictionnaires de donnees
$showfield = 1; // By defaut $showfield = 1; // By default
$class = "left"; $class = "left";
$sortable = 1; $sortable = 1;
$valuetoshow = ''; $valuetoshow = '';
@@ -529,7 +529,7 @@ if ($id) {
$align=$tmp['align']; $align=$tmp['align'];
$sortable=$tmp['sortable']; $sortable=$tmp['sortable'];
*/ */
$valuetoshow = ucfirst($fieldlist[$field]); // By defaut $valuetoshow = ucfirst($fieldlist[$field]); // By default
$valuetoshow = $langs->trans($valuetoshow); // try to translate $valuetoshow = $langs->trans($valuetoshow); // try to translate
if ($fieldlist[$field] == 'code') { if ($fieldlist[$field] == 'code') {
$valuetoshow = $langs->trans("Code"); $valuetoshow = $langs->trans("Code");
@@ -688,7 +688,7 @@ $db->close();
* @param array $fieldlist Array of fields * @param array $fieldlist Array of fields
* @param Object $obj If we show a particular record, obj is filled with record fields * @param Object $obj If we show a particular record, obj is filled with record fields
* @param string $tabname Name of SQL table * @param string $tabname Name of SQL table
* @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered * @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we don't want it to be rendered
* @return void * @return void
*/ */
function fieldListJournal($fieldlist, $obj = null, $tabname = '', $context = '') function fieldListJournal($fieldlist, $obj = null, $tabname = '', $context = '')

4
htdocs/accountancy/class/accountancycategory.class.php
View File

@@ -624,8 +624,8 @@ class AccountancyCategory // extends CommonObject
* @param string $date_end Date end * @param string $date_end Date end
* @param int $sens Sens of the account: 0: credit - debit (use this by default), 1: debit - credit * @param int $sens Sens of the account: 0: credit - debit (use this by default), 1: debit - credit
* @param string $thirdparty_code Thirdparty code * @param string $thirdparty_code Thirdparty code
* @param int $month Specifig month - Can be empty * @param int $month Specific month - Can be empty
* @param int $year Specifig year - Can be empty * @param int $year Specific year - Can be empty
* @return integer Return integer <0 if KO, >= 0 if OK * @return integer Return integer <0 if KO, >= 0 if OK
*/ */
public function getSumDebitCredit($cpt, $date_start, $date_end, $sens, $thirdparty_code = 'nofilter', $month = 0, $year = 0) public function getSumDebitCredit($cpt, $date_start, $date_end, $sens, $thirdparty_code = 'nofilter', $month = 0, $year = 0)

16
htdocs/accountancy/class/accountancyexport.class.php
View File

@@ -838,7 +838,7 @@ class AccountancyExport
$end_line = "\r\n"; $end_line = "\r\n";
// We should use dol_now function not time however this is wrong date to transfert in accounting // We should use dol_now function not time however this is wrong date to transfer in accounting
foreach ($objectLines as $line) { foreach ($objectLines as $line) {
// Clean some data // Clean some data
$line->doc_ref = dol_string_unaccent($line->doc_ref); $line->doc_ref = dol_string_unaccent($line->doc_ref);
@@ -907,7 +907,7 @@ class AccountancyExport
$tab['code_journal'] = str_pad(self::trunc($line->code_journal, 2), 2); $tab['code_journal'] = str_pad(self::trunc($line->code_journal, 2), 2);
$tab['folio'] = '000'; $tab['folio'] = '000';
// We use invoice date $line->doc_date not $date_ecriture which is the transfert date // We use invoice date $line->doc_date not $date_ecriture which is the transfer date
// maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ? // maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
//$tab['date_ecriture'] = $date_ecriture; //$tab['date_ecriture'] = $date_ecriture;
$tab['date_ecriture'] = dol_print_date($line->doc_date, '%d%m%y'); $tab['date_ecriture'] = dol_print_date($line->doc_date, '%d%m%y');
@@ -965,7 +965,7 @@ class AccountancyExport
$tab['libelle_ecriture2'] = str_pad(self::trunc($line->label_operation, 30), 30); $tab['libelle_ecriture2'] = str_pad(self::trunc($line->label_operation, 30), 30);
$tab['codetva'] = str_repeat(' ', 2); $tab['codetva'] = str_repeat(' ', 2);
// We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part // We need to keep the 10 latest number of invoices doc_ref not the beginning part that is the useless almost same part
// $tab['num_piece3'] = str_pad(self::trunc($line->piece_num, 10), 10); // $tab['num_piece3'] = str_pad(self::trunc($line->piece_num, 10), 10);
$tab['num_piece3'] = substr(self::trunc($line->doc_ref, 20), -10); $tab['num_piece3'] = substr(self::trunc($line->doc_ref, 20), -10);
$tab['reserved'] = str_repeat(' ', 10); // position 159 $tab['reserved'] = str_repeat(' ', 10); // position 159
@@ -1070,7 +1070,7 @@ class AccountancyExport
//$tab['type_ligne'] = 'M'; //$tab['type_ligne'] = 'M';
$tab['code_journal'] = str_pad(dol_trunc($line->code_journal, 2, 'right', 'UTF-8', 1), 2); $tab['code_journal'] = str_pad(dol_trunc($line->code_journal, 2, 'right', 'UTF-8', 1), 2);
//We use invoice date $line->doc_date not $date_ecriture which is the transfert date //We use invoice date $line->doc_date not $date_ecriture which is the transfer date
//maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ? //maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
//$tab['date_ecriture'] = $date_ecriture; //$tab['date_ecriture'] = $date_ecriture;
$tab['date_operation'] = dol_print_date($line->doc_date, '%d%m%Y'); $tab['date_operation'] = dol_print_date($line->doc_date, '%d%m%Y');
@@ -1954,7 +1954,7 @@ class AccountancyExport
} else { } else {
$tab[] = ""; $tab[] = "";
} }
// CNAT // C.N.A.T
if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) { if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) {
$tab[] = 'F'; $tab[] = 'F';
} elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) { } elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) {
@@ -2231,7 +2231,7 @@ class AccountancyExport
} else { } else {
$tab[] = ""; $tab[] = "";
} }
// CNAT // C.N.A.T
if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) { if ($line->doc_type == 'supplier_invoice' && !empty($line->subledger_account)) {
$tab[] = 'F'; $tab[] = 'F';
} elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) { } elseif ($line->doc_type == 'customer_invoice' && !empty($line->subledger_account)) {
@@ -2452,7 +2452,7 @@ class AccountancyExport
//Libellé Auto //Libellé Auto
$tab[] = ""; $tab[] = "";
//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"'; //print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"';
//Libellé manuel //Libellé manual
$tab[] = dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1); $tab[] = dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1);
//Numéro de pièce //Numéro de pièce
$tab[] = dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1); $tab[] = dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1);
@@ -2603,7 +2603,7 @@ class AccountancyExport
/** /**
* toAnsi * toAnsi
* *
* @param string $str Original string to encode and optionaly truncate * @param string $str Original string to encode and optionally truncate
* @param integer $size Truncate string after $size characters * @param integer $size Truncate string after $size characters
* @return string String encoded in Windows-1251 charset * @return string String encoded in Windows-1251 charset
*/ */

2
htdocs/accountancy/class/bookkeeping.class.php
View File

@@ -1854,7 +1854,7 @@ class BookKeeping extends CommonObject
} }
/** /**
* Load all informations of accountancy document * Load all information of accountancy document
* *
* @param int $piecenum Id of line to get * @param int $piecenum Id of line to get
* @param string $mode Mode * @param string $mode Mode

6
htdocs/accountancy/journal/bankjournal.php
View File

@@ -455,7 +455,7 @@ if ($result) {
$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2); $tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id; $tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
// This part of code is no more required. it is here to solve case where a link were missing (ith v14.0.0) and keep writing in accountancy complete. // This part of code is no more required. it is here to solve case where a link were missing (with v14.0.0) and keep writing in accountancy complete.
// Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after. // Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after.
if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT')) { if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT')) {
$tmpsalary = new Salary($db); $tmpsalary = new Salary($db);
@@ -544,7 +544,7 @@ if ($result) {
// If no links were found to know the amount on thirdparty, we try to guess it. // If no links were found to know the amount on thirdparty, we try to guess it.
// This may happens on bank entries without the links lines to 'company'. // This may happens on bank entries without the links lines to 'company'.
if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) { // If we dont find 'company' link because it is an old 'withdraw' record if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) { // If we don't find 'company' link because it is an old 'withdraw' record
foreach ($links as $key => $val) { foreach ($links as $key => $val) {
if ($links[$key]['type'] == 'payment') { if ($links[$key]['type'] == 'payment') {
// Get thirdparty // Get thirdparty
@@ -1018,7 +1018,7 @@ if ($action == 'exportcsv') { // ISO and not UTF8 !
print "\n"; print "\n";
} }
} }
} else { // If thirdparty unkown, output the waiting account } else { // If thirdparty unknown, output the waiting account
foreach ($tabbq[$key] as $k => $mt) { foreach ($tabbq[$key] as $k => $mt) {
if ($mt) { if ($mt) {
$reflabel = ''; $reflabel = '';

2
htdocs/accountancy/journal/expensereportsjournal.php
View File

@@ -81,7 +81,7 @@ $errorforinvoice = array();
$accountingaccount = new AccountingAccount($db); $accountingaccount = new AccountingAccount($db);
// Get informations of journal // Get information of journal
$accountingjournalstatic = new AccountingJournal($db); $accountingjournalstatic = new AccountingJournal($db);
$accountingjournalstatic->fetch($id_journal); $accountingjournalstatic->fetch($id_journal);
$journal = $accountingjournalstatic->code; $journal = $accountingjournalstatic->code;

2
htdocs/accountancy/journal/purchasesjournal.php
View File

@@ -83,7 +83,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action);
$accountingaccount = new AccountingAccount($db); $accountingaccount = new AccountingAccount($db);
// Get informations of journal // Get information of journal
$accountingjournalstatic = new AccountingJournal($db); $accountingjournalstatic = new AccountingJournal($db);
$accountingjournalstatic->fetch($id_journal); $accountingjournalstatic->fetch($id_journal);
$journal = $accountingjournalstatic->code; $journal = $accountingjournalstatic->code;

2
htdocs/accountancy/journal/sellsjournal.php
View File

@@ -85,7 +85,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action);
$accountingaccount = new AccountingAccount($db); $accountingaccount = new AccountingAccount($db);
// Get informations of journal // Get information of journal
$accountingjournalstatic = new AccountingJournal($db); $accountingjournalstatic = new AccountingJournal($db);
$accountingjournalstatic->fetch($id_journal); $accountingjournalstatic->fetch($id_journal);
$journal = $accountingjournalstatic->code; $journal = $accountingjournalstatic->code;

2
htdocs/adherents/admin/member.php
View File

@@ -540,7 +540,7 @@ foreach ($dirmodels as $reldir) {
print "</td>"; print "</td>";
} }
// Defaut // Default
print '<td class="center">'; print '<td class="center">';
if (getDolGlobalString('MEMBER_ADDON_PDF_ODT') == $name) { if (getDolGlobalString('MEMBER_ADDON_PDF_ODT') == $name) {
print img_picto($langs->trans("Default"), 'on'); print img_picto($langs->trans("Default"), 'on');

2
htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
View File

@@ -33,7 +33,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
/** /**
* Constructor * Constructor
* *
* @param DoliDB $db Handler acces data base * @param DoliDB $db Handler access data base
* @param string $dirmodule Name of directory of module * @param string $dirmodule Name of directory of module
* @param string $targetmodule Name of directory of module where canvas is stored * @param string $targetmodule Name of directory of module where canvas is stored
* @param string $canvas Name of canvas * @param string $canvas Name of canvas

36
htdocs/adherents/class/adherent.class.php
View File

@@ -352,7 +352,7 @@ class Adherent extends CommonObject
$this->db = $db; $this->db = $db;
$this->statut = self::STATUS_DRAFT; $this->statut = self::STATUS_DRAFT;
$this->status = self::STATUS_DRAFT; $this->status = self::STATUS_DRAFT;
// l'adherent n'est pas public par defaut // l'adherent n'est pas public par default
$this->public = 0; $this->public = 0;
// les champs optionnels sont vides // les champs optionnels sont vides
$this->array_options = array(); $this->array_options = array();
@@ -372,7 +372,7 @@ class Adherent extends CommonObject
* @param string $addr_bcc Email bcc * @param string $addr_bcc Email bcc
* @param int $deliveryreceipt Ask a delivery receipt * @param int $deliveryreceipt Ask a delivery receipt
* @param int $msgishtml 1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection * @param int $msgishtml 1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection
* @param string $errors_to erros to * @param string $errors_to errors to
* @param string $moreinheader Add more html headers * @param string $moreinheader Add more html headers
* @deprecated since V18 * @deprecated since V18
* @see sendEmail() * @see sendEmail()
@@ -398,7 +398,7 @@ class Adherent extends CommonObject
* @param string $addr_bcc Email bcc * @param string $addr_bcc Email bcc
* @param int $deliveryreceipt Ask a delivery receipt * @param int $deliveryreceipt Ask a delivery receipt
* @param int $msgishtml 1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection * @param int $msgishtml 1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection
* @param string $errors_to erros to * @param string $errors_to errors to
* @param string $moreinheader Add more html headers * @param string $moreinheader Add more html headers
* @since V18 * @since V18
* @return int Return integer <0 if KO, >0 if OK * @return int Return integer <0 if KO, >0 if OK
@@ -570,7 +570,7 @@ class Adherent extends CommonObject
/** /**
* Create a member into database * Create a member into database
* *
* @param User $user Objet user qui demande la creation * @param User $user Object user qui demande la creation
* @param int $notrigger 1 ne declenche pas les triggers, 0 sinon * @param int $notrigger 1 ne declenche pas les triggers, 0 sinon
* @return int Return integer <0 if KO, >0 if OK * @return int Return integer <0 if KO, >0 if OK
*/ */
@@ -912,7 +912,7 @@ class Adherent extends CommonObject
dol_syslog(get_class($this)."::update update linked thirdparty"); dol_syslog(get_class($this)."::update update linked thirdparty");
// This member is linked with a thirdparty, so we also update thirdparty informations // This member is linked with a thirdparty, so we also update thirdparty information
// if this is an update. // if this is an update.
$lthirdparty = new Societe($this->db); $lthirdparty = new Societe($this->db);
$result = $lthirdparty->fetch($this->fk_soc); $result = $lthirdparty->fetch($this->fk_soc);
@@ -1171,7 +1171,7 @@ class Adherent extends CommonObject
if ($this->user_id && !$nosyncuser) { if ($this->user_id && !$nosyncuser) {
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
// This member is linked with a user, so we also update users informations // This member is linked with a user, so we also update users information
// if this is an update. // if this is an update.
$luser = new User($this->db); $luser = new User($this->db);
$result = $luser->fetch($this->user_id); $result = $luser->fetch($this->user_id);
@@ -1410,7 +1410,7 @@ class Adherent extends CommonObject
$this->ref = $obj->ref; $this->ref = $obj->ref;
$this->ref_ext = $obj->ref_ext; $this->ref_ext = $obj->ref_ext;
$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility $this->civility_id = $obj->civility_code; // Bad. Kept for backward compatibility
$this->civility_code = $obj->civility_code; $this->civility_code = $obj->civility_code;
$this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : ''; $this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
@@ -1694,7 +1694,7 @@ class Adherent extends CommonObject
dol_syslog("subscriptionComplementaryActions subscriptionid=".$subscriptionid." option=".$option." accountid=".$accountid." datesubscription=".$datesubscription." paymentdate=". dol_syslog("subscriptionComplementaryActions subscriptionid=".$subscriptionid." option=".$option." accountid=".$accountid." datesubscription=".$datesubscription." paymentdate=".
$paymentdate." label=".$label." amount=".$amount." num_chq=".$num_chq." autocreatethirdparty=".$autocreatethirdparty); $paymentdate." label=".$label." amount=".$amount." num_chq=".$num_chq." autocreatethirdparty=".$autocreatethirdparty);
// Insert into bank account directlty (if option choosed for) + link to llx_subscription if option is 'bankdirect' // Insert into bank account directlty (if option chosen for) + link to llx_subscription if option is 'bankdirect'
if ($option == 'bankdirect' && $accountid) { if ($option == 'bankdirect' && $accountid) {
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -1728,7 +1728,7 @@ class Adherent extends CommonObject
} }
} }
// If option choosed, we create invoice // If option chosen, we create invoice
if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly') { if (($option == 'bankviainvoice' && $accountid) || $option == 'invoiceonly') {
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
@@ -2034,7 +2034,7 @@ class Adherent extends CommonObject
} }
/** /**
* Functiun to exlude (set adherent.status to -2) a member * Functiun to exclude (set adherent.status to -2) a member
* TODO * TODO
* A private note should be added to know why the member has been excluded * A private note should be added to know why the member has been excluded
* For historical purpose it add an "extra-subscription" type excluded * For historical purpose it add an "extra-subscription" type excluded
@@ -2463,7 +2463,7 @@ class Adherent extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Charge indicateurs this->nb de tableau de bord * Load indicators this->nb in state board
* *
* @return int Return integer <0 if KO, >0 if OK * @return int Return integer <0 if KO, >0 if OK
*/ */
@@ -2497,7 +2497,7 @@ class Adherent extends CommonObject
/** /**
* Load indicators for dashboard (this->nbtodo and this->nbtodolate) * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
* *
* @param User $user Objet user * @param User $user Object user
* @param string $mode "expired" for membership to renew, "shift" for member to validate * @param string $mode "expired" for membership to renew, "shift" for member to validate
* @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK * @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
*/ */
@@ -2579,7 +2579,7 @@ class Adherent extends CommonObject
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param string $modele Force template to use ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs object lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref
@@ -2620,7 +2620,7 @@ class Adherent extends CommonObject
global $user, $langs; global $user, $langs;
$now = dol_now(); $now = dol_now();
// Initialise parametres // Initialise parameters
$this->id = 0; $this->id = 0;
$this->ref = 'ABC001'; $this->ref = 'ABC001';
$this->entity = 1; $this->entity = 1;
@@ -2709,9 +2709,9 @@ class Adherent extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/** /**
* Initialise tableau info (tableau des attributs LDAP) * Initialise tableau info (tableau des attributes LDAP)
* *
* @return array Tableau info des attributs * @return array Tableau info des attributes
*/ */
public function _load_ldap_info() public function _load_ldap_info()
{ {
@@ -2905,7 +2905,7 @@ class Adherent extends CommonObject
$sql = "SELECT count(mc.email) as nb"; $sql = "SELECT count(mc.email) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'"; $sql .= " WHERE mc.email = '".$this->db->escape($this->email)."'";
$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes $sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec success
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
@@ -3173,7 +3173,7 @@ class Adherent extends CommonObject
return 1; return 1;
} else { } else {
$this->output = 'Found '.($nbok + $nbko).' members to send reminder to.'; $this->output = 'Found '.($nbok + $nbko).' members to send reminder to.';
$this->output .= ' Send email successfuly to '.$nbok.' members'; $this->output .= ' Send email successfully to '.$nbok.' members';
if (is_array($listofmembersok)) { if (is_array($listofmembersok)) {
$listofids = ''; $listofids = '';
$i = 0; $i = 0;

8
htdocs/adherents/class/adherent_type.class.php
View File

@@ -85,7 +85,7 @@ class AdherentType extends CommonObject
public $duration_unit; public $duration_unit;
/** /**
* @var int Subsription required (0 or 1) * @var int Subscription required (0 or 1)
*/ */
public $subscription; public $subscription;
@@ -95,7 +95,7 @@ class AdherentType extends CommonObject
public $amount; public $amount;
/** /**
* @var int Amount can be choosen by the visitor during subscription (0 or 1) * @var int Amount can be chosen by the visitor during subscription (0 or 1)
*/ */
public $caneditamount; public $caneditamount;
@@ -858,7 +858,7 @@ class AdherentType extends CommonObject
/** /**
* Initialize the info array (array of LDAP values) that will be used to call LDAP functions * Initialize the info array (array of LDAP values) that will be used to call LDAP functions
* *
* @return array Tableau info des attributs * @return array Tableau info des attributes
*/ */
public function _load_ldap_info() public function _load_ldap_info()
{ {
@@ -905,7 +905,7 @@ class AdherentType extends CommonObject
{ {
global $user; global $user;
// Initialise parametres // Initialise parameters
$this->id = 0; $this->id = 0;
$this->ref = 'MTSPEC'; $this->ref = 'MTSPEC';
$this->specimen = 1; $this->specimen = 1;

2
htdocs/adherents/class/adherentstats.class.php
View File

@@ -21,7 +21,7 @@
/** /**
* \file htdocs/adherents/class/adherentstats.class.php * \file htdocs/adherents/class/adherentstats.class.php
* \ingroup member * \ingroup member
* \brief Fichier de la classe de gestion des stats des adhérents * \brief File for class managing statistics of members
*/ */
include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';

14
htdocs/adherents/class/api_members.class.php
View File

@@ -53,7 +53,7 @@ class Members extends DolibarrApi
/** /**
* Get properties of a member object * Get properties of a member object
* *
* Return an array with member informations * Return an array with member information
* *
* @param int $id ID of member * @param int $id ID of member
* @return Object Object with cleaned properties * @return Object Object with cleaned properties
@@ -86,7 +86,7 @@ class Members extends DolibarrApi
/** /**
* Get properties of a member object by linked thirdparty * Get properties of a member object by linked thirdparty
* *
* Return an array with member informations * Return an array with member information
* *
* @param int $thirdparty ID of third party * @param int $thirdparty ID of third party
* *
@@ -119,7 +119,7 @@ class Members extends DolibarrApi
/** /**
* Get properties of a member object by linked thirdparty email * Get properties of a member object by linked thirdparty email
* *
* Return an array with member informations * Return an array with member information
* *
* @param string $email Email of third party * @param string $email Email of third party
* *
@@ -158,7 +158,7 @@ class Members extends DolibarrApi
/** /**
* Get properties of a member object by linked thirdparty barcode * Get properties of a member object by linked thirdparty barcode
* *
* Return an array with member informations * Return an array with member information
* *
* @param string $barcode Barcode of third party * @param string $barcode Barcode of third party
* *
@@ -207,7 +207,7 @@ class Members extends DolibarrApi
* @param int $category Use this param to filter list by category * @param int $category Use this param to filter list by category
* @param string $sqlfilters Other criteria to filter answers separated by a comma. * @param string $sqlfilters Other criteria to filter answers separated by a comma.
* Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))" * Example: "(t.ref:like:'SO-%') and ((t.date_creation:<:'20160101') or (t.nature:is:NULL))"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of member objects * @return array Array of member objects
* *
* @throws RestException * @throws RestException
@@ -292,7 +292,7 @@ class Members extends DolibarrApi
$member = new Adherent($this->db); $member = new Adherent($this->db);
foreach ($request_data as $field => $value) { foreach ($request_data as $field => $value) {
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$member->context['caller'] = $request_data['caller']; $member->context['caller'] = $request_data['caller'];
continue; continue;
} }
@@ -333,7 +333,7 @@ class Members extends DolibarrApi
continue; continue;
} }
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$member->context['caller'] = $request_data['caller']; $member->context['caller'] = $request_data['caller'];
continue; continue;
} }

8
htdocs/adherents/class/api_memberstypes.class.php
View File

@@ -46,7 +46,7 @@ class MembersTypes extends DolibarrApi
/** /**
* Get properties of a member type object * Get properties of a member type object
* *
* Return an array with member type informations * Return an array with member type information
* *
* @param int $id ID of member type * @param int $id ID of member type
* @return Object Object with cleaned properties * @return Object Object with cleaned properties
@@ -82,7 +82,7 @@ class MembersTypes extends DolibarrApi
* @param int $limit Limit for list * @param int $limit Limit for list
* @param int $page Page number * @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')" * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.libelle:like:'SO-%') and (t.subscription:=:'1')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of member type objects * @return array Array of member type objects
* *
* @throws RestException * @throws RestException
@@ -157,7 +157,7 @@ class MembersTypes extends DolibarrApi
$membertype = new AdherentType($this->db); $membertype = new AdherentType($this->db);
foreach ($request_data as $field => $value) { foreach ($request_data as $field => $value) {
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$membertype->context['caller'] = $request_data['caller']; $membertype->context['caller'] = $request_data['caller'];
continue; continue;
} }
@@ -198,7 +198,7 @@ class MembersTypes extends DolibarrApi
continue; continue;
} }
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$membertype->context['caller'] = $request_data['caller']; $membertype->context['caller'] = $request_data['caller'];
continue; continue;
} }

8
htdocs/adherents/class/api_subscriptions.class.php
View File

@@ -49,7 +49,7 @@ class Subscriptions extends DolibarrApi
/** /**
* Get properties of a subscription object * Get properties of a subscription object
* *
* Return an array with subscription informations * Return an array with subscription information
* *
* @param int $id ID of subscription * @param int $id ID of subscription
* @return Object Object with cleaned properties * @return Object Object with cleaned properties
@@ -81,7 +81,7 @@ class Subscriptions extends DolibarrApi
* @param int $limit Limit for list * @param int $limit Limit for list
* @param int $page Page number * @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')" * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.import_key:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of subscription objects * @return array Array of subscription objects
* *
* @throws RestException * @throws RestException
@@ -154,7 +154,7 @@ class Subscriptions extends DolibarrApi
$subscription = new Subscription($this->db); $subscription = new Subscription($this->db);
foreach ($request_data as $field => $value) { foreach ($request_data as $field => $value) {
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$subscription->context['caller'] = $request_data['caller']; $subscription->context['caller'] = $request_data['caller'];
continue; continue;
} }
@@ -191,7 +191,7 @@ class Subscriptions extends DolibarrApi
continue; continue;
} }
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$subscription->context['caller'] = $request_data['caller']; $subscription->context['caller'] = $request_data['caller'];
continue; continue;
} }

2
htdocs/adherents/ldap.php
View File

@@ -171,7 +171,7 @@ if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalString('LDAP_MEMBER_
// Affichage attributs LDAP // Affichage attributes LDAP
print load_fiche_titre($langs->trans("LDAPInformationsForThisMember")); print load_fiche_titre($langs->trans("LDAPInformationsForThisMember"));
print '<table width="100%" class="noborder">'; print '<table width="100%" class="noborder">';

8
htdocs/adherents/list.php
View File

@@ -388,8 +388,8 @@ $sql = preg_replace('/,\s*$/', '', $sql);
$sqlfields = $sql; // $sql fields to remove for count total $sqlfields = $sql; // $sql fields to remove for count total
// SQL Aliase adherent // SQL Alias adherent
$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead od d $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead of d
if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
} }
@@ -397,7 +397,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
// SQL Aliase adherent_type // SQL Alias adherent_type
$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t"; $sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
$sql .= " WHERE d.fk_adherent_type = t.rowid"; $sql .= " WHERE d.fk_adherent_type = t.rowid";
@@ -456,7 +456,7 @@ if ($search_filter == 'outofdate') {
$sql .= " AND (datefin < '".$db->idate($now)."')"; $sql .= " AND (datefin < '".$db->idate($now)."')";
} }
if ($search_status != '') { if ($search_status != '') {
// Peut valoir un nombre ou liste de nombre separes par virgules // Peut valoir un nombre ou liste de nombre separates par virgules
$sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")"; $sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")";
} }
if ($search_morphy != '' && $search_morphy != '-1') { if ($search_morphy != '' && $search_morphy != '-1') {

2
htdocs/adherents/partnership.php
View File

@@ -63,7 +63,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();

2
htdocs/adherents/stats/byproperties.php
View File

@@ -150,7 +150,7 @@ if (!count($data)) {
} }
// Print array // Print array
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="liste centpercent">'; print '<table class="liste centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("MemberNature").'</td>'; print '<td>'.$langs->trans("MemberNature").'</td>';

2
htdocs/adherents/stats/geo.php
View File

@@ -296,7 +296,7 @@ if (count($arrayjs) && $mode == 'memberbycountry') {
if ($mode) { if ($mode) {
// Print array // Print array
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="liste centpercent">'; print '<table class="liste centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$label.'</td>'; print '<td>'.$label.'</td>';

6
htdocs/adherents/subscription.php
View File

@@ -208,7 +208,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
$result = $object->fetch($rowid); $result = $object->fetch($rowid);
$result = $adht->fetch($object->typeid); $result = $adht->fetch($object->typeid);
// Subscription informations // Subscription information
$datesubscription = 0; $datesubscription = 0;
$datesubend = 0; $datesubend = 0;
$defaultdelay = !empty($adht->duration_value) ? $adht->duration_value : 1; $defaultdelay = !empty($adht->duration_value) ? $adht->duration_value : 1;
@@ -226,7 +226,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
$amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription $amount = price2num(GETPOST("subscription", 'alpha')); // Amount of subscription
$label = GETPOST("label"); $label = GETPOST("label");
// Payment informations // Payment information
$accountid = GETPOST("accountid", 'int'); $accountid = GETPOST("accountid", 'int');
$operation = GETPOST("operation", "alphanohtml"); // Payment mode $operation = GETPOST("operation", "alphanohtml"); // Payment mode
$num_chq = GETPOST("num_chq", "alphanohtml"); $num_chq = GETPOST("num_chq", "alphanohtml");
@@ -1034,7 +1034,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'>'; print '<input type="radio" class="moreaction" id="none" name="paymentsave" value="none"'.(empty($bankdirect) && empty($invoiceonly) && empty($bankviainvoice) ? ' checked' : '').'>';
print '<label for="none"> '.$langs->trans("None").'</label><br>'; print '<label for="none"> '.$langs->trans("None").'</label><br>';
// Add entry into bank accoun // Add entry into bank account
if (isModEnabled('banque')) { if (isModEnabled('banque')) {
print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : ''); print '<input type="radio" class="moreaction" id="bankdirect" name="paymentsave" value="bankdirect"'.(!empty($bankdirect) ? ' checked' : '');
print '><label for="bankdirect"> '.$langs->trans("MoreActionBankDirect").'</label><br>'; print '><label for="bankdirect"> '.$langs->trans("MoreActionBankDirect").'</label><br>';

4
htdocs/adherents/subscription/list.php
View File

@@ -417,7 +417,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n"; print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search // Fields title search
@@ -639,7 +639,7 @@ while ($i < $imaxinloop) {
} }
} }
//fetch informations needs on this mode //fetch information needs on this mode
if ($obj->fk_account > 0) { if ($obj->fk_account > 0) {
$accountstatic->id = $obj->fk_account; $accountstatic->id = $obj->fk_account;

2
htdocs/adherents/vcard.php
View File

@@ -147,7 +147,7 @@ if ($company->id) {
} }
} }
// Personal informations // Personal information
$v->setPhoneNumber($object->phone_perso, "TYPE=HOME;VOICE"); $v->setPhoneNumber($object->phone_perso, "TYPE=HOME;VOICE");
if ($object->birth) { if ($object->birth) {
$v->setBirthday($object->birth); $v->setBirthday($object->birth);

2
htdocs/api/class/api_documents.class.php
View File

@@ -633,7 +633,7 @@ class Documents extends DolibarrApi
* *
* @param string $filename Name of file to create ('FA1705-0123.txt') * @param string $filename Name of file to create ('FA1705-0123.txt')
* @param string $modulepart Name of module or area concerned by file upload ('product', 'service', 'invoice', 'proposal', 'project', 'project_task', 'supplier_invoice', 'expensereport', 'member', ...) * @param string $modulepart Name of module or area concerned by file upload ('product', 'service', 'invoice', 'proposal', 'project', 'project_task', 'supplier_invoice', 'expensereport', 'member', ...)
* @param string $ref Reference of object (This will define subdir automatically and store submited file into it) * @param string $ref Reference of object (This will define subdir automatically and store submitted file into it)
* @param string $subdir Subdirectory (Only if ref not provided) * @param string $subdir Subdirectory (Only if ref not provided)
* @param string $filecontent File content (string with file content. An empty file will be created if this parameter is not provided) * @param string $filecontent File content (string with file content. An empty file will be created if this parameter is not provided)
* @param string $fileencoding File encoding (''=no encoding, 'base64'=Base 64) * @param string $fileencoding File encoding (''=no encoding, 'base64'=Base 64)

6
htdocs/api/class/api_setup.class.php
View File

@@ -727,7 +727,7 @@ class Setup extends DolibarrApi
* @param object $object Object with label to translate * @param object $object Object with label to translate
* @param string $lang Code of the language the name of the object must be translated to * @param string $lang Code of the language the name of the object must be translated to
* @param string $prefix Prefix for translation key * @param string $prefix Prefix for translation key
* @param array $dict Array of dictionnary for translation * @param array $dict Array of dictionary for translation
* @return void * @return void
*/ */
private function translateLabel($object, $lang, $prefix = 'Country', $dict = array('dict')) private function translateLabel($object, $lang, $prefix = 'Country', $dict = array('dict'))
@@ -1985,7 +1985,7 @@ class Setup extends DolibarrApi
throw new RestException(404, 'Error Bad or unknown value for constantname'); throw new RestException(404, 'Error Bad or unknown value for constantname');
} }
if (isASecretKey($constantname)) { if (isASecretKey($constantname)) {
throw new RestException(403, 'Forbidden. This parameter cant be read with APIs'); throw new RestException(403, 'Forbidden. This parameter can not be read with APIs');
} }
return getDolGlobalString($constantname); return getDolGlobalString($constantname);
@@ -2144,7 +2144,7 @@ class Setup extends DolibarrApi
} }
} }
// Files missings // Files missing
$out .= load_fiche_titre($langs->trans("FilesMissing")); $out .= load_fiche_titre($langs->trans("FilesMissing"));
$out .= '<div class="div-table-responsive-no-min">'; $out .= '<div class="div-table-responsive-no-min">';

6
htdocs/api/index.php
View File

@@ -131,7 +131,7 @@ if (preg_match('/api\/index\.php\/explorer/', $url) && getDolGlobalString('API_E
} }
// This 2 lines are usefull only if we want to exclude some Urls from the explorer // This 2 lines are useful only if we want to exclude some Urls from the explorer
//use Luracast\Restler\Explorer; //use Luracast\Restler\Explorer;
//Explorer::$excludedPaths = array('/categories'); //Explorer::$excludedPaths = array('/categories');
@@ -170,7 +170,7 @@ $api = new DolibarrApi($db, '', $refreshcache);
if (getDolGlobalString('MAIN_API_DEBUG')) { if (getDolGlobalString('MAIN_API_DEBUG')) {
$r = $api->r; $r = $api->r;
$r->onCall(function () use ($r) { $r->onCall(function () use ($r) {
// Don't log Luracast Restler Explorer recources calls // Don't log Luracast Restler Explorer resources calls
//if (!preg_match('/^explorer/', $r->url)) { //if (!preg_match('/^explorer/', $r->url)) {
// 'method' => $api->r->requestMethod, // 'method' => $api->r->requestMethod,
// 'url' => $api->r->url, // 'url' => $api->r->url,
@@ -405,7 +405,7 @@ if ($usecompression) {
} }
} }
//dol_syslog('We found some compression algoithm: '.$foundonealgorithm.' -> usecompression='.$usecompression, LOG_DEBUG); //dol_syslog('We found some compression algorithm: '.$foundonealgorithm.' -> usecompression='.$usecompression, LOG_DEBUG);
Luracast\Restler\Defaults::$returnResponse = $usecompression; Luracast\Restler\Defaults::$returnResponse = $usecompression;

2
htdocs/asset/admin/setup.php
View File

@@ -611,7 +611,7 @@ if ($action == 'edit') {
if ($result < 0) { if ($result < 0) {
setEventMessages(null, $c->errors, 'errors'); setEventMessages(null, $c->errors, 'errors');
} elseif ($result > 0) { } elseif ($result > 0) {
$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text $ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
$toprint = array(); $toprint = array();
foreach ($ways as $way) { foreach ($ways as $way) {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>'; $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';

2
htdocs/asset/card.php
View File

@@ -53,7 +53,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

6
htdocs/asset/class/asset.class.php
View File

@@ -75,7 +75,7 @@ class Asset extends CommonObject
* 'noteditable' says if field is not editable (1 or 0) * 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created. * 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage) * 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200' * 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -1301,7 +1301,7 @@ class Asset extends CommonObject
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)
@@ -1590,7 +1590,7 @@ class Asset extends CommonObject
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param string $modele Force template to use ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs object lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref

6
htdocs/asset/class/assetdepreciationoptions.class.php
View File

@@ -45,7 +45,7 @@ class AssetDepreciationOptions extends CommonObject
* 'noteditable' says if field is not editable (1 or 0) * 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created. * 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage) * 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200' * 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -210,11 +210,11 @@ class AssetDepreciationOptions extends CommonObject
$html_name = $mode_key . '_' . $field_key; $html_name = $mode_key . '_' . $field_key;
if ($field_info['type'] == 'duration') { if ($field_info['type'] == 'duration') {
if (GETPOST($html_name . 'hour') == '' && GETPOST($html_name . 'min') == '') { if (GETPOST($html_name . 'hour') == '' && GETPOST($html_name . 'min') == '') {
continue; // The field was not submited to be saved continue; // The field was not submitted to be saved
} }
} else { } else {
if (!GETPOSTISSET($html_name)) { if (!GETPOSTISSET($html_name)) {
continue; // The field was not submited to be saved continue; // The field was not submitted to be saved
} }
} }
// Ignore special fields // Ignore special fields

6
htdocs/asset/class/assetmodel.class.php
View File

@@ -81,7 +81,7 @@ class AssetModel extends CommonObject
* 'noteditable' says if field is not editable (1 or 0) * 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created. * 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage) * 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200' * 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -446,7 +446,7 @@ class AssetModel extends CommonObject
// Protection // Protection
if ($this->status == self::STATUS_VALIDATED) { if ($this->status == self::STATUS_VALIDATED) {
dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING); dol_syslog(get_class($this) . "::validate action abandoned: already validated", LOG_WARNING);
return 0; return 0;
} }
@@ -549,7 +549,7 @@ class AssetModel extends CommonObject
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)

4
htdocs/asset/list.php
View File

@@ -79,7 +79,7 @@ if (!$sortorder) {
$sortorder = "ASC"; $sortorder = "ASC";
} }
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml'); $search_all = GETPOST('search_all', 'alphanohtml');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
@@ -455,7 +455,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n"; print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

2
htdocs/asset/model/card.php
View File

@@ -53,7 +53,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

4
htdocs/asset/model/list.php
View File

@@ -77,7 +77,7 @@ if (!$sortorder) {
$sortorder = "ASC"; $sortorder = "ASC";
} }
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml'); $search_all = GETPOST('search_all', 'alphanohtml');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
@@ -458,7 +458,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n"; print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

4
htdocs/blockedlog/README-fr.md
View File

@@ -17,7 +17,7 @@ Remarque: Le type des événements tracés est probablement plus large que la pl
de ces exigences. de ces exigences.
Vous pouvez aussi lire et faire des recherches au sein de la log inaltérable. Vous pouvez aussi lire et faire des recherches au sein de la log inaltérable.
Tous les enregistrements de la logs inaltérable sont liés avec le précédent dans une Blockchain, et leur contenu fait parti de la signature inclue dans ce lien, Tous les enregistrements de la logs inaltérable sont liés avec le précédent dans une Blockchain, et leur contenu fait parti de la signature include dans ce lien,
aussi, une fois le module activé et le premier enregistrement réalisé, il ne sera plus possible d'effacer ni modifier un enregistrement dans la log aussi, une fois le module activé et le premier enregistrement réalisé, il ne sera plus possible d'effacer ni modifier un enregistrement dans la log
inaltérable sans corrompre toute la chaine. Dès lors qu'un enregistrement est invalide, tous les suivants pourront également être considérés invalides par votre administration. inaltérable sans corrompre toute la chaine. Dès lors qu'un enregistrement est invalid, tous les suivants pourront également être considérés invalides par votre administration.

6
htdocs/blockedlog/admin/blockedlog.php
View File

@@ -104,7 +104,7 @@ print '<span class="opacitymedium">'.$langs->trans("BlockedLogDesc")."</span><br
print '<br>'; print '<br>';
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Key").'</td>'; print '<td>'.$langs->trans("Key").'</td>';
@@ -155,9 +155,9 @@ if ($resql) {
} }
} }
$seledted = !getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY') ? array() : explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY')); $selected = !getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY') ? array() : explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY'));
print $form->multiselectarray('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', $countryArray, $seledted); print $form->multiselectarray('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', $countryArray, $selected);
print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
print '</form>'; print '</form>';

2
htdocs/blockedlog/admin/blockedlog_list.php
View File

@@ -415,7 +415,7 @@ print '<input type="hidden" name="page" value="'.$page.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">'; print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">'; print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">';
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
// Line of filters // Line of filters

8
htdocs/blockedlog/class/blockedlog.class.php
View File

@@ -912,7 +912,7 @@ class BlockedLog
include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
$this->signature_line = dol_hash($keyforsignature, '5'); // Not really usefull $this->signature_line = dol_hash($keyforsignature, '5'); // Not really useful
$this->signature = dol_hash($previoushash.$keyforsignature, '5'); $this->signature = dol_hash($previoushash.$keyforsignature, '5');
if ($forcesignature) { if ($forcesignature) {
$this->signature = $forcesignature; $this->signature = $forcesignature;
@@ -999,7 +999,7 @@ class BlockedLog
// Recalculate hash // Recalculate hash
$keyforsignature = $this->buildKeyForSignature(); $keyforsignature = $this->buildKeyForSignature();
//$signature_line = dol_hash($keyforsignature, '5'); // Not really usefull //$signature_line = dol_hash($keyforsignature, '5'); // Not really useful
$signature = dol_hash($previoushash.$keyforsignature, 'sha256'); $signature = dol_hash($previoushash.$keyforsignature, 'sha256');
//var_dump($previoushash); var_dump($keyforsignature); var_dump($signature_line); var_dump($signature); //var_dump($previoushash); var_dump($keyforsignature); var_dump($signature_line); var_dump($signature);
@@ -1025,7 +1025,7 @@ class BlockedLog
/** /**
* Return a string for signature. * Return a string for signature.
* Note: rowid of line not included as it is not a business data and this allow to make backup of a year * Note: rowid of line not included as it is not a business data and this allow to make backup of a year
* and restore it into another database with different id wihtout comprimising checksums * and restore it into another database with different id without comprimising checksums
* *
* @return string Key for signature * @return string Key for signature
*/ */
@@ -1081,7 +1081,7 @@ class BlockedLog
} }
/** /**
* Return array of log objects (with criterias) * Return array of log objects (with criteria)
* *
* @param string $element element to search * @param string $element element to search
* @param int $fk_object id of object to search * @param int $fk_object id of object to search

2
htdocs/bom/bom_card.php
View File

@@ -61,7 +61,7 @@ $hookmanager->initHooks(array('bomcard', 'globalcard')); // Note that conf->hook
$extrafields->fetch_name_optionals_label($object->table_element); $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

2
htdocs/bom/bom_list.php
View File

@@ -80,7 +80,7 @@ if (!$sortorder) {
$sortorder = "ASC"; $sortorder = "ASC";
} }
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml'); $search_all = GETPOST('search_all', 'alphanohtml');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

2
htdocs/bom/bom_net_needs.php
View File

@@ -57,7 +57,7 @@ $diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id;
$extrafields->fetch_name_optionals_label($object->table_element); $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

8
htdocs/bom/class/api_boms.class.php
View File

@@ -55,7 +55,7 @@ class Boms extends DolibarrApi
/** /**
* Get properties of a bom object * Get properties of a bom object
* *
* Return an array with bom informations * Return an array with bom information
* *
* @param int $id ID of bom * @param int $id ID of bom
* @return Object Object with cleaned properties * @return Object Object with cleaned properties
@@ -92,7 +92,7 @@ class Boms extends DolibarrApi
* @param int $limit Limit for list * @param int $limit Limit for list
* @param int $page Page number * @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')" * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names * @param string $properties Restrict the data returned to these properties. Ignored if empty. Comma separated list of properties names
* @return array Array of order objects * @return array Array of order objects
* *
* @throws RestException * @throws RestException
@@ -187,7 +187,7 @@ class Boms extends DolibarrApi
foreach ($request_data as $field => $value) { foreach ($request_data as $field => $value) {
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->bom->context['caller'] = $request_data['caller']; $this->bom->context['caller'] = $request_data['caller'];
continue; continue;
} }
@@ -231,7 +231,7 @@ class Boms extends DolibarrApi
continue; continue;
} }
if ($field === 'caller') { if ($field === 'caller') {
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller // Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again with the caller
$this->bom->context['caller'] = $request_data['caller']; $this->bom->context['caller'] = $request_data['caller'];
continue; continue;
} }

12
htdocs/bom/class/bom.class.php
View File

@@ -93,7 +93,7 @@ class BOM extends CommonObject
* 'noteditable' says if field is not editable (1 or 0) * 'noteditable' says if field is not editable (1 or 0)
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created. * 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8). * 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200' * 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -927,7 +927,7 @@ class BOM extends CommonObject
// Protection // Protection
if ($this->status == self::STATUS_VALIDATED) { if ($this->status == self::STATUS_VALIDATED) {
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING); dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
return 0; return 0;
} }
@@ -1148,7 +1148,7 @@ class BOM extends CommonObject
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)
@@ -1331,7 +1331,7 @@ class BOM extends CommonObject
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param string $modele Force template to use ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs object lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref
@@ -1738,7 +1738,7 @@ class BOMLine extends CommonObjectLine
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0). * 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* 'default' is a default value for creation (can still be replaced by the global setup of default values) * 'default' is a default value for creation (can still be replaced by the global setup of default values)
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'position' is the sort order of field. * 'position' is the sort order of field.
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8). * 'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
@@ -2021,7 +2021,7 @@ class BOMLine extends CommonObjectLine
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)

6
htdocs/bom/tpl/objectline_view.tpl.php
View File

@@ -127,7 +127,7 @@ print '</td>';
// Qty // Qty
print '<td class="linecolqty nowrap right">'; print '<td class="linecolqty nowrap right">';
$coldisplay++; $coldisplay++;
echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formatting role of function price
print '</td>'; print '</td>';
if ($filtertype != 1) { if ($filtertype != 1) {
@@ -146,7 +146,7 @@ if ($filtertype != 1) {
print '</td>'; print '</td>';
print '<td class="linecoldisablestockchange nowrap right">'; print '<td class="linecoldisablestockchange nowrap right">';
$coldisplay++; $coldisplay++;
echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formating role of function price echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formatting role of function price
print '</td>'; print '</td>';
print '<td class="linecolefficiency nowrap right">'; print '<td class="linecolefficiency nowrap right">';
@@ -244,7 +244,7 @@ if ($action == 'selectlines') {
print '</tr>'; print '</tr>';
// Select of all the sub-BOM lines // Select of all the sub-BOM lines
// From this pont to the end of the file, we only take care of sub-BOM lines // From this point to the end of the file, we only take care of sub-BOM lines
$sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl'; $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
$sql.= ' WHERE fk_bom ='. (int) $tmpbom->id; $sql.= ' WHERE fk_bom ='. (int) $tmpbom->id;
$resql = $object->db->query($sql); $resql = $object->db->query($sql);

2
htdocs/bookcal/availabilities_card.php
View File

@@ -57,7 +57,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

4
htdocs/bookcal/availabilities_list.php
View File

@@ -85,7 +85,7 @@ if (!$sortorder) {
$sortorder = "ASC"; $sortorder = "ASC";
} }
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml'); $search_all = GETPOST('search_all', 'alphanohtml');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
@@ -510,7 +510,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n"; print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

2
htdocs/bookcal/booking_list.php
View File

@@ -24,7 +24,7 @@
/** /**
* \file htdocs/bookcal/booking_list.php * \file htdocs/bookcal/booking_list.php
* \ingroup bookcal * \ingroup bookcal
* \brief Management of direct debit order or credit tranfer of invoices * \brief Management of direct debit order or credit transfer of invoices
*/ */
// Load Dolibarr environment // Load Dolibarr environment

2
htdocs/bookcal/calendar_card.php
View File

@@ -113,7 +113,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST("search_all", 'alpha'); $search_all = GETPOST("search_all", 'alpha');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {

4
htdocs/bookcal/calendar_list.php
View File

@@ -105,7 +105,7 @@ if (!$sortorder) {
$sortorder = "ASC"; $sortorder = "ASC";
} }
// Initialize array of search criterias // Initialize array of search criteria
$search_all = GETPOST('search_all', 'alphanohtml'); $search_all = GETPOST('search_all', 'alphanohtml');
$search = array(); $search = array();
foreach ($object->fields as $key => $val) { foreach ($object->fields as $key => $val) {
@@ -531,7 +531,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n"; print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search // Fields title search

8
htdocs/bookcal/class/availabilities.class.php
View File

@@ -92,7 +92,7 @@ class Availabilities extends CommonObject
* 'alwayseditable' says if field can be modified also when status is not draft ('1' or '0') * 'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created. * 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage) * 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200' * 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -521,7 +521,7 @@ class Availabilities extends CommonObject
// Protection // Protection
if ($this->status == self::STATUS_VALIDATED) { if ($this->status == self::STATUS_VALIDATED) {
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING); dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
return 0; return 0;
} }
@@ -710,7 +710,7 @@ class Availabilities extends CommonObject
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)
@@ -1048,7 +1048,7 @@ class Availabilities extends CommonObject
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param string $modele Force template to use ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs object lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref

8
htdocs/bookcal/class/calendar.class.php
View File

@@ -93,7 +93,7 @@ class Calendar extends CommonObject
* 'alwayseditable' says if field can be modified also when status is not draft ('1' or '0') * 'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
* 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created. * 'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
* 'index' if we want an index in database. * 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...). * 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
* 'searchall' is 1 if we want to search in this field when making a search from the quick search button. * 'searchall' is 1 if we want to search in this field when making a search from the quick search button.
* 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage) * 'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
* 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200' * 'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
@@ -478,7 +478,7 @@ class Calendar extends CommonObject
// Protection // Protection
if ($this->status == self::STATUS_VALIDATED) { if ($this->status == self::STATUS_VALIDATED) {
dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING); dol_syslog(get_class($this)."::validate action abandoned: already validated", LOG_WARNING);
return 0; return 0;
} }
@@ -692,7 +692,7 @@ class Calendar extends CommonObject
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)
@@ -1036,7 +1036,7 @@ class Calendar extends CommonObject
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param string $modele Force template to use ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs object lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref

2
htdocs/bookmarks/class/bookmark.class.php
View File

@@ -280,7 +280,7 @@ class Bookmark extends CommonObject
} }
/** /**
* Return a link to the object card (with optionaly the picto) * Return a link to the object card (with optionally the picto)
* *
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to ('nolink', ...) * @param string $option On what the link point to ('nolink', ...)