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

Fix blank lines and whitespace at end of lines

Browse Source
This commit is contained in:
Laurent BOUQUET 2018-11-08 17:09:54 +01:00
parent b03a91213f
commit 320e7adef7
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/core/modules/DolibarrModules.class.php
View File

@ -377,7 +377,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
* @param string $options String with options when disabling module: * @param string $options String with options when disabling module:
* - 'noboxes' = Do not insert boxes - * - 'noboxes' = Do not insert boxes -
* 'newboxdefonly' = For boxes, insert def of * 'newboxdefonly' = For boxes, insert def of
* boxes only and not boxes activation * boxes only and not boxes activation
* *
* @return int 1 if OK, 0 if KO * @return int 1 if OK, 0 if KO
*/ */
@ -470,7 +470,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
* Disable function. Deletes the module constants and boxes from the database. * Disable function. Deletes the module constants and boxes from the database.
* *
* @param string[] $array_sql SQL requests to be executed when module is disabled * @param string[] $array_sql SQL requests to be executed when module is disabled
* @param string $options Options when disabling module: * @param string $options Options when disabling module:
* *
* @return int 1 if OK, 0 if KO * @return int 1 if OK, 0 if KO
*/ */
@ -1352,13 +1352,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
if (! $err) { if (! $err) {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
if(is_int($frequency)) { $sql.= ' frequency,'; if(is_int($frequency)) { $sql.= ' frequency,';
} }
if(is_int($unitfrequency)) { $sql.= ' unitfrequency,'; if(is_int($unitfrequency)) { $sql.= ' unitfrequency,';
} }
if(is_int($priority)) { $sql.= ' priority,'; if(is_int($priority)) { $sql.= ' priority,';
} }
if(is_int($status)) { $sql.= ' status,'; if(is_int($status)) { $sql.= ' status,';
} }
$sql.= " entity, test)"; $sql.= " entity, test)";
$sql.= " VALUES ("; $sql.= " VALUES (";
@ -1374,13 +1374,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
$sql.= ($command?"'".$this->db->escape($command)."'":"null").","; $sql.= ($command?"'".$this->db->escape($command)."'":"null").",";
$sql.= ($parameters?"'".$this->db->escape($parameters)."'":"null").","; $sql.= ($parameters?"'".$this->db->escape($parameters)."'":"null").",";
$sql.= ($comment?"'".$this->db->escape($comment)."'":"null").","; $sql.= ($comment?"'".$this->db->escape($comment)."'":"null").",";
if(is_int($frequency)) { $sql.= "'".$this->db->escape($frequency)."', "; if(is_int($frequency)) { $sql.= "'".$this->db->escape($frequency)."', ";
} }
if(is_int($unitfrequency)) { $sql.= "'".$this->db->escape($unitfrequency)."', "; if(is_int($unitfrequency)) { $sql.= "'".$this->db->escape($unitfrequency)."', ";
} }
if(is_int($priority)) {$sql.= "'".$this->db->escape($priority)."', "; if(is_int($priority)) {$sql.= "'".$this->db->escape($priority)."', ";
} }
if(is_int($status)) { $sql.= "'".$this->db->escape($status)."', "; if(is_int($status)) { $sql.= "'".$this->db->escape($status)."', ";
} }
$sql.= $entity.","; $sql.= $entity.",";
$sql.= "'".$this->db->escape($test)."'"; $sql.= "'".$this->db->escape($test)."'";
@ -2201,7 +2201,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
* *
* @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes') * @param string $options Options when enabling module ('', 'newboxdefonly', 'noboxes')
* 'noboxes' = Do not insert boxes 'newboxdefonly' = For boxes, * 'noboxes' = Do not insert boxes 'newboxdefonly' = For boxes,
* insert def of boxes only and not boxes activation * insert def of boxes only and not boxes activation
* @return int 1 if OK, 0 if KO * @return int 1 if OK, 0 if KO
*/ */
public function init($options = '') public function init($options = '')

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

@ -654,7 +654,7 @@ class Product extends CommonObject
if (! $error && ! $notrigger) { if (! $error && ! $notrigger) {
// Call trigger // Call trigger
$result=$this->call_trigger('PRODUCT_CREATE', $user); $result=$this->call_trigger('PRODUCT_CREATE', $user);
if ($result < 0) { $error++; if ($result < 0) { $error++;
} }
// End call triggers // End call triggers
} }
@ -975,7 +975,7 @@ class Product extends CommonObject
if (! $error && ! $notrigger) { if (! $error && ! $notrigger) {
// Call trigger // Call trigger
$result=$this->call_trigger('PRODUCT_MODIFY', $user); $result=$this->call_trigger('PRODUCT_MODIFY', $user);
if ($result < 0) { $error++; if ($result < 0) { $error++;
} }
// End call triggers // End call triggers
} }
@ -1089,7 +1089,7 @@ class Product extends CommonObject
if (! $error && empty($notrigger)) { if (! $error && empty($notrigger)) {
// Call trigger // Call trigger
$result=$this->call_trigger('PRODUCT_DELETE', $user); $result=$this->call_trigger('PRODUCT_DELETE', $user);
if ($result < 0) { $error++; if ($result < 0) { $error++;
} }
// End call triggers // End call triggers
} }
@ -4085,7 +4085,7 @@ class Product extends CommonObject
* This function need a lot of load. If you use it on list, use a cache to execute it once for each product id. * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
* If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible. * If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
* *
* @param string $option '' = Load all stock info, also from closed and internal warehouses, * @param string $option '' = Load all stock info, also from closed and internal warehouses,
* @return int < 0 if KO, > 0 if OK * @return int < 0 if KO, > 0 if OK
* @see load_virtual_stock(), loadBatchInfo() * @see load_virtual_stock(), loadBatchInfo()
*/ */