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 develop

Browse Source
This commit is contained in:
Philippe GRAND 2018-08-31 17:10:10 +02:00
commit cd6ea37ea0
2 changed files with 64 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,19 +30,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
*/ */
class AccountancyCategory // extends CommonObject class AccountancyCategory // extends CommonObject
{ {
<<<<<<< HEAD /**
/**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
=======
/**
* @var DoliDB Database handler.
*/
public $db;
>>>>>>> upstream/develop
/** /**
* @var string Error string * @var string Error string
* @see errors * @see errors
@ -64,24 +56,69 @@ class AccountancyCategory // extends CommonObject
*/ */
public $table_element='c_accounting_category'; public $table_element='c_accounting_category';
public $id; /**
public $code; * @var int ID
*/
public $id;
/** /**
* @var string proper name for given parameter * @var mixed Sample property 1
*/ */
public $code;
/**
* @var string proper name for given parameter
*/
public $label; public $label;
/**
* @var mixed Sample property 1
*/
public $range_account; public $range_account;
/**
* @var mixed Sample property 1
*/
public $sens; public $sens;
/**
* @var mixed Sample property 1
*/
public $category_type; public $category_type;
/**
* @var mixed Sample property 1
*/
public $formula; public $formula;
/**
* @var mixed Sample property 1
*/
public $position; public $position;
/**
* @var mixed Sample property 1
*/
public $fk_country; public $fk_country;
/**
* @var mixed Sample property 1
*/
public $active; public $active;
/**
* @var mixed Sample property 1
*/
public $lines_cptbk; public $lines_cptbk;
/**
* @var mixed Sample property 1
*/
public $lines_display; public $lines_display;
/**
* @var mixed Sample property 1
*/
public $sdc; public $sdc;

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;