From c77bc5adf58608e53d87f5da694d75869f26f33a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 31 Mar 2012 15:42:33 +0200 Subject: [PATCH] Doxygen --- htdocs/categories/categorie.php | 1 + htdocs/comm/mailing/class/mailing.class.php | 14 +++++++------- htdocs/commande/fiche.php | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index e6d334965c4..67cbc2cd908 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -424,6 +424,7 @@ else if ($id || $ref) * @param DoliDb $db Database handler * @param Object $object Object we want to see categories it can be classified into * @param int $typeid Type of category (0, 1, 2, 3) + * @param int $socid Id thirdparty * @return int 0 */ function formCategory($db,$object,$typeid,$socid=0) diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 397c5df77e5..44aaea758a2 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Laurent Destailleur + * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -20,15 +20,14 @@ /** * \file htdocs/comm/mailing/class/mailing.class.php * \ingroup mailing - * \brief Fichier de la classe de gestion des mailings + * \brief File of class to manage emailings module */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); /** - * \class Mailing - * \brief Classe permettant la gestion des mailings + * Class to manage emailings module */ class Mailing extends CommonObject { @@ -233,6 +232,8 @@ class Mailing extends CommonObject * Load an object from its id and create a new one in database * * @param int $fromid Id of object to clone + * @param int $option1 1=Copy content, 0=Forget content + * @param int $option2 Not used * @return int New id of clone */ function createFromClone($fromid,$option1,$option2) @@ -251,14 +252,13 @@ class Mailing extends CommonObject $object->statut=0; // Clear fields - $object->titre=$langs->trans("CopyOf").' '.$object->titre; + $object->titre=$langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now()); // If no option copy content if (empty($option1)) { // Clear values $object->nbemail = 0; - $object->titre = $langs->trans("Draft").' '.mktime(); $object->sujet = ''; $object->body = ''; $object->bgcolor = ''; @@ -315,7 +315,7 @@ class Mailing extends CommonObject function valid($user) { $now=dol_now(); - + $sql = "UPDATE ".MAIN_DB_PREFIX."mailing "; $sql .= " SET statut = 1, date_valid = ".$this->db->idate($now).", fk_user_valid=".$user->id; $sql .= " WHERE rowid = ".$this->id; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 600f3056218..8f91ac56fdb 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1,13 +1,13 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010-2011 Juanjo Menent * Copyright (C) 2011 Philippe Grand * Copyright (C) 2012 Christophe Battarel -** + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -747,7 +747,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['s $vat_rate, $localtax1_rate, $localtax2_rate, - 'HT', + 'HT', $info_bits, $date_start, $date_end,