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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2021-03-28 17:42:18 +00:00
parent 1ae0e2a920
commit b7045ef3a0
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
htdocs/adherents/card.php
View File

@ -549,7 +549,7 @@ if (empty($reshook)) {
$db->commit(); $db->commit();
$rowid = $object->id; $rowid = $object->id;
$id = $object->id; $id = $object->id;
} else { } else {
$db->rollback(); $db->rollback();
@ -561,37 +561,37 @@ if (empty($reshook)) {
} }
// Auto-create thirdparty on member creation // Auto-create thirdparty on member creation
if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) { if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
if ($result > 0) { if ($result > 0) {
// User creation // User creation
$company = new Societe($db); $company = new Societe($db);
$companyalias = ''; $companyalias = '';
$fullname = $object->getFullName($langs); $fullname = $object->getFullName($langs);
if ($object->morphy == 'mor') { if ($object->morphy == 'mor') {
$companyname = $object->company; $companyname = $object->company;
if (!empty($fullname)) { if (!empty($fullname)) {
$companyalias = $fullname; $companyalias = $fullname;
} }
} else { } else {
$companyname = $fullname; $companyname = $fullname;
if (!empty($object->company)) { if (!empty($object->company)) {
$companyalias = $object->company; $companyalias = $object->company;
} }
} }
$result = $company->create_from_member($object, $companyname, $companyalias); $result = $company->create_from_member($object, $companyname, $companyalias);
if ($result < 0) { if ($result < 0) {
$langs->load("errors"); $langs->load("errors");
setEventMessages($langs->trans($company->error), null, 'errors'); setEventMessages($langs->trans($company->error), null, 'errors');
setEventMessages($company->error, $company->errors, 'errors'); setEventMessages($company->error, $company->errors, 'errors');
} }
} else { } else {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} }
} }
$action = ($result < 0 || !$error) ? '' : 'create'; $action = ($result < 0 || !$error) ? '' : 'create';
} }

10
htdocs/societe/class/societe.class.php
View File

@ -3796,23 +3796,23 @@ class Societe extends CommonObject
$this->code_client = ($customercode ? $customercode : -1); $this->code_client = ($customercode ? $customercode : -1);
$this->code_fournisseur = -1; $this->code_fournisseur = -1;
$this->typent_id = ($member->morphy == 'phy' ? 8 : 0); // The type of thirdparty is private (individual) if the member is human (phy) $this->typent_id = ($member->morphy == 'phy' ? 8 : 0); // The type of thirdparty is private (individual) if the member is human (phy)
$this->db->begin(); $this->db->begin();
// Cree et positionne $this->id // Cree et positionne $this->id
$result = $this->create($user); $result = $this->create($user);
if ($result >= 0) { if ($result >= 0) {
// Auto-create contact on thirdparty creation // Auto-create contact on thirdparty creation
if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT)) { if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT)) {
// Fill fields needed by contact // Fill fields needed by contact
$this->name_bis = $member->lastname; $this->name_bis = $member->lastname;
$this->firstname = $member->firstname; $this->firstname = $member->firstname;
$this->civility_id = $member->civility_id; $this->civility_id = $member->civility_id;
dol_syslog("We ask to create a contact/address too", LOG_DEBUG); dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
$result = $this->create_individual($user); $result = $this->create_individual($user);
if ($result < 0) { if ($result < 0) {
setEventMessages($this->error, $this->errors, 'errors'); setEventMessages($this->error, $this->errors, 'errors');
$this->db->rollback(); $this->db->rollback();