From ae351a565979a1a5b4b39e00dd7b881a77fdb4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 13:13:55 +0100 Subject: [PATCH 1/6] doxygen --- htdocs/societe/class/societe.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 7946a032423..f98e49b05e6 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -501,7 +501,9 @@ class Societe extends CommonObject */ public $user_creation; - + /** + * @var int 1 if object is specimen + */ public $specimen; /** From c4a7e58435dfcc8ce2798392732e95630ff6909d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 13:22:04 +0100 Subject: [PATCH 2/6] Update societe.class.php --- htdocs/societe/class/societe.class.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index f98e49b05e6..e1cfd822b79 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -501,11 +501,6 @@ class Societe extends CommonObject */ public $user_creation; - /** - * @var int 1 if object is specimen - */ - public $specimen; - /** * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect * @var int From 85b3b5de36a9b37d84f84a7e197c8f1d35e9dfaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 13:24:09 +0100 Subject: [PATCH 3/6] Update commonobject.class.php --- htdocs/core/class/commonobject.class.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index ef062b8acaf..c92eadd206c 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. */ From 7b6bc3de630c454f56964a8271ba4e88697b7f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 13:25:19 +0100 Subject: [PATCH 4/6] Update propal.class.php --- htdocs/comm/propal/class/propal.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 From 8daf0c168cd17975681fc9fe2b8afdcc15967697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 13:27:29 +0100 Subject: [PATCH 5/6] Update facture.class.php --- htdocs/compta/facture/class/facture.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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; From d122238439562fe3a8a2a12afb80e27fa7ab949c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 31 Oct 2020 13:29:08 +0100 Subject: [PATCH 6/6] Update supplier_proposal.class.php --- htdocs/supplier_proposal/class/supplier_proposal.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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