Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix name of webservice

Browse Source
This commit is contained in:
Laurent Destailleur
2024-02-29 19:47:58 +01:00
parent 9a41edfdc4
commit 821f327da4
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -692,6 +692,18 @@ abstract class CommonObject
*/ */
public $user_modification_id; public $user_modification_id;
/**
* @var int ID
* @deprecated Use $user_creation_id
*/
public $fk_user_creat;
/**
* @var int ID
* @deprecated Use $user_modification_id
*/
public $fk_user_modif;
public $next_prev_filter; public $next_prev_filter;
@@ -9721,9 +9733,11 @@ abstract class CommonObject
} }
if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) { if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
$fieldvalues['fk_user_creat'] = $user->id; $fieldvalues['fk_user_creat'] = $user->id;
$this->fk_user_creat = $user->id;
} }
if (array_key_exists('user_creation_id', $fieldvalues) && !($fieldvalues['user_creation_id'] > 0)) { if (array_key_exists('user_creation_id', $fieldvalues) && !($fieldvalues['user_creation_id'] > 0)) {
$fieldvalues['user_creation_id'] = $user->id; $fieldvalues['user_creation_id'] = $user->id;
$this->user_modification_id = $user->id;
} }
if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) { if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {
$fieldvalues['pass_crypted'] = dol_hash($this->pass); $fieldvalues['pass_crypted'] = dol_hash($this->pass);

4
htdocs/fourn/commande/card.php
View File

@@ -1448,8 +1448,8 @@ if (empty($reshook)) {
); );
// Is sync supplier web services module activated? and everything filled? // Is sync supplier web services module activated? and everything filled?
if (isModEnabled('syncsupplierwebservices')) { if (isModEnabled('webservicesclient')) {
setEventMessages($langs->trans("WarningModuleNotActive", $langs->transnoentities("Module2650Name")), null, 'mesgs'); setEventMessages($langs->trans("WarningModuleNotActive", $langs->transnoentities("Module2660Name")), null, 'mesgs');
} elseif (empty($ws_url) || empty($ws_key)) { } elseif (empty($ws_url) || empty($ws_key)) {
setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors'); setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
} elseif (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) { } elseif (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) {