This commit is contained in:
Laurent Destailleur 2015-03-17 11:23:45 +01:00
parent 84bea6166e
commit 6e251690ab
16 changed files with 51 additions and 67 deletions

View File

@ -39,12 +39,12 @@ class Account extends CommonObject
public $table_element='bank_account'; public $table_element='bank_account';
/** /**
* //TODO: Discuss this. $rowid is preferred over $id * @var int Use id instead of rowid
* @var
* @deprecated * @deprecated
*/ */
var $rowid; var $rowid;
var $id; var $id;
var $ref; var $ref;
var $label; var $label;
//! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne //! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne

View File

@ -89,23 +89,7 @@ class Contrat extends CommonObject
var $product; var $product;
/** /**
* TODO: Which is the correct one? * @var int Id of user author of the contract
* Author of the contract
* @var
*/
var $user_author;
/**
* TODO: Which is the correct one?
* Author of the contract
* @var User
*/
public $user_creation;
/**
* TODO: Which is the correct one?
* Author of the contract
* @var int
*/ */
public $fk_user_author; public $fk_user_author;
@ -117,38 +101,37 @@ class Contrat extends CommonObject
public $user_author_id; public $user_author_id;
/** /**
* @var User * @var User Object user that create the contract. Set by the info method.
*/
public $user_creation;
/**
* @var User Object user that close the contract. Set by the info method.
*/ */
public $user_cloture; public $user_cloture;
/** /**
* Date of creation * @var int Date of creation
* @var int
*/ */
var $date_creation; var $date_creation;
/** /**
* Date of last modification * @var int Date of last modification. Not filled until you call ->info()
* Not filled until you call ->info()
* @var int
*/ */
public $date_modification; public $date_modification;
/** /**
* Date of validation * @var int Date of validation
* @var int
*/ */
var $date_validation; var $date_validation;
/** /**
* Date when contract was signed * @var int Date when contract was signed
* @var int
*/ */
var $date_contrat; var $date_contrat;
/** /**
* Date of contract closure * @var int Date of contract closure
* @var int
* @deprecated we close contract lines, not a contract * @deprecated we close contract lines, not a contract
*/ */
var $date_cloture; var $date_cloture;
@ -157,21 +140,15 @@ class Contrat extends CommonObject
var $commercial_suivi_id; var $commercial_suivi_id;
/** /**
* @deprecated Use note_private or note_public instead * @var string Private note
*/
var $note;
/**
* Private note
* @var string
*/ */
var $note_private; var $note_private;
/** /**
* Public note * @var string Public note
* @var string
*/ */
var $note_public; var $note_public;
var $modelpdf; var $modelpdf;
/** /**
@ -184,8 +161,7 @@ class Contrat extends CommonObject
var $extraparams=array(); var $extraparams=array();
/** /**
* Contract lines * @var ContratLigne[] Contract lines
* @var ContratLigne[]
*/ */
var $lines=array(); var $lines=array();
@ -569,7 +545,6 @@ class Contrat extends CommonObject
$this->commercial_signature_id = $result["fk_commercial_signature"]; $this->commercial_signature_id = $result["fk_commercial_signature"];
$this->commercial_suivi_id = $result["fk_commercial_suivi"]; $this->commercial_suivi_id = $result["fk_commercial_suivi"];
$this->note = $result["note_private"]; // deprecated
$this->note_private = $result["note_private"]; $this->note_private = $result["note_private"];
$this->note_public = $result["note_public"]; $this->note_public = $result["note_public"];
$this->modelpdf = $result["model_pdf"]; $this->modelpdf = $result["model_pdf"];
@ -726,7 +701,7 @@ class Contrat extends CommonObject
// Retreive all extrafield for propal // Retreive all extrafield for propal
// fetch optionals attributes and labels // fetch optionals attributes and labels
$line->fetch_optionals($line->id,$extralabelsline); $line->fetch_optionals($line->id,$extralabelsline);
$this->lines[] = $line; $this->lines[] = $line;
//dol_syslog("1 ".$line->desc); //dol_syslog("1 ".$line->desc);
@ -822,13 +797,13 @@ class Contrat extends CommonObject
if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++; if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
if ($line->statut == 5) $this->nbofservicesclosed++; if ($line->statut == 5) $this->nbofservicesclosed++;
// Retreive all extrafield for propal // Retreive all extrafield for propal
// fetch optionals attributes and labels // fetch optionals attributes and labels
$line->fetch_optionals($line->id,$extralabelsline); $line->fetch_optionals($line->id,$extralabelsline);
$this->lines[] = $line; $this->lines[] = $line;
$total_ttc+=$objp->total_ttc; $total_ttc+=$objp->total_ttc;

View File

@ -21,7 +21,7 @@
*/ */
/** /**
* \defgroup askpricesupplier Module to request supplier price proposals * \defgroup askpricesupplier Module askpricesupplier
* \brief Module to request supplier price proposals * \brief Module to request supplier price proposals
* \file htdocs/core/modules/modAskPriceSupplier.class.php * \file htdocs/core/modules/modAskPriceSupplier.class.php
* \ingroup askpricesupplier * \ingroup askpricesupplier

View File

@ -17,14 +17,13 @@
*/ */
/** /**
* \defgroup Indicateurs * \defgroup expensereport Module expensereport
* \brief Module indicateurs * \brief Module to manage expense report. Replace old module Deplacement.
* Such a file must be copied into htdocs/includes/module directory.
*/ */
/** /**
* \file htdocs/indicateurs/core/modules/modExpenseReport.class.php * \file htdocs/core/modules/modExpenseReport.class.php
* \ingroup indicateur * \ingroup expensereport
* \brief Description and activation file for module ExpenseReport * \brief Description and activation file for module ExpenseReport
*/ */
include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \defgroup ftp Module FTP * \defgroup ftp Module ftp
* \brief Module for FTP client module * \brief Module for FTP client module
* \file htdocs/core/modules/modFTP.class.php * \file htdocs/core/modules/modFTP.class.php
* \ingroup ftp * \ingroup ftp

View File

@ -21,7 +21,7 @@
*/ */
/** /**
* \defgroup ficheinter Module intervention cards * \defgroup ficheinter Module Interventions
* \brief Module to manage intervention cards * \brief Module to manage intervention cards
* \file htdocs/core/modules/modFicheinter.class.php * \file htdocs/core/modules/modFicheinter.class.php
* \ingroup ficheinter * \ingroup ficheinter

View File

@ -16,7 +16,7 @@
*/ */
/** /**
* \defgroup geoip Module GeoIP * \defgroup geoip Module geoipmaxmind
* \brief Module to make geoip conversions * \brief Module to make geoip conversions
* \file htdocs/core/modules/modGeoIPMaxmind.class.php * \file htdocs/core/modules/modGeoIPMaxmind.class.php
* \ingroup geoip * \ingroup geoip

View File

@ -17,7 +17,7 @@
*/ */
/** /**
* \defgroup resource Resource module * \defgroup resource Module resource
* \brief Resource module descriptor. * \brief Resource module descriptor.
* \file core/modules/modResource.class.php * \file core/modules/modResource.class.php
* \ingroup resource * \ingroup resource

View File

@ -20,6 +20,7 @@
/** /**
* \file htdocs/expensereport/ajax/ajaxprojet.php * \file htdocs/expensereport/ajax/ajaxprojet.php
* \ingroup expensereport
* \brief File to return Ajax response on third parties request * \brief File to return Ajax response on third parties request
*/ */

View File

@ -19,7 +19,8 @@
/** /**
* \file htdocs/expensereport/card.php * \file htdocs/expensereport/card.php
* \brief Page for trip and expense card * \ingroup expensereport
* \brief Page for trip and expense report card
*/ */
$res=0; $res=0;
@ -1135,7 +1136,7 @@ if ($action == 'create')
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
// Public note // Public note
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>'; print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
@ -1155,7 +1156,7 @@ if ($action == 'create')
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
} }
print '<tbody>'; print '<tbody>';
print '</table>'; print '</table>';
@ -1286,7 +1287,7 @@ else
print '</td></tr>'; print '</td></tr>';
} }
// Public note // Public note
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>'; print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
@ -1295,7 +1296,7 @@ else
$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Private note // Private note
if (empty($user->societe_id)) { if (empty($user->societe_id)) {
print '<tr>'; print '<tr>';
@ -1306,7 +1307,7 @@ else
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
} }
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();

View File

@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/**
* \file htdocs/expensereport/class/expensereport.class.php
* \ingroup expensereport
* \brief File to manage Expense Reports
*/
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
/** /**
@ -1420,7 +1425,7 @@ class ExpenseReport extends CommonObject
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
} }
/** /**
* List of types * List of types
* *

View File

@ -19,7 +19,7 @@
/** /**
* \file htdocs/expensereport/class/expensereportstats.class.php * \file htdocs/expensereport/class/expensereportstats.class.php
* \ingroup ExpenseReport * \ingroup expensereport
* \brief Fichier de la classe de gestion des stats des expensereport et notes de frais * \brief Fichier de la classe de gestion des stats des expensereport et notes de frais
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';

View File

@ -17,6 +17,7 @@
/** /**
* \file htdocs/expensereport/index.php * \file htdocs/expensereport/index.php
* \ingroup expensereport
* \brief Page list of expenses * \brief Page list of expenses
*/ */

View File

@ -21,6 +21,7 @@
/** /**
* \file htdocs/expensereport/index.php * \file htdocs/expensereport/index.php
* \ingroup expensereport
* \brief Page list of expenses * \brief Page list of expenses
*/ */

View File

@ -19,7 +19,7 @@
/** /**
* \file htdocs/expensereport/info.php * \file htdocs/expensereport/info.php
* \ingroup trip * \ingroup expensereport
* \brief Page to show a trip information * \brief Page to show a trip information
*/ */

View File

@ -21,6 +21,7 @@
/** /**
* \file htdocs/expensereport/index.php * \file htdocs/expensereport/index.php
* \ingroup expensereport
* \brief list of expense reports * \brief list of expense reports
*/ */