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

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

@ -79,17 +79,6 @@ 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
*/
public $label;
var $fk_user_author;
var $fk_user_modif;
var $active; // duplicate with status
=======
/** /**
* @var string Label of account * @var string Label of account
@ -107,7 +96,7 @@ class AccountingAccount extends CommonObject
public $fk_user_modif; public $fk_user_modif;
var $active; // duplicate with status var $active; // duplicate with status
>>>>>>> upstream/develop
var $status; var $status;