diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 2d577270677b63a24d775e7ec6c9984f6d0a0bb1..99aa24abcd03071b6d6e30e0899b99784d645629 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -17,14 +17,13 @@
*/
/**
- * \file htdocs/contact/canvas/actions_adherentcard_common.class.php
- * \ingroup thirdparty
+ * \file htdocs/adherents/canvas/actions_adherentcard_common.class.php
+ * \ingroup adherent
* \brief Fichier de la classe Adherent card controller (common)
*/
/**
- * \class ActionsAdherentCardCommon
- * \brief Classe permettant la gestion des adherents par defaut
+ * Class to maage members using default canvas
*/
abstract class ActionsAdherentCardCommon
{
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 5c4fe1ad0354ddcac66fd5e7f1ca831c706f5a5e..4d199c3d6422c4ab3b2a6e35143f05097f79c2ec 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -16,16 +16,16 @@
*/
/**
- * \file htdocs/core/boxes/box_intervention.php
+ * \file htdocs/core/boxes/box_ficheinter.php
* \ingroup ficheinter
- * \brief Module de generation de l'affichage de la box ficheinter
+ * \brief Box to show last interventions
*/
include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
/**
- * Class to manage the box to show last contracts
+ * Class to manage the box to show last interventions
*/
class box_ficheinter extends ModeleBoxes
{
diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php
index f538b1359eb9ae007e5b0953d02f8438d07734ca..926f5c42b4264696e9d495ad704867191ea41ae8 100644
--- a/htdocs/core/class/dolprintipp.class.php
+++ b/htdocs/core/class/dolprintipp.class.php
@@ -28,7 +28,7 @@ class dolprintIPP
{
var $host;
var $port;
- var $userid;
+ var $userid; /* user login */
var $user;
var $password;
var $error;
@@ -72,7 +72,7 @@ class dolprintIPP
$ipp->setHost($this->host);
$ipp->setPort($this->port);
$ipp->setUserName($this->userid);
- //$ipp->setAuthentication($this->user,$this->password);
+ if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
$ipp->getPrinters();
return $ipp->available_printers;
}
@@ -95,7 +95,7 @@ class dolprintIPP
$ipp->setPort($this->port);
$ipp->setJobName($file,true);
$ipp->setUserName($this->userid);
- //$ipp->setAuthentication($this->user,$this->password);
+ if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
// select printer uri for module order, propal,...
$sql = 'SELECT rowid,printer_uri,copy FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
$result = $this->db->query($sql);
@@ -133,6 +133,7 @@ class dolprintIPP
$ipp->setHost($this->host);
$ipp->setPort($this->port);
$ipp->setUserName($this->userid);
+ if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
// select printer uri for module order, propal,...
$sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
$result = $this->db->query($sql);
@@ -194,6 +195,7 @@ class dolprintIPP
$ipp->setHost($this->host);
$ipp->setPort($this->port);
$ipp->setUserName($this->userid);
+ if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
$ipp->setPrinterURI($uri);
$ipp->getPrinterAttributes();
return $ipp->printer_attributes;
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index b6747e04a5636e3e9d8f96f2f2ac2f82d8eb9a46..bce8d9f041e7e1c9f06203cafaf2417fd83eba18 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -1,30 +1,30 @@
<?php
/*
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
-*
-* 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
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
/**
- * \file cron/class/html.formcron.class.php
-* \brief Fichier de la classe des fonctions predefinie de composants html cron
-*/
+ * \file core/class/html.formcron.class.php
+ * \brief Fichier de la classe des fonctions predefinie de composants html cron
+ */
/**
* Class to manage building of HTML components
-*/
+ */
class FormCron extends Form
{
var $db;
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 4a81457afe16476b7388c7ff6d1ff9b0faa05b83..630a2e2322cb8eb4ef9e824a584bbfd9280965c4 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -17,7 +17,7 @@
*/
/**
- * \file cron/lib/cron.lib.php
+ * \file core/lib/cron.lib.php
* \brief Function for module cron
* \ingroup cron
*/
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b7769c40a96a1569d1cfa314507bbe59ad7f4e6f..dc137a06514663ff3c222983ec83b397065d9bb6 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -140,8 +140,8 @@ function getParentCompanyTimeZoneString()
* Return parent company timezone int.
* If $conf->global->MAIN_NEW_DATE is set, we use new behaviour: All convertions take care of dayling saving time.
*
- * @param string $refdate Reference date for timezone (timezone differs on winter and summer)
- * @return int An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
+ * @param string $refgmtdate Reference date for timezone (timezone differs on winter and summer)
+ * @return int An offset in hour (+1 for Europe/Paris on winter and +2 for Europe/Paris on summer)
*
function getParentCompanyTimeZoneInt($refgmtdate='now')
{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ac634ca146d5ed246746b7da54a3ef7eda39a235..515b3b1cb08c3871af0bc9792687e27d3db027d9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3684,8 +3684,8 @@ function make_substitutions($chaine,$substitutionarray)
* @param array &$substitutionarray Array substitution old value => new value value
* @param Translate $outputlangs If we want substitution from special constants, we provide a language
* @param Object $object If we want substitution from special constants, we provide data in a source object
- * @param Object/array $parameters Add more parameters (useful to pass product lines)
- * @param string $callfunc What is the name of the custom function that will be called? (default: completesubstitutionarray)
+ * @param Mixed $parameters Add more parameters (useful to pass product lines)
+ * @param string $callfunc What is the name of the custom function that will be called? (default: completesubstitutionarray)
* @return void
* @see make_substitutions
*/
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index cf86ad1fc25ff60b45142f0d2c471da218d58bb9..ada9673fb803bd6a1f50c0344816bf2d66a712b4 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -283,14 +283,14 @@ function _unval($val)
}
/**
- * convert a string from one UTF-16 char to one UTF-8 char
+ * Convert a string from one UTF-16 char to one UTF-8 char
*
* Normally should be handled by mb_convert_encoding, but
* provides a slower PHP-only method for installations
* that lack the multibye string extension.
*
- * @param string $utf16 UTF-16 character
- * @return string UTF-8 character
+ * @param string $utf16 UTF-16 character
+ * @return string UTF-8 character
*/
function utf162utf8($utf16)
{
@@ -326,14 +326,14 @@ function utf162utf8($utf16)
}
/**
- * convert a string from one UTF-8 char to one UTF-16 char
+ * Convert a string from one UTF-8 char to one UTF-16 char
*
* Normally should be handled by mb_convert_encoding, but
* provides a slower PHP-only method for installations
* that lack the multibye string extension.
*
- * @param string $utf8 UTF-8 character
- * @return string UTF-16 character
+ * @param string $utf8 UTF-8 character
+ * @return string UTF-16 character
*/
function utf82utf16($utf8)
{
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 7e6697d3a7bb1ad38ae149718127001cd8f98a40..5e4bf469a61f6bfc16d685a521cdc0257777a371 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1,31 +1,31 @@
<?php
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
-* Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
-* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
-* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-* or see http://www.gnu.org/
-*/
+ * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
+ * Copyright (C) 2010-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
/**
* \file htdocs/core/lib/pdf.lib.php
-* \brief Set of functions used for PDF generation
-* \ingroup core
-*/
+ * \brief Set of functions used for PDF generation
+ * \ingroup core
+ */
/**
@@ -72,7 +72,7 @@ function pdf_getFormat($outputlangs='')
* @param string $format Array(width,height). Keep empty to use default setup.
* @param string $metric Unit of format ('mm')
* @param string $pagetype 'P' or 'l'
- * @return TPDF PDF object
+ * @return TPDF PDF object
*/
function pdf_getInstance($format='',$metric='mm',$pagetype='P')
{
@@ -182,18 +182,18 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
/**
* writeHTMLCell
*
- * @param unknown_type $w Width
- * @param unknown_type $h Height
- * @param unknown_type $x X
- * @param unknown_type $y Y
- * @param unknown_type $html Html
- * @param unknown_type $border Border
- * @param unknown_type $ln Ln
- * @param unknown_type $fill Fill
- * @param unknown_type $reseth Reseth
- * @param unknown_type $align Align
- * @param unknown_type $autopadding Autopadding
- * @return void
+ * @param int $w Width
+ * @param int $h Height
+ * @param int $x X
+ * @param int $y Y
+ * @param string $html Html
+ * @param int $border Border
+ * @param int $ln Ln
+ * @param boolean $fill Fill
+ * @param boolean $reseth Reseth
+ * @param string $align Align
+ * @param boolean $autopadding Autopadding
+ * @return void
*/
public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
{
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 33260e9c4968455488e5bfbbf36b3f9a417d7ad0..131ee875c44d8b0952052cc2d2988594409b664e 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -19,7 +19,7 @@
/**
* \defgroup cron Module cron
* \brief cron module descriptor.
- * \file cron/core/modules/modCron.class.php
+ * \file htdocs/core/modules/modCron.class.php
* \ingroup cron
* \brief Description and activation file for module Jobs
*/
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 36d02d3260bd3cfb3e5dc04db98e47323d88919b..984c9b51cf6b753f8c3f7e91d6720d2f14c3702c 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -23,7 +23,7 @@
/**
* \defgroup holiday Module holiday
* \brief Module de gestion des congés
- * \file htdocs/includes/modules/modHoliday.class.php
+ * \file htdocs/core/modules/modHoliday.class.php
* \ingroup holiday
* \brief Description and activation file for module holiday
*/
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index eea8a988efc4fb0276a4df9d1aed9f25f55e8ff3..f71fd6ed53f2a5df4d6cdcdc7c6621e57cc81b57 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -17,7 +17,7 @@
/** \defgroup margin Module margin
* \brief Module to manage margins
- * \file htdocs/includes/modules/modMargin.class.php
+ * \file htdocs/core/modules/modMargin.class.php
* \ingroup margin
* \brief Description and activation file for module Margin
*/
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index f016b5d6cf65c136d608ea702edbb78381d034ee..8cdcf83774bcd254d7934c8b5b91bef926441577 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -21,7 +21,7 @@
*/
/**
- * \file htdocs/opensurvey/core/modules/modOpenSurvey.class.php
+ * \file htdocs/core/modules/modOpenSurvey.class.php
* \ingroup opensurvey
* \brief Description and activation file for module OpenSurvey
*/
diff --git a/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
index bb81a07272aa74f60f7ecd82ac945f72171af433..bb1252d7dc90bfb0f50c5d6ca7db52499cf08530 100644
--- a/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+ * \file htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
* \ingroup project
* \brief File of class to build ODT documents for third parties
*/
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index 25cc347bcf94345ae78659679de92de4b2f5587d..9413ff26b9c7b9666c1135673b2c44693104eb42 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -99,7 +99,7 @@ class mod_task_simple extends ModeleNumRefTask
* Return next value
*
* @param Societe $objsoc Object third party
- * @param Task $Task Object Task
+ * @param Task $task Object Task
* @return string Value if OK, 0 if KO
*/
function getNextValue($objsoc,$task)
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index f05a324ae84d7a06510383bf293e442d6f586859..0084a951882ae5b57a42745bab0ccf1f9c935995 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -19,7 +19,7 @@
*/
/**
- * \file htdocs/core/modules/supplier_order/mod_facture_fournisseur_cactus.php
+ * \file htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
* \ingroup supplier invoice
* \brief File containing the Cactus Class of numbering models of suppliers invoices references
*/
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index bad9171d5d491ee3c1d2eb3003b85891671d37b0..f114f0c91cd24d9a291dd1560036369483565be1 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -18,7 +18,7 @@
*/
/**
- * \file cron/card.php
+ * \file htdocs/cron/card.php
* \ingroup cron
* \brief Cron Jobs Card
*/
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 606ded8c660f8a454ecd5ff06a802710e841425f..53489d69f5a1eb1dd16b49c2964cc422d246f283 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -16,8 +16,8 @@
*/
/**
- * \file /cron/cron/info.php
- * \brief Page fiche d'une operation
+ * \file htdocs/cron/info.php
+ * \brief Page of info of a cron job
*/
require '../main.inc.php';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index b77a3e6d5969de58f9b4d6dce64f64f6e649983f..d7f4f89462a9968757cfc3a4a6e24bdff755d321 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -18,7 +18,7 @@
*/
/**
- * \file cron/cron/list.php
+ * \file htdocs/cron/cron/list.php
* \ingroup cron
* \brief Lists Jobs
*/
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index cfdfb7fe26d19b131d63fb2e4810ba28a17aa3f0..2609c402ffed8d27954630e8060ea78faf76f705 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/ecm/ajax/ecmdatabases.php
+ * \file htdocs/ecm/ajax/ecmdatabase.php
* \brief File to build ecm database
*/
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index bdb195d67282282831f7c26347b3169a772dc1db..2683bea68b8e83fe9933d633c99dc70d67d7a904 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1,28 +1,28 @@
<?php
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
-* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
-* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
/**
* \file htdocs/fichinter/class/fichinter.class.php
-* \ingroup ficheinter
-* \brief Fichier de la classe des gestion des fiches interventions
-*/
+ * \ingroup ficheinter
+ * \brief Fichier de la classe des gestion des fiches interventions
+ */
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
@@ -62,7 +62,7 @@ class Fichinter extends CommonObject
* Constructor
*
* @param DoliDB $db Database handler
- */
+ */
function __construct($db)
{
$this->db = $db;
@@ -829,36 +829,37 @@ class Fichinter extends CommonObject
/**
- * Define the label of the contract
+ * Link intervention to a contract
*
* @param User $user Object user who modify
* @param int $contractid Description
* @return int <0 if ko, >0 if ok
*/
- function set_contrat($user, $contratid)
+ function set_contrat($user, $contractid)
{
global $conf;
if ($user->rights->ficheinter->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
- $sql.= " SET fk_contrat = '".$contratid."'";
+ $sql.= " SET fk_contrat = '".$contractid."'";
$sql.= " WHERE rowid = ".$this->id;
$sql.= " AND entity = ".$conf->entity;
- //$sql.= " AND fk_statut = 0";
+ dol_syslog("sql=".$sql);
if ($this->db->query($sql))
{
- $this->fk_contrat = $contratid;
+ $this->fk_contrat = $contractid;
return 1;
}
else
{
$this->error=$this->db->error();
- dol_syslog("Fichinter::set_contrat Erreur SQL");
+ dol_syslog($this->error, LOG_ERR);
return -1;
}
}
+ return -2;
}
/**
diff --git a/htdocs/opensurvey/adminstuds_preview.php b/htdocs/opensurvey/adminstuds_preview.php
index 3e7ba2fd7e30895309f5afa94e76fb507790aedf..62fbadda1acdd05b2d39b20f2a407e8855e96c6d 100644
--- a/htdocs/opensurvey/adminstuds_preview.php
+++ b/htdocs/opensurvey/adminstuds_preview.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/opensurvey/admin_studs_preview.php
+ * \file htdocs/opensurvey/adminstuds_preview.php
* \ingroup opensurvey
* \brief Page to preview votes of a survey
*/
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 72cb620c4622a7377aa02d1cc34245f413738b95..eeb1eb9068e21b7a5f005918adcb1e81c330ddb9 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -16,8 +16,8 @@
*/
/**
- * \file dev/skeletons/opensurveysondage.class.php
- * \ingroup mymodule othermodule1 othermodule2
+ * \file htdocs/opensurvey/class/opensurveysondage.class.php
+ * \ingroup opensurvey
* \brief This file is an example for a CRUD class file (Create/Read/Update/Delete)
* Initialy built by build_class_from_table on 2013-03-10 00:32
*/
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index f83cb0292072fccc911b84e0455914cd74c0b879..9dcc398fa3ada74d42b22e0053bf6b64b33c7929 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/opensurvey/fonction.php
+ * \file htdocs/opensurvey/fonctions.php
* \ingroup opensurvey
* \brief Functions for module
*/
diff --git a/htdocs/printipp/admin/printipp.php b/htdocs/printipp/admin/printipp.php
index bdf9078935ca1b87d89a595ee01ef1e57864865c..08202b38f8e2526f85eef5ea3e6ebaeb8dad3871 100644
--- a/htdocs/printipp/admin/printipp.php
+++ b/htdocs/printipp/admin/printipp.php
@@ -17,7 +17,7 @@
/**
* \file htdocs/printipp/admin/printipp.php
- * \ingroup core
+ * \ingroup printipp
* \brief Page to setup printipp module
*/
@@ -41,6 +41,7 @@ if (!$mode) $mode='config';
/*
* Action
*/
+
if ($action == 'setvalue' && $user->admin)
{
$db->begin();
@@ -87,7 +88,7 @@ print $langs->trans("PrintIPPDesc")."<br>\n";
print '<br>';
-if ($mode=='config'&& $user->admin)
+if ($mode == 'config' && $user->admin)
{
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -162,7 +163,7 @@ if ($mode=='config'&& $user->admin)
print '</form>';
}
-if ($mode=='test'&& $user->admin)
+if ($mode == 'test' && $user->admin)
{
print '<table class="nobordernopadding" width="100%">';
$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
@@ -180,9 +181,10 @@ if ($mode=='test'&& $user->admin)
print '<td>Media</td>';
print '<td>Supported</td>';
print "</tr>\n";
+
$list = $printer->getlist_available_printers();
- $var = True;
- foreach ($list as $value )
+ $var = true;
+ foreach ($list as $value)
{
$var=!$var;
$printer_det = $printer->get_printer_detail($value);
@@ -208,5 +210,6 @@ if ($mode=='test'&& $user->admin)
dol_fiche_end();
llxFooter();
+
$db->close();
?>
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index 470ca7fc2e1bfad11881b1bc854930fce481e88b..ef2cbb26c57b9840d9db5f64ff43ec79ab368da2 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -17,12 +17,19 @@
*/
/**
- * \file htdocs/product/stock/replenishment.lib.php
+ * \file htdocs/product/stock/lib/replenishment.lib.php
* \ingroup produit
* \brief Contains functions used in replenish.php and replenishorders.php
*/
+
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+/**
+ * dispatched
+ *
+ * @param int $order_id Id of order
+ * @return boolean
+ */
function dispatched($order_id)
{
global $db;
@@ -32,7 +39,8 @@ function dispatched($order_id)
$resql = $db->query($sql);
$dispatched = array();
$ordered = array();
- if($resql && $db->num_rows($resql)) {
+ if($resql && $db->num_rows($resql))
+ {
while($res = $db->fetch_object($resql))
$dispatched[] = $res;
}
@@ -47,6 +55,11 @@ function dispatched($order_id)
return $dispatched == $ordered;
}
+/**
+ * dispatchedOrders
+ *
+ * @return Ambigous <string, multitype:NULL >
+ */
function dispatchedOrders()
{
global $db;
@@ -69,6 +82,12 @@ function dispatchedOrders()
return $res;
}
+/**
+ * ordered
+ *
+ * @param int $product_id Product id
+ * @return void
+ */
function ordered($product_id)
{
global $db, $langs, $conf;
@@ -104,6 +123,12 @@ function ordered($product_id)
}
}
+/**
+ * getProducts
+ *
+ * @param int $order_id Order id
+ * @return void
+ */
function getProducts($order_id)
{
global $db;
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 8fc1d97d23d5e443e2168cdc6f8030de1521b2f8..1bb6ac33b3331ff3eb62ff41746b9971350a1384 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -18,7 +18,7 @@
*/
/**
- * \file cron/public/cron/cron_run_jobs.php
+ * \file htdocs/public/cron/cron_run_jobs.php
* \ingroup cron
* \brief Execute pendings jobs
*/
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ecd678aa97c7d8868e111b764bd2be310c474a0e..f71c472f0cd66a47541b97ed92711990dcfe44d9 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1810,6 +1810,7 @@ tr.liste_total td, form.liste_total div {
border: 0px;
margin-bottom: 1px;
color: #202020;
+ min-height: 18px; /* seems to not be used */
}
.pair:hover {
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 3ae5c353f4223911bb41daf4fe9008aa587caa2f..988d0a9c7a44cd622099694a8727fd477e17f8db 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -19,7 +19,7 @@
*/
/**
- * \file cron/script/cron/cron_run_jobs.php
+ * \file scripts/cron/cron_run_jobs.php
* \ingroup cron
* \brief Execute pendings jobs
*/