Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur
2020-05-28 19:10:06 +02:00
parent cf924e11e9
commit f8b92e507c
4 changed files with 67 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/user/class/user.class.php
View File

@@ -1174,15 +1174,7 @@ class User extends CommonObject
return -5;
}
// Update minor fields
$result = $this->update($user, 1, 1);
if ($result < 0)
{
$this->db->rollback();
return -4;
}
if (!empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
if (! empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
{
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
$langs->load("stocks");
@@ -1192,7 +1184,17 @@ class User extends CommonObject
$entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock", $this->getFullName($langs));
$entrepot->statut = 1;
$entrepot->country_id = $mysoc->country_id;
$entrepot->create($user);
$warehouseid = $entrepot->create($user);
$this->fk_warehouse = $warehouseid;
}
// Update minor fields
$result = $this->update($user, 1, 1);
if ($result < 0)
{
$this->db->rollback();
return -4;
}
if (!$notrigger)