lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	htdocs/projet/tasks/task.php
This commit is contained in:
Laurent Destailleur 2017-07-14 00:24:49 +02:00
commit 201db3b720
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
View File

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

4
htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
View File

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

4
htdocs/accountancy/class/lettering.class.php
View File

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

6
htdocs/accountancy/customer/card.php
View File

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

4
htdocs/accountancy/customer/index.php
View File

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

2
htdocs/accountancy/expensereport/card.php
View File

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

6
htdocs/accountancy/supplier/card.php
View File

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