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

Update accountingaccount.class.php

Browse Source
This commit is contained in:
Philippe Grand 2018-08-30 14:25:25 +02:00 committed by GitHub
parent e96e3bdf42
commit 5ec22d9fad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;