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

aljawaid-develop

Conflicts:
	htdocs/langs/en_US/agenda.lang
	htdocs/langs/en_US/bills.lang

htdocs/langs/en_US/bills.lang

@@ -75,6 +75,7 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
+PaymentTypeDC=Debit/Credit Card
 IdPaymentMode=Payment type (id)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
@@ -330,6 +331,7 @@ GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 # PaymentConditions
+Statut=Status
 PaymentConditionShortRECEP=Immediate
 PaymentConditionRECEP=Immediate
 PaymentConditionShort30D=30 days
@@ -485,4 +487,4 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 DeleteRepeatableInvoice=Delete template invoice
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
 CreateOneBillByThird=Create one invoice per third (otherwise, one invoice per order)
-BillCreated=%s bill(s) created
\ No newline at end of file
+BillCreated=%s bill(s) created