PHPDoc and misc fixes for several folders
This commit is contained in:
parent
0d6d98b395
commit
530186c59d
@ -996,8 +996,6 @@ class Contact extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function initAsSpecimen()
|
function initAsSpecimen()
|
||||||
{
|
{
|
||||||
global $user,$langs;
|
|
||||||
|
|
||||||
// Get first id of existing company and save it into $socid
|
// Get first id of existing company and save it into $socid
|
||||||
$socid = 0;
|
$socid = 0;
|
||||||
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe ORDER BY rowid LIMIT 1";
|
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe ORDER BY rowid LIMIT 1";
|
||||||
|
|||||||
@ -659,7 +659,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contr
|
|||||||
// Close all lines
|
// Close all lines
|
||||||
else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
|
else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
|
||||||
{
|
{
|
||||||
$result = $object->cloture($user);
|
$object->cloture($user);
|
||||||
}
|
}
|
||||||
|
|
||||||
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
|
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
|
||||||
|
|||||||
@ -236,7 +236,6 @@ class Contrat extends CommonObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
$obj = new $classname();
|
$obj = new $classname();
|
||||||
$numref = "";
|
|
||||||
$numref = $obj->getNextValue($soc,$this);
|
$numref = $obj->getNextValue($soc,$this);
|
||||||
|
|
||||||
if ( $numref != "")
|
if ( $numref != "")
|
||||||
@ -1589,11 +1588,11 @@ class Contrat extends CommonObject
|
|||||||
// Load $this->lines array
|
// Load $this->lines array
|
||||||
// $this->fetch_lines();
|
// $this->fetch_lines();
|
||||||
|
|
||||||
$newstatut=1;
|
// $newstatut=1;
|
||||||
foreach($this->lines as $key => $contractline)
|
// foreach($this->lines as $key => $contractline)
|
||||||
{
|
// {
|
||||||
// if ($contractline) // Loop on each service
|
// // if ($contractline) // Loop on each service
|
||||||
}
|
// }
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2412,7 +2412,7 @@ abstract class CommonObject
|
|||||||
* TODO Move this into html.class.php
|
* TODO Move this into html.class.php
|
||||||
* But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
|
* But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
|
||||||
*
|
*
|
||||||
* @return void
|
* @return int
|
||||||
*/
|
*/
|
||||||
function showLinkedObjectBlock()
|
function showLinkedObjectBlock()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -306,7 +306,7 @@ class vCard
|
|||||||
/**
|
/**
|
||||||
* permet d'obtenir une vcard
|
* permet d'obtenir une vcard
|
||||||
*
|
*
|
||||||
* @return void
|
* @return string
|
||||||
*/
|
*/
|
||||||
function getVCard()
|
function getVCard()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -25,10 +25,10 @@
|
|||||||
/**
|
/**
|
||||||
* Prepare array with list of tabs
|
* Prepare array with list of tabs
|
||||||
*
|
*
|
||||||
* @param Object $object Object related to tabs
|
* @param Contact $object Object related to tabs
|
||||||
* @return array Array of tabs to show
|
* @return array Array of tabs to show
|
||||||
*/
|
*/
|
||||||
function contact_prepare_head($object)
|
function contact_prepare_head(Contact $object)
|
||||||
{
|
{
|
||||||
global $langs, $conf, $user;
|
global $langs, $conf, $user;
|
||||||
|
|
||||||
|
|||||||
@ -25,10 +25,10 @@
|
|||||||
/**
|
/**
|
||||||
* Prepare array with list of tabs
|
* Prepare array with list of tabs
|
||||||
*
|
*
|
||||||
* @param Object $object Object related to tabs
|
* @param Contrat $object Object related to tabs
|
||||||
* @return array Array of tabs to show
|
* @return array Array of tabs to show
|
||||||
*/
|
*/
|
||||||
function contract_prepare_head($object)
|
function contract_prepare_head(Contrat $object)
|
||||||
{
|
{
|
||||||
global $langs, $conf;
|
global $langs, $conf;
|
||||||
$h = 0;
|
$h = 0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user