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

Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into new_branch_30_08_2018

Browse Source
This commit is contained in:
Philippe GRAND 2018-08-31 16:42:38 +02:00
commit c60c38dfb3
2 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/accountancy/class/accountancycategory.class.php
View File

@ -30,10 +30,10 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
*/ */
class AccountancyCategory // extends CommonObject class AccountancyCategory // extends CommonObject
{ {
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
/** /**
* @var string Error string * @var string Error string
@ -57,21 +57,21 @@ class AccountancyCategory // extends CommonObject
public $table_element='c_accounting_category'; public $table_element='c_accounting_category';
/** /**
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @var mixed Sample property 1 * @var mixed Sample property 1
*/ */
public $code; public $code;
/** /**
* @var string proper name for given parameter * @var string proper name for given parameter
*/ */
public $label; public $label;
/** /**
* @var mixed Sample property 1 * @var mixed Sample property 1
*/ */
public $range_account; public $range_account;

33
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -79,35 +79,24 @@ class AccountingAccount extends CommonObject
var $account_number; var $account_number;
var $account_parent; var $account_parent;
var $account_category; var $account_category;
<<<<<<< HEAD
/** /**
* @var string proper name for given parameter * @var string Label of account
*/ */
public $label; public $label;
var $fk_user_author; /**
var $fk_user_modif; * @var int ID
var $active; // duplicate with status */
======= public $fk_user_author;
/** /**
* @var string Label of account * @var int ID
*/ */
public $label; public $fk_user_modif;
/** var $active; // duplicate with status
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_modif;
var $active; // duplicate with status
>>>>>>> upstream/develop
var $status; var $status;