diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 2e02323c090..e5176cebdde 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -13,7 +13,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Marcos García * Copyright (C) 2018 Nicolas ZABOURI - * Copyright (C) 2018-2019 Frédéric France + * Copyright (C) 2018-2020 Frédéric France * Copyright (C) 2018 Ferran Marcet * * This program is free software; you can redistribute it and/or modify @@ -214,8 +214,6 @@ class Propal extends CommonObject public $labelStatus = array(); public $labelStatusShort = array(); - public $specimen; - // Multicurrency /** * @var int ID diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 16309d31658..6abbab2acff 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -95,6 +95,9 @@ class Facture extends CommonInvoice */ protected $table_ref_field = 'ref'; + /** + * @var int thirdparty ID + */ public $socid; public $author; @@ -111,6 +114,10 @@ class Facture extends CommonInvoice public $date; // Date invoice public $datem; + + /** + * @var string customer ref + */ public $ref_client; /** @@ -169,7 +176,6 @@ class Facture extends CommonInvoice public $line; public $extraparams = array(); - public $specimen; public $fac_rec; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9de8f5470de..a5b6e0b84de 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -12,7 +12,7 @@ * Copyright (C) 2017 ATM Consulting * Copyright (C) 2017-2019 Nicolas ZABOURI * Copyright (C) 2017 Rui Strecht - * Copyright (C) 2018-2019 Frédéric France + * Copyright (C) 2018-2020 Frédéric France * Copyright (C) 2018 Josep Lluís Amador * * This program is free software; you can redistribute it and/or modify @@ -334,6 +334,12 @@ abstract class CommonObject */ public $last_main_doc; + /** + * @var int Bank account ID + * @see $fk_account + */ + public $fk_bank; + /** * @var int Bank account ID * @see SetBankAccount() @@ -437,6 +443,11 @@ abstract class CommonObject public $next_prev_filter; + /** + * @var int 1 if object is specimen + */ + public $specimen = 0; + /** * @var array List of child tables. To test if we can delete object. */ diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 7946a032423..e1cfd822b79 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -501,9 +501,6 @@ class Societe extends CommonObject */ public $user_creation; - - public $specimen; - /** * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect * @var int diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index bb8387c55e3..56d872126df 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -13,7 +13,7 @@ * Copyright (C) 2014 Marcos García * Copyright (C) 2016 Ferran Marcet * Copyright (C) 2018 Nicolas ZABOURI - * Copyright (C) 2019 Frédéric France + * Copyright (C) 2019-2020 Frédéric France * Copyright (C) 2020 Tobias Sekan * * This program is free software; you can redistribute it and/or modify @@ -177,8 +177,6 @@ class SupplierProposal extends CommonObject public $nbtodo; public $nbtodolate; - public $specimen; - // Multicurrency /** * @var int ID