From 6542dcf0bd662ecad90f163af5f680ac6debd981 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 22 Aug 2018 12:04:50 +0200 Subject: [PATCH] Update and standardize code --- htdocs/accountancy/class/accountancycategory.class.php | 6 +++++- htdocs/accountancy/class/accountingaccount.class.php | 5 +++++ htdocs/accountancy/class/accountingjournal.class.php | 5 +++++ htdocs/comm/mailing/class/advtargetemailing.class.php | 5 ++++- htdocs/compta/bank/class/account.class.php | 6 +++++- htdocs/expensereport/class/expensereport.class.php | 6 +++++- htdocs/product/class/productcustomerprice.class.php | 6 +++++- htdocs/product/class/propalmergepdfproduct.class.php | 5 ++++- 8 files changed, 38 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 7420ae8a982..127e220d3d1 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -34,7 +34,11 @@ class AccountancyCategory // extends CommonObject public $error; //!< To return error code (or message) public $errors=array(); //!< To return several error codes (or messages) public $element='c_accounting_category'; //!< Id that identify managed objects - public $table_element='c_accounting_category'; //!< Name of table without prefix where object is stored + + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element='c_accounting_category'; public $id; public $code; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 7837533bfa6..fb2d1d477ed 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -31,7 +31,12 @@ class AccountingAccount extends CommonObject { public $element='accounting_account'; + + /** + * @var string Name of table without prefix where object is stored + */ public $table_element='accounting_account'; + public $picto = 'billr'; /** diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index 2291028ddf3..4edc4e3f99a 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -27,7 +27,12 @@ class AccountingJournal extends CommonObject { public $element='accounting_journal'; + + /** + * @var string Name of table without prefix where object is stored + */ public $table_element='accounting_journal'; + public $fk_element = ''; public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $picto = 'generic'; diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index b36e0463b9e..396c020b7b6 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -48,7 +48,10 @@ class AdvanceTargetingMailing extends CommonObject */ public $element='advtargetemailing'; - var $table_element='advtargetemailing'; //!< Name of table without prefix where object is stored + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element='advtargetemailing'; /** * @var int ID diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index a62592aaf2e..26e9527c7f3 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1648,7 +1648,11 @@ class AccountLine extends CommonObject */ public $element='bank'; - var $table_element='bank'; + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element='bank'; + var $picto = 'generic'; /** diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 5e9d11c9c86..b223174a6f8 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -38,7 +38,11 @@ class ExpenseReport extends CommonObject */ public $element='expensereport'; - var $table_element='expensereport'; + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element='expensereport'; + var $table_element_line = 'expensereport_det'; var $fk_element = 'fk_expensereport'; var $picto = 'trip'; diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index 3c281ee88b7..c0f645b66b2 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -33,7 +33,11 @@ class Productcustomerprice extends CommonObject */ public $element = 'product_customer_price'; - var $table_element = 'product_customer_price'; // !< Name of table without prefix where object is stored + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element = 'product_customer_price'; + var $entity; var $datec = ''; var $tms = ''; diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 2894cfff60b..771a60be60e 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -36,7 +36,10 @@ class Propalmergepdfproduct extends CommonObject */ public $element='propal_merge_pdf_product'; - var $table_element='propal_merge_pdf_product'; //!< Name of table without prefix where object is stored + /** + * @var string Name of table without prefix where object is stored + */ + public $table_element='propal_merge_pdf_product'; var $fk_product; var $file_name;