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

Merge https://github.com/mwelters/dolibarr into patch-1

Browse Source
This commit is contained in:
Rafael Ingenleuf 2019-03-11 12:33:04 +01:00
commit c183a2c3a5
5 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -498,7 +498,7 @@ NEW: Filter export model is now by user
NEW: Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES NEW: Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
NEW: generalize use of button to create new element from list NEW: generalize use of button to create new element from list
NEW: hidden conf AGENDA_NB_WEEKS_IN_VIEW_PER_USER to set nb weeks to show into per user view NEW: hidden conf AGENDA_NB_WEEKS_IN_VIEW_PER_USER to set nb weeks to show into per user view
NEW: hidden conf to assign category to thirparty that are neither customer nor prospect or supplier NEW: hidden conf to assign category to thirdparty that are neither customer nor prospect or supplier
NEW: hidden conf to set nb weeks to show into user view NEW: hidden conf to set nb weeks to show into user view
NEW: hidden option MAIN_DISABLE_FREE_LINES NEW: hidden option MAIN_DISABLE_FREE_LINES
NEW: improve way of adding users/sales representative to thirdparty NEW: improve way of adding users/sales representative to thirdparty

2
htdocs/expedition/class/expedition.class.php
View File

@ -607,7 +607,7 @@ class Expedition extends CommonObject
$this->getUrlTrackingStatus($obj->tracking_number); $this->getUrlTrackingStatus($obj->tracking_number);
/* /*
* Thirparty * Thirdparty
*/ */
$result=$this->fetch_thirdparty(); $result=$this->fetch_thirdparty();

2
htdocs/langs/de_DE/main.lang
View File

@ -233,7 +233,7 @@ Limit=Limit
Limits=Limits Limits=Limits
Logout=Abmelden Logout=Abmelden
NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b> NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
Connection=Benutzername Connection=Anmelden
Setup=Einstellungen Setup=Einstellungen
Alert=Warnung Alert=Warnung
MenuWarnings=Benachrichtigungen MenuWarnings=Benachrichtigungen

2
htdocs/reception/class/reception.class.php
View File

@ -444,7 +444,7 @@ class Reception extends CommonObject
$this->getUrlTrackingStatus($obj->tracking_number); $this->getUrlTrackingStatus($obj->tracking_number);
/* /*
* Thirparty * Thirdparty
*/ */
$result=$this->fetch_thirdparty(); $result=$this->fetch_thirdparty();

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

@ -1456,7 +1456,7 @@ class Societe extends CommonObject
* Delete a third party from database and all its dependencies (contacts, rib...) * Delete a third party from database and all its dependencies (contacts, rib...)
* *
* @param int $id Id of third party to delete * @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 * @param int $call_trigger 0=No, 1=yes
* @return int <0 if KO, 0 if nothing done, >0 if OK * @return int <0 if KO, 0 if nothing done, >0 if OK
*/ */