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

build/debian/control

@@ -10,12 +10,13 @@ Build-Depends: debhelper (>= 9), po-debconf
  
 Package: dolibarr
 Architecture: all
-Depends: libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
-    php-cli, 
+# For debian 7 or 8 or 9
+Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
+    php5-cli | php-cli,
 # Required PHP extensions
-    php-mysql | php-mysqli, php-curl, php-gd, php-ldap,
+    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd,
 # Required PHP libraries
-    php-pear, php-mail-mime, php-xml, php-mbstring,
+    php-pear, php-mail-mime,
 #    php-tcpdf,
 #    libfpdf-tpl-php, php-fpdf,
 #    libphp-adodb,
@@ -30,7 +31,9 @@ Depends: libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php
     ${misc:Depends},
     ${perl:Depends}
 Recommends: apache2 | lighttpd | httpd,
-    mariadb-server | virtual-mysql-server
+    mariadb-server | virtual-mysql-server,
+# Required PHP extensions for debian 9 but we can't add them into a Depends, it does not exists on debian 7 and 8
+    php-xml, php-mbstring
 Suggests: www-browser, php5-geoip
 Description: Web based software to manage a company or foundation
  Dolibarr ERP & CRM is an easy to use open source/free software package for 

htdocs/langs/en_US/bills.lang

@@ -125,7 +125,7 @@ BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
 BillShortStatusPaidBackOrConverted=Refund or converted
-BillShortStatusConverted=Processed
+BillShortStatusConverted=Paid
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started