Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-28 20:31:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into

Browse Source 
marcosgdf-task-1793

Conflicts:
	ChangeLog
	htdocs/margin/lib/margins.lib.php
This commit is contained in:
Laurent Destailleur
2015-01-31 14:29:15 +01:00
parent d0cc56d616 c667f8734a
commit 770ddb6b0f
6 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,6 +763,7 @@ Permission55001=Read polls
Permission55002=Create/modify polls
Permission59001=Read commercial margins
Permission59002=Define commercial margins
Permission59003=Read every user margin
DictionaryCompanyType=Thirdparties type
DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
DictionaryProspectLevel=Prospect potential level

1
htdocs/langs/en_US/margins.lang
View File

@@ -16,6 +16,7 @@ MarginDetails=Margin details
ProductMargins=Product margins
CustomerMargins=Customer margins
SalesRepresentativeMargins=Sales representative margins
UserMargins=User margins
ProductService=Product or Service
AllProducts=All products and services
ChooseProduct/Service=Choose product or service