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

This commit is contained in:
Juanjo Menent 2015-08-10 11:31:38 +02:00
commit ae25846e25

View File

@ -330,8 +330,8 @@ PaymentTypeCB=Credit card
PaymentTypeShortCB=Credit card
PaymentTypeCHQ=Check
PaymentTypeShortCHQ=Check
PaymentTypeTIP=TIP
PaymentTypeShortTIP=TIP
PaymentTypeTIP=Deposit
PaymentTypeShortTIP=Deposit
PaymentTypeVAD=On line payment
PaymentTypeShortVAD=On line payment
PaymentTypeTRA=Bill payment