From 1182f2986487e162887c73a7d7d2eb7ba9777b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 28 Aug 2018 08:33:02 +0200 Subject: [PATCH 1/2] trimtrailing --- .../class/accountancycategory.class.php | 14 ++++---- .../class/accountingaccount.class.php | 18 +++++------ .../actions_adherentcard_common.class.php | 6 ++-- htdocs/adherents/class/adherent.class.php | 10 +++--- .../mailing/class/advtargetemailing.class.php | 18 +++++------ .../compta/localtax/class/localtax.class.php | 10 +++--- .../salaries/class/paymentsalary.class.php | 6 ++-- .../class/paymentsocialcontribution.class.php | 8 ++--- htdocs/core/class/comment.class.php | 21 ++++++++++-- htdocs/core/class/events.class.php | 10 +++--- htdocs/core/class/menubase.class.php | 13 ++++---- htdocs/cron/class/cronjob.class.php | 6 ++-- htdocs/don/class/paymentdonation.class.php | 8 ++--- .../class/expeditionbatch.class.php | 14 ++++---- .../class/paymentexpensereport.class.php | 6 ++-- .../fournisseur.commande.dispatch.class.php | 12 +++---- htdocs/loan/class/loanschedule.class.php | 9 +++--- htdocs/loan/class/paymentloan.class.php | 4 +-- .../class/opensurveysondage.class.php | 6 ++-- htdocs/product/class/productbatch.class.php | 4 +-- .../class/productcustomerprice.class.php | 10 +++--- .../class/propalmergepdfproduct.class.php | 6 ++-- htdocs/projet/class/project.class.php | 14 ++++---- htdocs/projet/class/task.class.php | 14 ++++---- htdocs/resource/class/dolresource.class.php | 8 ++--- htdocs/ticket/class/ticketlogs.class.php | 32 +++++++++---------- 26 files changed, 150 insertions(+), 137 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 7f0b2be0071..d0191d92c09 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -30,31 +30,31 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; */ class AccountancyCategory // extends CommonObject { - /** + /** * @var DoliDB Database handler. */ public $db; - + /** * @var string Error string * @see errors */ public $error; - + /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var string ID to identify managed object */ - public $element='c_accounting_category'; - + public $element='c_accounting_category'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='c_accounting_category'; + 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 6a72b881aab..65861951a55 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -31,12 +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'; /** @@ -44,7 +44,7 @@ class AccountingAccount extends CommonObject * @var int */ public $ismultientitymanaged = 1; - + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer @@ -55,22 +55,22 @@ class AccountingAccount extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ - public $error=''; + public $error=''; /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var int ID */ public $id; - + var $rowid; var $datec; // Creation date var $fk_pcg_version; @@ -79,12 +79,12 @@ class AccountingAccount extends CommonObject var $account_number; var $account_parent; var $account_category; - + /** * @var string proper name for given parameter */ public $label; - + var $fk_user_author; var $fk_user_modif; var $active; // duplicate with status diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index 0e9bdd326da..a141a1e568a 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -31,7 +31,7 @@ abstract class ActionsAdherentCardCommon * @var DoliDB Database handler. */ public $db; - + var $dirmodule; var $targetmodule; var $canvas; @@ -41,11 +41,11 @@ abstract class ActionsAdherentCardCommon var $tpl = array(); //! Object container var $object; - + /** * @var string Error code (or message) */ - public $error=''; + public $error=''; /** * @var string[] Error codes (or messages) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index a2e6c708186..bf4fe0d73c2 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -45,12 +45,12 @@ class Adherent extends CommonObject * @var string ID to identify managed object */ public $element='member'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='adherent'; - + public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $mesgs; @@ -542,10 +542,10 @@ class Adherent extends CommonObject $luser->birth=$this->birth; $luser->address=$this->address; $luser->zip=$this->zip; - $luser->town=$this->town; - $luser->country_id=$this->country_id; + $luser->town=$this->town; + $luser->country_id=$this->country_id; $luser->state_id=$this->state_id; - + $luser->email=$this->email; $luser->skype=$this->skype; $luser->office_phone=$this->phone; diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 1f4968ef6b2..2d7a7ca4000 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -28,30 +28,30 @@ */ class AdvanceTargetingMailing extends CommonObject { - /** - * @var DoliDB Database handler. - */ - public $db; - + /** + * @var DoliDB Database handler. + */ + public $db; + /** * @var string Error code (or message) */ - public $error=''; + public $error=''; /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var string ID to identify managed object */ public $element='advtargetemailing'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='advtargetemailing'; + public $table_element='advtargetemailing'; /** * @var int ID diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index 7e9691f9b3a..b83379f028c 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -32,13 +32,13 @@ class Localtax extends CommonObject /** * @var string ID to identify managed object */ - public $element='localtax'; - + public $element='localtax'; + /** * @var string Name of table without prefix where object is stored */ public $table_element='localtax'; - + public $picto='payment'; var $ltt; @@ -46,12 +46,12 @@ class Localtax extends CommonObject var $datep; var $datev; var $amount; - + /** * @var string proper name for given parameter */ public $label; - + var $fk_bank; var $fk_user_creat; var $fk_user_modif; diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index babd5323fce..613a51f45b0 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -35,12 +35,12 @@ class PaymentSalary extends CommonObject * @var string ID to identify managed object */ public $element='payment_salary'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='payment_salary'; - + public $table_element='payment_salary'; + public $picto='payment'; public $tms; diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 560e47abe7c..b61132ee145 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -35,12 +35,12 @@ class PaymentSocialContribution extends CommonObject * @var string ID to identify managed object */ public $element='paiementcharge'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='paiementcharge'; - + public $table_element='paiementcharge'; + public $picto = 'payment'; var $fk_charge; @@ -716,5 +716,3 @@ class PaymentSocialContribution extends CommonObject return $result; } } - - diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php index 027d3193031..9cc4b8be192 100644 --- a/htdocs/core/class/comment.class.php +++ b/htdocs/core/class/comment.class.php @@ -1,4 +1,21 @@ . + * or see http://www.gnu.org/ + */ + /** * Class to manage comment */ @@ -8,11 +25,11 @@ class Comment extends CommonObject * @var string ID to identify managed object */ public $element='comment'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='comment'; + public $table_element='comment'; public $fk_element; public $element_type; diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index bbdf7e9c3ab..6a2374a7d3b 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -30,7 +30,7 @@ /** - * Events class + * Events class */ class Events // extends CommonObject { @@ -38,18 +38,18 @@ class Events // extends CommonObject * @var string ID to identify managed object */ public $element='events'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='events'; + public $table_element='events'; /** * @var int ID */ public $id; - - /** + + /** * @var DoliDB Database handler. */ public $db; diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 715f17b5a92..bdd85524ef3 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -31,13 +31,13 @@ class Menubase /** * @var DoliDB Database handler. */ - public $db; - + public $db; + /** - * @var string Error code (or message) - */ - public $error; - + * @var string Error code (or message) + */ + public $error; + /** * @var string[] Error codes (or messages) */ @@ -696,4 +696,3 @@ class Menubase } } - diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index b898b4eb238..53acd0976b4 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -34,12 +34,12 @@ class Cronjob extends CommonObject * @var string ID to identify managed object */ public $element='cronjob'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='cronjob'; - + public $table_element='cronjob'; + public $picto = 'cron'; public $entity; diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index f866f20a02f..a4d89c36457 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -32,13 +32,13 @@ class PaymentDonation extends CommonObject /** * @var string ID to identify managed object */ - public $element='payment_donation'; - + public $element='payment_donation'; + /** * @var string Name of table without prefix where object is stored */ public $table_element='payment_donation'; - + public $picto = 'payment'; public $rowid; @@ -76,7 +76,7 @@ class PaymentDonation extends CommonObject * Use this->amounts to have list of lines for the payment * * @param User $user User making payment - * @param bool $notrigger false=launch triggers after, true=disable triggers + * @param bool $notrigger false=launch triggers after, true=disable triggers * @return int <0 if KO, id of payment if OK */ function create($user, $notrigger=false) diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index 540b584590b..18a5fdbec6b 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -31,8 +31,8 @@ class ExpeditionLineBatch extends CommonObject /** * @var string ID to identify managed object */ - public $element='expeditionlignebatch'; - + public $element='expeditionlignebatch'; + private static $_table_element='expeditiondet_batch'; //!< Name of table without prefix where object is stored var $sellby; @@ -63,15 +63,15 @@ class ExpeditionLineBatch extends CommonObject function fetchFromStock($id_stockdluo) { $sql = "SELECT"; - $sql.= " pb.batch,"; - $sql.= " pl.sellby,"; - $sql.= " pl.eatby,"; - $sql.= " ps.fk_entrepot"; + $sql.= " pb.batch,"; + $sql.= " pl.sellby,"; + $sql.= " pl.eatby,"; + $sql.= " ps.fk_entrepot"; $sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb"; $sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid"; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product"; - $sql.= " WHERE pb.rowid = ".(int) $id_stockdluo; + $sql.= " WHERE pb.rowid = ".(int) $id_stockdluo; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index a827b095bff..417ba0fdb4a 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -34,12 +34,12 @@ class PaymentExpenseReport extends CommonObject * @var string ID to identify managed object */ public $element='payment_expensereport'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='payment_expensereport'; - + public $table_element='payment_expensereport'; + public $picto = 'payment'; var $rowid; diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index 818a09c2bfb..f5933b453ed 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -34,26 +34,26 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; */ class CommandeFournisseurDispatch extends CommonObject { - /** + /** * @var DoliDB Database handler. */ - public $db; - + public $db; + /** * @var string Error code (or message) */ public $error; - + /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var string ID to identify managed object */ public $element='commandefournisseurdispatch'; - + /** * @var string Name of table without prefix where object is stored */ diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php index 5a33d9995bc..326f5df2e9b 100644 --- a/htdocs/loan/class/loanschedule.class.php +++ b/htdocs/loan/class/loanschedule.class.php @@ -17,8 +17,8 @@ /** * \file htdocs/loan/class/loanschedule.class.php - * \ingroup facture - * \brief File of class to manage schedule of loans + * \ingroup loan + * \brief File of class to manage schedule of loans */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; @@ -33,11 +33,11 @@ class LoanSchedule extends CommonObject * @var string ID to identify managed object */ public $element='loan_schedule'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='loan_schedule'; + public $table_element='loan_schedule'; var $fk_loan; var $datec=''; @@ -547,4 +547,3 @@ class LoanSchedule extends CommonObject return $result; } } - diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index 1f20590f6e1..733d1420838 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -34,11 +34,11 @@ class PaymentLoan extends CommonObject * @var string ID to identify managed object */ public $element='payment_loan'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='payment_loan'; + public $table_element='payment_loan'; var $fk_loan; var $datec=''; diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index c2036525b62..5d3129f1585 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -38,12 +38,12 @@ class Opensurveysondage extends CommonObject * @var string ID to identify managed object */ public $element='opensurvey_sondage'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='opensurvey_sondage'; - + public $table_element='opensurvey_sondage'; + public $picto = 'opensurvey'; public $id_sondage; diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index 4533013d6b6..0c0ed55855f 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -33,8 +33,8 @@ class Productbatch extends CommonObject /** * @var string ID to identify managed object */ - public $element='productbatch'; - + public $element='productbatch'; + private static $_table_element='product_batch'; //!< Name of table without prefix where object is stored var $tms=''; diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index c0f645b66b2..4155045ec29 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -31,13 +31,13 @@ class Productcustomerprice extends CommonObject /** * @var string ID to identify managed object */ - public $element = 'product_customer_price'; - + public $element = 'product_customer_price'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element = 'product_customer_price'; - + public $table_element = 'product_customer_price'; + var $entity; var $datec = ''; var $tms = ''; @@ -962,7 +962,7 @@ class PriceByCustomerLine * @var int ID */ public $id; - + var $entity; var $datec = ''; var $tms = ''; diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 771a60be60e..23282586d22 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -34,12 +34,12 @@ class Propalmergepdfproduct extends CommonObject /** * @var string ID to identify managed object */ - public $element='propal_merge_pdf_product'; - + public $element='propal_merge_pdf_product'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='propal_merge_pdf_product'; + public $table_element='propal_merge_pdf_product'; var $fk_product; var $file_name; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 1b18c0545e9..91cc8dbbcad 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -36,13 +36,13 @@ class Project extends CommonObject /** * @var string ID to identify managed object */ - public $element = 'project'; - + public $element = 'project'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element = 'projet'; - + public $table_element = 'projet'; + public $table_element_line = 'projet_task'; public $fk_element = 'fk_projet'; public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe @@ -732,10 +732,10 @@ class Project extends CommonObject return -1; } } - + /** * Delete tasks with no children first, then task with children recursively - * + * * @param User $user User * @return int <0 if KO, 1 if OK */ @@ -763,7 +763,7 @@ class Project extends CommonObject { if (count($this->lines)) $this->deleteTasks($this->lines); } - + return 1; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 1a8de04158e..7c1ee1147f5 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -34,24 +34,24 @@ class Task extends CommonObject /** * @var string ID to identify managed object */ - public $element='project_task'; - + public $element='project_task'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='projet_task'; - + public $table_element='projet_task'; + public $fk_element='fk_task'; public $picto = 'task'; protected $childtables=array('projet_task_time'); // To test if we can delete object var $fk_task_parent; - - /** + + /** * @var string proper name for given parameter */ public $label; - + var $description; var $duration_effective; // total of time spent on this task var $planned_workload; diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 604e4f8849d..3d1c5f014cf 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -33,13 +33,13 @@ class Dolresource extends CommonObject /** * @var string ID to identify managed object */ - public $element='dolresource'; - + public $element='dolresource'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='resource'; - + public $table_element='resource'; + public $picto = 'resource'; public $resource_id; diff --git a/htdocs/ticket/class/ticketlogs.class.php b/htdocs/ticket/class/ticketlogs.class.php index cf5f8dc122b..e006759ed51 100644 --- a/htdocs/ticket/class/ticketlogs.class.php +++ b/htdocs/ticket/class/ticketlogs.class.php @@ -36,26 +36,26 @@ class Ticketlogs// extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** - * @var string Error code (or message) - */ - public $error; - + * @var string Error code (or message) + */ + public $error; + /** - * @var string[] Error codes (or messages) - */ - public $errors = array(); - + * @var string[] Error codes (or messages) + */ + public $errors = array(); + /** - * @var string ID to identify managed object - */ - public $element = 'ticketlogs'; - + * @var string ID to identify managed object + */ + public $element = 'ticketlogs'; + /** - * @var string Name of table without prefix where object is stored - */ - public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored + * @var string Name of table without prefix where object is stored + */ + public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored public $id; From 846778657f27ad326c9bd7b99aa41c728162f648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 28 Aug 2018 08:43:35 +0200 Subject: [PATCH 2/2] fix syntax error --- .../class/accountingaccount.class.php | 24 ++++++++++++------- htdocs/comm/mailing/cibles.php | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 65861951a55..980218ddab6 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -80,14 +80,22 @@ class AccountingAccount extends CommonObject var $account_parent; var $account_category; - /** - * @var string proper name for given parameter - */ - public $label; + /** + * @var string proper name for given parameter + */ + public $label; - var $fk_user_author; - var $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 var $status; @@ -422,7 +430,7 @@ class AccountingAccount extends CommonObject * @param string $moretitle Add more text to title tooltip * @param int $notooltip 1=Disable tooltip * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking - * @return string String with URL + * @return string String with URL */ function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0, $save_lastsearch_value=-1) { diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 13d72acb3d7..7b01c1c5a22 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -326,6 +326,8 @@ if ($object->fetch($id) >= 0) } // Si le module mailing est qualifie + if ($qualified) + { if ($allowaddtarget) { print '
';