From 451ee7960b2fe9ea996bb3bd8b0b33ed1605493a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 7 Sep 2010 12:44:15 +0000 Subject: [PATCH] Works on canvas integration in third party module --- htdocs/core/class/html.form.class.php | 13 +++++++------ htdocs/societe/canvas/actions_card_common.class.php | 8 ++++---- .../canvas/default/actions_card_default.class.php | 6 +++--- .../canvas/default/dao_thirdparty_default.class.php | 2 +- .../individual/actions_card_individual.class.php | 4 ++-- .../individual/dao_thirdparty_individual.class.php | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 1b8f7cc43ed..dd908c0ff85 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -428,12 +428,13 @@ class Form } /** - * \brief Return list of types of lines (product or service) - * \param selected Preselected type - * \param htmlname Name of field in html form - * \param showempty Add an empty field - * \param hidetext Do not show label before combo box - * \param forceall Force to show products and services in combo list, whatever are activated modules + * Return list of types of lines (product or service) + * @param selected Preselected type + * @param htmlname Name of field in html form + * @param showempty Add an empty field + * @param hidetext Do not show label before combo box + * @param forceall Force to show products and services in combo list, whatever are activated modules + * @example 0=product, 1=service, 9=other (for external module) */ function select_type_of_lines($selected='',$htmlname='type',$showempty=0,$hidetext=0,$forceall=0) { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 3469a5dcca3..673cc75728f 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -17,17 +17,17 @@ */ /** - * \file htdocs/societe/canvas/card.common.class.php + * \file htdocs/societe/canvas/actions_card_common.class.php * \ingroup thirparty * \brief Fichier de la classe Thirdparty card controller (common) * \version $Id$ */ /** - * \class CardCommon + * \class ActionsCardCommon * \brief Classe permettant la gestion des tiers par defaut */ -class CardCommon +class ActionsCardCommon { var $db; @@ -44,7 +44,7 @@ class CardCommon * Constructeur de la classe * @param DB Handler acces base de donnees */ - function CardCommon($DB) + function ActionsCardCommon($DB) { $this->db = $DB; } diff --git a/htdocs/societe/canvas/default/actions_card_default.class.php b/htdocs/societe/canvas/default/actions_card_default.class.php index 88a96b0fd60..d2f5c290673 100644 --- a/htdocs/societe/canvas/default/actions_card_default.class.php +++ b/htdocs/societe/canvas/default/actions_card_default.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/societe/canvas/default/card.default.class.php + * \file htdocs/societe/canvas/default/actions_card_default.class.php * \ingroup thirparty * \brief Fichier de la classe Thirdparty card controller (default canvas) * \version $Id$ @@ -25,10 +25,10 @@ include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'); /** - * \class ThirdPartyCardDefault + * \class ActionsCardDefault * \brief Classe permettant la gestion des tiers par defaut */ -class ActionsCardDefault extends CardCommon +class ActionsCardDefault extends ActionsCardCommon { var $db; diff --git a/htdocs/societe/canvas/default/dao_thirdparty_default.class.php b/htdocs/societe/canvas/default/dao_thirdparty_default.class.php index a86b6e0d764..7a4a90216c3 100644 --- a/htdocs/societe/canvas/default/dao_thirdparty_default.class.php +++ b/htdocs/societe/canvas/default/dao_thirdparty_default.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/societe/canvas/default/thirdparty.default.class.php + * \file htdocs/societe/canvas/default/dao_thirdparty_default.class.php * \ingroup thirparty * \brief Fichier de la classe des tiers par defaut * \version $Id$ diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index d4fe02bdcf8..934c06ae4fc 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/societe/canvas/individual/card.individual.class.php + * \file htdocs/societe/canvas/individual/actions_card_individual.class.php * \ingroup thirparty * \brief Fichier de la classe Thirdparty card controller (individual canvas) * \version $Id$ @@ -28,7 +28,7 @@ include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'); * \class ActionsCardIndividual * \brief Classe permettant la gestion des particuliers */ -class ActionsCardIndividual extends CardCommon +class ActionsCardIndividual extends ActionsCardCommon { var $db; diff --git a/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php b/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php index 1cc567276dd..0082bc85ab2 100644 --- a/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php +++ b/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/societe/canvas/default/thirdparty.individual.class.php + * \file htdocs/societe/canvas/default/dao_thirdparty_individual.class.php * \ingroup thirparty * \brief Fichier de la classe des particuliers * \version $Id$