diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 165a4069b87..a04da7caf08 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -60,9 +60,9 @@ class FormSms var $param=array(); /** - * @var string Error code (or message) - */ - public $error=''; + * @var string Error code (or message) + */ + public $error=''; /** @@ -90,13 +90,13 @@ class FormSms /** * Show the form to input an sms. * - * @param string $morecss Class on first column td - * @param int $showform Show form tags and submit button (recommanded is to use with value 0) + * @param string $morecss Class on first column td + * @param int $showform Show form tags and submit button (recommanded is to use with value 0) * @return void */ function show_form($morecss='titlefield', $showform=1) { - // phpcs:enable + // phpcs:enable global $conf, $langs, $user, $form; if (! is_object($form)) $form=new Form($this->db); diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php index 43957d6bd06..546ca757234 100644 --- a/htdocs/core/datepicker.php +++ b/htdocs/core/datepicker.php @@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php // Load translation files required by the page -$langs->loadLangs(array("agenda","main")); +$langs->loadLangs(array("main","agenda")); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index f483738ecb7..3bf35edbe13 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -50,9 +50,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal public $phpmin = array(5, 4); /** - * Dolibarr version of the loaded document - * @public string - */ + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index cae6501de2d..cacef2dcb55 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -48,9 +48,9 @@ class doc_generic_user_odt extends ModelePDFUser public $phpmin = array(5, 4); /** - * Dolibarr version of the loaded document - * @public string - */ + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; @@ -64,7 +64,7 @@ class doc_generic_user_odt extends ModelePDFUser global $conf, $langs, $mysoc; // Load translation files required by the page - $langs->loadLangs(array("main", "companies")); + $langs->loadLangs(array("main","companies")); $this->db = $db; $this->name = "ODT templates"; diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 98ccba8ce21..161c9abc3a6 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -50,9 +50,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup public $phpmin = array(5, 4); /** - * Dolibarr version of the loaded document - * @public string - */ + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; @@ -66,7 +66,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup global $conf, $langs, $mysoc; // Load translation files required by the page - $langs->loadLangs(array('companies', 'main')); + $langs->loadLangs(array("main","companies")); $this->db = $db; $this->name = "ODT templates"; diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index ff24f358083..938b63d90f3 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -511,7 +511,7 @@ class InterfaceActionsAuto extends DolibarrTriggers elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') { // Load translation files required by the page - $langs->loadLangs(array("agenda","other","orders","bills")); + $langs->loadLangs(array("agenda","other","bills","orders")); if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref); if (empty($object->actionmsg)) @@ -525,7 +525,7 @@ class InterfaceActionsAuto extends DolibarrTriggers elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED') { // Load translation files required by the page - $langs->loadLangs(array("agenda","other","orders","bills")); + $langs->loadLangs(array("agenda","other","bills","orders")); if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref); if (empty($object->actionmsg)) @@ -558,7 +558,7 @@ class InterfaceActionsAuto extends DolibarrTriggers elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL') { // Load translation files required by the page - $langs->loadLangs(array("agenda","other","orders","bills")); + $langs->loadLangs(array("agenda","other","bills","orders")); if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref); if (empty($object->actionmsg)) diff --git a/htdocs/don/document.php b/htdocs/don/document.php index b8396ab72bb..177b2b82d8b 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -41,7 +41,7 @@ if (! empty($conf->projet->enabled)) } // Load translation files required by the page -$langs->loadLangs(array("other","donations","companies")); +$langs->loadLangs(array("companies","other","donations")); $id = GETPOST('id','int'); $ref = GETPOST('ref', 'alpha'); diff --git a/htdocs/don/list.php b/htdocs/don/list.php index 3fffe242e20..782a3afba75 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; // Load translation files required by the page -$langs->loadLangs(array("donations","companies")); +$langs->loadLangs(array("companies","donations")); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); diff --git a/htdocs/don/note.php b/htdocs/don/note.php index 7c3636eef4a..3a5c55f7c6d 100644 --- a/htdocs/don/note.php +++ b/htdocs/don/note.php @@ -36,7 +36,7 @@ if (! empty($conf->projet->enabled)) } // Load translation files required by the page -$langs->loadLangs(array("bills","donations","companies")); +$langs->loadLangs(array("companies","bills","donations")); $id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int')); // For backward compatibility $ref=GETPOST('ref','alpha'); diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index 4398dfd8b8e..224e674e9da 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -48,7 +48,7 @@ $startyear=$year-1; $endyear=$year; // Load translation files required by the page -$langs->loadLangs(array("sendings","other","companies")); +$langs->loadLangs(array("companies","other","sendings")); /*