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

Conflicts:
	htdocs/langs/en_GB/main.lang
	htdocs/langs/es_CO/salaries.lang

htdocs/langs/en_GB/banks.lang

 # Dolibarr language file - Source file is en_US - banks
-ValidateCheckReceipt=Validate this cheque receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this cheque receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt ?
-BankChecks=Bank cheques
-BankChecksToReceipt=Cheques waiting for deposit
-ShowCheckReceipt=Show cheque deposit receipt
-NumberOfCheques=Nb of cheque
-SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD

htdocs/langs/en_GB/compta.lang

-# Dolibarr language file - Source file is en_US - compta
-CheckReceipt=Cheque deposit
-CheckReceiptShort=Cheque deposit
-NewCheckDeposit=New cheque deposit
-NoWaitingChecks=No cheques waiting for deposit.
-DateChequeReceived=Cheque reception date
-NbOfCheques=Nb of cheques

htdocs/langs/en_GB/main.lang

@@ -13,9 +13,15 @@ FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, %I:%M %p
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y  %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
+AmountVAT=Amount VAT
+TotalVAT=Total VAT
+IncludedVAT=Included VAT
+TTC=Inc. VAT
+VAT=VAT
+VATRate=VAT Rate

htdocs/langs/es_AR/banks.lang

+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD

htdocs/langs/es_AR/commercial.lang

+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to

htdocs/langs/es_AR/suppliers.lang

+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order

htdocs/langs/es_CO/banks.lang

+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD

htdocs/langs/es_CO/commercial.lang

+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to

htdocs/langs/es_CO/suppliers.lang

+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order