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

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-02 02:55:24 +01:00
parent 592dacd849
commit 7f209f7cc7
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/card.php
View File

@ -490,7 +490,7 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} elseif ($action == 'classifyunbilled' && $usercancreate) { } elseif ($action == 'classifyunbilled' && $usercancreate) {
$ret = $object->classifyUnBilled(); $ret = $object->classifyUnBilled($user);
if ($ret < 0) { if ($ret < 0) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }

19
htdocs/commande/class/commande.class.php
View File

@ -2962,11 +2962,12 @@ class Commande extends CommonOrder
/** /**
* Classify the order as not invoiced * Classify the order as not invoiced
* *
* @return int <0 if ko, >0 if ok * @param User $user Object user making the change
* @param int $notrigger 1=Does not execute triggers, 0=execute triggers
* @return int <0 if ko, >0 if ok
*/ */
public function classifyUnBilled() public function classifyUnBilled(User $user, $notrigger = 0)
{ {
global $conf, $user, $langs;
$error = 0; $error = 0;
$this->db->begin(); $this->db->begin();
@ -2981,12 +2982,14 @@ class Commande extends CommonOrder
$this->billed = 1; $this->billed = 1;
} }
// Call trigger if (!$notrigger && empty($error)) {
$result = $this->call_trigger('ORDER_CLASSIFY_UNBILLED', $user); // Call trigger
if ($result < 0) { $result = $this->call_trigger('ORDER_CLASSIFY_UNBILLED', $user);
$error++; if ($result < 0) {
$error++;
}
// End call triggers
} }
// End call triggers
if (!$error) { if (!$error) {
$this->billed = 0; $this->billed = 0;

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

@ -129,7 +129,7 @@ class DolGeoIP
} }
} else { } else {
if (!function_exists('geoip_country_code_by_addr')) { if (!function_exists('geoip_country_code_by_addr')) {
return strtolower(geoip_country_code_by_name($this->gi, $ip)); return strtolower(geoip_country_code_by_name($ip));
} }
return strtolower(geoip_country_code_by_addr($this->gi, $ip)); return strtolower(geoip_country_code_by_addr($this->gi, $ip));
} }

2
htdocs/install/upgrade2.php
View File

@ -4169,7 +4169,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
$mod = new modBlockedLog($db); $mod = new modBlockedLog($db);
// For this module we only reload menus. // For this module we only reload menus.
$mod->delete_menus(); $mod->delete_menus();
$mod->insert_menus($reloadmode); $mod->insert_menus();
} }
} elseif ($moduletoreload == 'MAIN_MODULE_CRON') { } elseif ($moduletoreload == 'MAIN_MODULE_CRON') {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module"); dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");