Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
This commit is contained in:
Laurent Destailleur
2019-03-09 01:20:13 +01:00
parent 3716834b0a 57b9be53b3
commit b710e28ffa
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1857,4 +1857,5 @@ DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (
MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
DefaultCustomerType=Default thirdparty type for "New customer" creation form
DefaultCustomerType=Default thirdparty type for "New customer" creation form
ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.