Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698

Conflicts:
	htdocs/langs/en_US/donations.lang
This commit is contained in:
Laurent Destailleur 2014-11-22 15:44:59 +01:00
commit b9cf6ddd65

View File

@ -33,6 +33,6 @@ IConfirmDonationReception=The recipient declare reception, as a donation, of the
MinimumAmount=Minimum amount is %s
FreeTextOnDonations=Free text to show in footer
FrenchOptions=Options for France
DONATION_ART200=Show legacy article 200
DONATION_ART238=Show legacy article 238
DONATION_ART885=Show legacy article 885
DONATION_ART200=Show article 200 from CGI if you are concerned
DONATION_ART238=Show article 238 from CGI if you are concerned
DONATION_ART885=Show article 885 from CGI if you are concerned