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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_user.sql
This commit is contained in:
Laurent Destailleur
2016-09-28 19:49:36 +02:00
parent 2d6877ac67 6653c03e07
commit e99f115a8f
12 changed files with 241 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/langs/en_US/admin.lang
View File

@@ -474,8 +474,8 @@ Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module500Name=Special expenses
Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
Module510Name=Salaries
Module510Desc=Management of employees salaries and payments
Module510Name=Employee contracts and salaries
Module510Desc=Management of employees contracts, salaries and payments
Module520Name=Loan
Module520Desc=Management of loans
Module600Name=Notifications