forked from Wavyzz/dolibarr
Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/core/class/rssparser.class.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/extrafields_list_search_sql.tpl.php htdocs/expedition/list.php