Merge https://github.com/mwelters/dolibarr into patch-1
This commit is contained in:
commit
c183a2c3a5
@ -607,7 +607,7 @@ class Expedition extends CommonObject
|
||||
$this->getUrlTrackingStatus($obj->tracking_number);
|
||||
|
||||
/*
|
||||
* Thirparty
|
||||
* Thirdparty
|
||||
*/
|
||||
$result=$this->fetch_thirdparty();
|
||||
|
||||
|
||||
@ -233,7 +233,7 @@ Limit=Limit
|
||||
Limits=Limits
|
||||
Logout=Abmelden
|
||||
NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
|
||||
Connection=Benutzername
|
||||
Connection=Anmelden
|
||||
Setup=Einstellungen
|
||||
Alert=Warnung
|
||||
MenuWarnings=Benachrichtigungen
|
||||
|
||||
@ -444,7 +444,7 @@ class Reception extends CommonObject
|
||||
$this->getUrlTrackingStatus($obj->tracking_number);
|
||||
|
||||
/*
|
||||
* Thirparty
|
||||
* Thirdparty
|
||||
*/
|
||||
$result=$this->fetch_thirdparty();
|
||||
|
||||
|
||||
@ -1456,7 +1456,7 @@ class Societe extends CommonObject
|
||||
* Delete a third party from database and all its dependencies (contacts, rib...)
|
||||
*
|
||||
* @param int $id Id of third party to delete
|
||||
* @param User $fuser User who ask to delete thirparty
|
||||
* @param User $fuser User who ask to delete thirdparty
|
||||
* @param int $call_trigger 0=No, 1=yes
|
||||
* @return int <0 if KO, 0 if nothing done, >0 if OK
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user