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

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

Browse Source
This commit is contained in:
florian HENRY
2016-05-17 08:37:22 +02:00
parent 5d4db68b87 f9ded46a99
commit a45680dc19
48 changed files with 238 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,8 +346,8 @@ PaymentConditionPT_5050=50%% in advance, 50%% on delivery
FixAmount=Fix amount
VarAmount=Variable amount (%% tot.)
# PaymentType
PaymentTypeVIR=Bank deposit
PaymentTypeShortVIR=Bank deposit
PaymentTypeVIR=Bank transfer
PaymentTypeShortVIR=Bank transfer
PaymentTypePRE=Bank's order
PaymentTypeShortPRE=Bank's order
PaymentTypeLIQ=Cash

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

@@ -124,6 +124,7 @@ Int=Int
DateAndTime=Date and time
PublicMemberCard=Member public card
MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe
SubscriptionNotRecorded=Subscription not recorded
AddSubscription=Create subscription
ShowSubscription=Show subscription
MemberModifiedInDolibarr=Member modified in Dolibarr