Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 16:12:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
This commit is contained in:
Laurent Destailleur
2015-01-30 15:53:06 +01:00
parent 16fa19be87 67c1ae8593
commit 4fdc287717
58 changed files with 497 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,7 +574,7 @@ Permission67=Export interventions
Permission71=Read members
Permission72=Create/modify members
Permission74=Delete members
Permission75=Setup types and attributes for members
Permission75=Setup types of membership
Permission76=Export datas
Permission78=Read subscriptions
Permission79=Create/modify subscriptions
@@ -597,8 +597,8 @@ Permission106=Export sendings
Permission109=Delete sendings
Permission111=Read financial accounts
Permission112=Create/modify/delete and compare transactions
Permission113=Setup financiel accounts (create, manage categories)
Permission114=Consolidate transactions
Permission113=Setup financial accounts (create, manage categories)
Permission114=Reconciliate transactions
Permission115=Export transactions and account statements
Permission116=Transfers between accounts
Permission117=Manage cheques dispatching
@@ -1059,7 +1059,7 @@ BrowserIsOK=You are using the web browser %s. This browser is ok for security an
BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
XDebugInstalled=XDebug is loaded.
XCacheInstalled=XCache is loaded.
AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
FieldEdition=Edition of field %s
FixTZ=TimeZone fix
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
@@ -1405,9 +1405,9 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
SendingsAbility=Support sendings sheets for customer deliveries
SendingsAbility=Support shipment sheets for customer deliveries
NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
FreeLegalTextOnShippings=Free text on shippings
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
DeliveryOrderNumberingModules=Products deliveries receipt numbering module
DeliveryOrderModel=Products deliveries receipt model