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

[CORE] FIX Travis phpcs (#incoterm).

Browse Source
This commit is contained in:
phf 2015-02-23 11:19:00 +01:00
parent 52441914de
commit 11a0624e39
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commonobject.class.php
View File

@ -2418,7 +2418,7 @@ abstract class CommonObject
*/ */
function getIncotermsForPDF() function getIncotermsForPDF()
{ {
$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int)$this->fk_incoterms; $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {

13
htdocs/core/class/html.form.class.php
View File

@ -561,11 +561,14 @@ class Form
/** /**
* Return select list of incoterms * Return select list of incoterms
* *
* @param string $selected Id or Code of preselected incoterm * @param string $selected Id or Code of preselected incoterm
* @param string $htmlname Name of html select object * @param string $location_incoterms Value of input location
* @param string $htmloption Options html on select object * @param string $page Defined the form action
* @param string $maxlength Max length for labels (0=no limit) * @param string $htmlname Name of html select object
* @return string HTML string with select * @param string $htmloption Options html on select object
* @param int $forcecombo Force to use combo box
* @param array $events Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
* @return string HTML string with select and input
*/ */
function select_incoterms($selected='', $location_incoterms='', $page='',$htmlname='incoterm_id',$htmloption='', $forcecombo=0, $events=array()) function select_incoterms($selected='', $location_incoterms='', $page='',$htmlname='incoterm_id',$htmloption='', $forcecombo=0, $events=array())
{ {

2
htdocs/core/modules/modIncoterm.class.php
View File

@ -138,5 +138,3 @@ class modIncoterm extends DolibarrModules
return $this->_remove($sql, $options); return $this->_remove($sql, $options);
} }
} }
?>