Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/projet/tasks/task.php

htdocs/accountancy/bookkeeping/thirdparty_lettrage.php

@@ -22,7 +22,7 @@
 
 /**
  * \file    accounting/bookkeeping/thirdparty_lettrage.php
- * \ingroup Accounting Expert
+ * \ingroup Advanced accountancy
  * \brief   Onglet de gestion de parametrages des ventilations
  */
 

htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php

@@ -22,8 +22,8 @@
 
 /**
  * \file    accounting/bookkeeping/thirdparty_lettrage.php
- * \ingroup Accounting Expert
- * \brief   Onglet de gestion de parametrages des ventilations
+ * \ingroup Advanced accountancy
+ * \brief   Tab to setup lettering
  */
 
 // Dolibarr environment

htdocs/accountancy/class/lettering.class.php

@@ -19,8 +19,8 @@
 
 /**
  * \file      accountancy/class/bookkeeping.class.php
- * \ingroup   Accounting Expert
- * \brief     Fichier de la classe des comptes comptable
+ * \ingroup   Advanced accountancy
+ * \brief     File of class for lettering
  */
 
 include_once DOL_DOCUMENT_ROOT."/accountancy/class/bookkeeping.class.php";

htdocs/accountancy/customer/card.php

@@ -18,9 +18,9 @@
  */
 
 /**
- * \file htdocs/accountancy/customer/card.php
- * \ingroup Accountancy
- * \brief Card customer ventilation
+ * \file 	htdocs/accountancy/customer/card.php
+ * \ingroup Advanced accountancy
+ * \brief 	Card customer ventilation
  */
 require '../../main.inc.php';
 

htdocs/accountancy/customer/index.php

@@ -21,9 +21,9 @@
  */
 
 /**
- * \file htdocs/accountancy/customer/index.php
+ * \file 	htdocs/accountancy/customer/index.php
  * \ingroup Advanced accountancy
- * \brief Home customer journalization page
+ * \brief 	Home customer journalization page
  */
 
 require '../../main.inc.php';

htdocs/accountancy/expensereport/card.php

@@ -23,7 +23,7 @@
  */
 /**
  * \file		htdocs/accountancy/supplier/card.php
- * \ingroup		Accountancy
+ * \ingroup		Advanced accountancy
  * \brief		Card expense report ventilation
  */
 require '../../main.inc.php';

htdocs/accountancy/supplier/card.php

@@ -22,9 +22,9 @@
  *
  */
 /**
- * \file htdocs/accountancy/supplier/card.php
- * \ingroup Accountancy
- * \brief Card supplier ventilation
+ * \file 	htdocs/accountancy/supplier/card.php
+ * \ingroup Advanced accountancy
+ * \brief 	Card supplier ventilation
  */
 require '../../main.inc.php';