lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9492 from grandoc/new_branch_13_09_2018

Browse Source 
Standardize and update code
This commit is contained in:
Laurent Destailleur 2018-10-01 02:20:23 +02:00 committed by GitHub
commit 367de729ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/class/html.formsms.class.php
View File

@ -60,9 +60,9 @@ class FormSms
var $param=array(); var $param=array();
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
/** /**
@ -90,13 +90,13 @@ class FormSms
/** /**
* Show the form to input an sms. * Show the form to input an sms.
* *
* @param string $morecss Class on first column td * @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 int $showform Show form tags and submit button (recommanded is to use with value 0)
* @return void * @return void
*/ */
function show_form($morecss='titlefield', $showform=1) function show_form($morecss='titlefield', $showform=1)
{ {
// phpcs:enable // phpcs:enable
global $conf, $langs, $user, $form; global $conf, $langs, $user, $form;
if (! is_object($form)) $form=new Form($this->db); if (! is_object($form)) $form=new Form($this->db);

2
htdocs/core/datepicker.php
View File

@ -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 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 // Load translation files required by the page
$langs->loadLangs(array("agenda","main")); $langs->loadLangs(array("main","agenda"));
$right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
$left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');

6
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@ -50,9 +50,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
public $phpmin = array(5, 4); public $phpmin = array(5, 4);
/** /**
* Dolibarr version of the loaded document * Dolibarr version of the loaded document
* @public string * @public string
*/ */
public $version = 'dolibarr'; public $version = 'dolibarr';

8
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -48,9 +48,9 @@ class doc_generic_user_odt extends ModelePDFUser
public $phpmin = array(5, 4); public $phpmin = array(5, 4);
/** /**
* Dolibarr version of the loaded document * Dolibarr version of the loaded document
* @public string * @public string
*/ */
public $version = 'dolibarr'; public $version = 'dolibarr';
@ -64,7 +64,7 @@ class doc_generic_user_odt extends ModelePDFUser
global $conf, $langs, $mysoc; global $conf, $langs, $mysoc;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("main", "companies")); $langs->loadLangs(array("main","companies"));
$this->db = $db; $this->db = $db;
$this->name = "ODT templates"; $this->name = "ODT templates";

8
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@ -50,9 +50,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
public $phpmin = array(5, 4); public $phpmin = array(5, 4);
/** /**
* Dolibarr version of the loaded document * Dolibarr version of the loaded document
* @public string * @public string
*/ */
public $version = 'dolibarr'; public $version = 'dolibarr';
@ -66,7 +66,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
global $conf, $langs, $mysoc; global $conf, $langs, $mysoc;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('companies', 'main')); $langs->loadLangs(array("main","companies"));
$this->db = $db; $this->db = $db;
$this->name = "ODT templates"; $this->name = "ODT templates";

6
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
View File

@ -511,7 +511,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
{ {
// Load translation files required by the page // 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->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
if (empty($object->actionmsg)) if (empty($object->actionmsg))
@ -525,7 +525,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED') elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
{ {
// Load translation files required by the page // 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->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
if (empty($object->actionmsg)) if (empty($object->actionmsg))
@ -558,7 +558,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL') elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
{ {
// Load translation files required by the page // 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->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
if (empty($object->actionmsg)) if (empty($object->actionmsg))

2
htdocs/don/document.php
View File

@ -41,7 +41,7 @@ if (! empty($conf->projet->enabled))
} }
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("other","donations","companies")); $langs->loadLangs(array("companies","other","donations"));
$id = GETPOST('id','int'); $id = GETPOST('id','int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');

2
htdocs/don/list.php
View File

@ -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'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("donations","companies")); $langs->loadLangs(array("companies","donations"));
$sortfield = GETPOST("sortfield",'alpha'); $sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha'); $sortorder = GETPOST("sortorder",'alpha');

2
htdocs/don/note.php
View File

@ -36,7 +36,7 @@ if (! empty($conf->projet->enabled))
} }
// Load translation files required by the page // 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 $id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int')); // For backward compatibility
$ref=GETPOST('ref','alpha'); $ref=GETPOST('ref','alpha');

2
htdocs/don/stats/index.php
View File

@ -48,7 +48,7 @@ $startyear=$year-1;
$endyear=$year; $endyear=$year;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("sendings","other","companies")); $langs->loadLangs(array("companies","other","sendings"));
/* /*