commit
df60754e52
@ -55,6 +55,8 @@ abstract class ActionsAdherentCardCommon
|
|||||||
*/
|
*/
|
||||||
private function getInstanceDao()
|
private function getInstanceDao()
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
if (! is_object($this->object))
|
if (! is_object($this->object))
|
||||||
{
|
{
|
||||||
$modelclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php');
|
$modelclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php');
|
||||||
|
|||||||
@ -39,7 +39,6 @@ class AdherentType extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int
|
* @var int
|
||||||
* @deprecated Use rowid
|
|
||||||
*/
|
*/
|
||||||
public $ref;
|
public $ref;
|
||||||
|
|
||||||
|
|||||||
@ -1228,6 +1228,11 @@ class Categorie extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function containing($id,$type,$mode='object')
|
function containing($id,$type,$mode='object')
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if (is_numeric($type)) {
|
||||||
|
dol_syslog(__METHOD__ . ': using numeric types is deprecated.', LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
$cats = array();
|
$cats = array();
|
||||||
|
|
||||||
// For backward compatibility
|
// For backward compatibility
|
||||||
@ -1284,6 +1289,11 @@ class Categorie extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function rechercher($id, $nom, $type, $exact = false, $case = false)
|
function rechercher($id, $nom, $type, $exact = false, $case = false)
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if (is_numeric($type)) {
|
||||||
|
dol_syslog(__METHOD__ . ': using numeric types is deprecated.', LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
$cats = array();
|
$cats = array();
|
||||||
|
|
||||||
// For backward compatibility
|
// For backward compatibility
|
||||||
|
|||||||
@ -96,7 +96,7 @@ if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
|
|||||||
{
|
{
|
||||||
$idtoremove=GETPOST('removedassigned');
|
$idtoremove=GETPOST('removedassigned');
|
||||||
|
|
||||||
if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1);
|
if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=json_decode($_SESSION['assignedtouser'],1);
|
||||||
else $tmpassigneduserids=array();
|
else $tmpassigneduserids=array();
|
||||||
|
|
||||||
foreach ($tmpassigneduserids as $key => $val)
|
foreach ($tmpassigneduserids as $key => $val)
|
||||||
@ -104,7 +104,7 @@ if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
|
|||||||
if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
|
if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
|
||||||
}
|
}
|
||||||
//var_dump($_POST['removedassigned']);exit;
|
//var_dump($_POST['removedassigned']);exit;
|
||||||
$_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids);
|
$_SESSION['assignedtouser']=json_encode($tmpassigneduserids);
|
||||||
$donotclearsession=1;
|
$donotclearsession=1;
|
||||||
if ($action == 'add') $action = 'create';
|
if ($action == 'add') $action = 'create';
|
||||||
if ($action == 'update') $action = 'edit';
|
if ($action == 'update') $action = 'edit';
|
||||||
@ -119,10 +119,10 @@ if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser'))
|
|||||||
$assignedtouser=array();
|
$assignedtouser=array();
|
||||||
if (! empty($_SESSION['assignedtouser']))
|
if (! empty($_SESSION['assignedtouser']))
|
||||||
{
|
{
|
||||||
$assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true);
|
$assignedtouser=json_decode($_SESSION['assignedtouser'], true);
|
||||||
}
|
}
|
||||||
$assignedtouser[GETPOST('assignedtouser')]=array('id'=>GETPOST('assignedtouser'), 'transparency'=>GETPOST('transparency'),'mandatory'=>1);
|
$assignedtouser[GETPOST('assignedtouser')]=array('id'=>GETPOST('assignedtouser'), 'transparency'=>GETPOST('transparency'),'mandatory'=>1);
|
||||||
$_SESSION['assignedtouser']=dol_json_encode($assignedtouser);
|
$_SESSION['assignedtouser']=json_encode($assignedtouser);
|
||||||
}
|
}
|
||||||
$donotclearsession=1;
|
$donotclearsession=1;
|
||||||
if ($action == 'add') $action = 'create';
|
if ($action == 'add') $action = 'create';
|
||||||
@ -215,7 +215,7 @@ if ($action == 'add')
|
|||||||
$object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
|
$object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
|
||||||
|
|
||||||
$listofuserid=array();
|
$listofuserid=array();
|
||||||
if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']);
|
if (! empty($_SESSION['assignedtouser'])) $listofuserid=json_decode($_SESSION['assignedtouser']);
|
||||||
$i=0;
|
$i=0;
|
||||||
foreach($listofuserid as $key => $value)
|
foreach($listofuserid as $key => $value)
|
||||||
{
|
{
|
||||||
@ -387,7 +387,7 @@ if ($action == 'update')
|
|||||||
if (! empty($_SESSION['assignedtouser'])) // Now concat assigned users
|
if (! empty($_SESSION['assignedtouser'])) // Now concat assigned users
|
||||||
{
|
{
|
||||||
// Restore array with key with same value than param 'id'
|
// Restore array with key with same value than param 'id'
|
||||||
$tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array();
|
$tmplist1=json_decode($_SESSION['assignedtouser'], true); $tmplist2=array();
|
||||||
foreach($tmplist1 as $key => $val)
|
foreach($tmplist1 as $key => $val)
|
||||||
{
|
{
|
||||||
if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val;
|
if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val;
|
||||||
@ -677,13 +677,13 @@ if ($action == 'create')
|
|||||||
{
|
{
|
||||||
$assignedtouser=GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
|
$assignedtouser=GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
|
||||||
if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency); // Owner first
|
if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency); // Owner first
|
||||||
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
|
$_SESSION['assignedtouser']=json_encode($listofuserid);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!empty($_SESSION['assignedtouser']))
|
if (!empty($_SESSION['assignedtouser']))
|
||||||
{
|
{
|
||||||
$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
|
$listofuserid=json_decode($_SESSION['assignedtouser'], true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
|
print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
|
||||||
@ -929,13 +929,13 @@ if ($id > 0)
|
|||||||
if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
|
if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
|
$_SESSION['assignedtouser']=json_encode($listofuserid);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!empty($_SESSION['assignedtouser']))
|
if (!empty($_SESSION['assignedtouser']))
|
||||||
{
|
{
|
||||||
$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
|
$listofuserid=json_decode($_SESSION['assignedtouser'], true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
|
print $form->select_dolusers_forevent(($action=='create'?'add':'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0');
|
||||||
@ -1101,13 +1101,13 @@ if ($id > 0)
|
|||||||
if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
|
if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
|
$_SESSION['assignedtouser']=json_encode($listofuserid);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!empty($_SESSION['assignedtouser']))
|
if (!empty($_SESSION['assignedtouser']))
|
||||||
{
|
{
|
||||||
$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
|
$listofuserid=json_decode($_SESSION['assignedtouser'], true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print $form->select_dolusers_forevent('view','assignedtouser',1);
|
print $form->select_dolusers_forevent('view','assignedtouser',1);
|
||||||
|
|||||||
@ -61,6 +61,7 @@ class ActionComm extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use $label
|
* @deprecated Use $label
|
||||||
|
* @see label
|
||||||
*/
|
*/
|
||||||
public $libelle;
|
public $libelle;
|
||||||
|
|
||||||
@ -71,6 +72,7 @@ class ActionComm extends CommonObject
|
|||||||
* Object user that create action
|
* Object user that create action
|
||||||
* @var User
|
* @var User
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see authorid
|
||||||
*/
|
*/
|
||||||
var $author;
|
var $author;
|
||||||
|
|
||||||
@ -78,6 +80,7 @@ class ActionComm extends CommonObject
|
|||||||
* Object user that modified action
|
* Object user that modified action
|
||||||
* @var User
|
* @var User
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see usermodid
|
||||||
*/
|
*/
|
||||||
var $usermod;
|
var $usermod;
|
||||||
var $authorid; // Id user that create action
|
var $authorid; // Id user that create action
|
||||||
@ -114,6 +117,7 @@ class ActionComm extends CommonObject
|
|||||||
* Object user of owner
|
* Object user of owner
|
||||||
* @var User
|
* @var User
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see userownerid
|
||||||
*/
|
*/
|
||||||
var $usertodo;
|
var $usertodo;
|
||||||
|
|
||||||
@ -121,6 +125,7 @@ class ActionComm extends CommonObject
|
|||||||
* Object user that did action
|
* Object user that did action
|
||||||
* @var User
|
* @var User
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see userdoneid
|
||||||
*/
|
*/
|
||||||
var $userdone;
|
var $userdone;
|
||||||
|
|
||||||
@ -130,12 +135,16 @@ class ActionComm extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Company linked to action (optional)
|
* Company linked to action (optional)
|
||||||
* @var Societe|null
|
* @var Societe|null
|
||||||
|
* @deprecated
|
||||||
|
* @see socid
|
||||||
*/
|
*/
|
||||||
var $societe;
|
var $societe;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Contact linked to action (optional)
|
* Contact linked to action (optional)
|
||||||
* @var Contact|null
|
* @var Contact|null
|
||||||
|
* @deprecated
|
||||||
|
* @see contactid
|
||||||
*/
|
*/
|
||||||
var $contact;
|
var $contact;
|
||||||
|
|
||||||
@ -468,7 +477,7 @@ class ActionComm extends CommonObject
|
|||||||
$this->fulldayevent = $obj->fulldayevent;
|
$this->fulldayevent = $obj->fulldayevent;
|
||||||
$this->location = $obj->location;
|
$this->location = $obj->location;
|
||||||
$this->transparency = $obj->transparency;
|
$this->transparency = $obj->transparency;
|
||||||
$this->punctual = $obj->punctual;
|
$this->punctual = $obj->punctual; // deprecated
|
||||||
|
|
||||||
$this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
|
$this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
|
||||||
$this->contactid = $obj->fk_contact; // To have fetch_contact method working
|
$this->contactid = $obj->fk_contact; // To have fetch_contact method working
|
||||||
|
|||||||
@ -186,13 +186,13 @@ if ($object->id > 0)
|
|||||||
if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
|
if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
|
$_SESSION['assignedtouser']=json_encode($listofuserid);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!empty($_SESSION['assignedtouser']))
|
if (!empty($_SESSION['assignedtouser']))
|
||||||
{
|
{
|
||||||
$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
|
$listofuserid=json_decode($_SESSION['assignedtouser'], true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print $form->select_dolusers_forevent('view','assignedtouser',1);
|
print $form->select_dolusers_forevent('view','assignedtouser',1);
|
||||||
|
|||||||
@ -59,14 +59,42 @@ class AskPriceSupplier extends CommonObject
|
|||||||
var $client; // Objet societe client (a charger par fetch_client)
|
var $client; // Objet societe client (a charger par fetch_client)
|
||||||
|
|
||||||
var $fk_project;
|
var $fk_project;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see user_author_id
|
||||||
|
*/
|
||||||
var $author;
|
var $author;
|
||||||
var $ref;
|
var $ref;
|
||||||
var $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
|
var $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
|
||||||
var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed)
|
var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed)
|
||||||
var $datec; // Date of creation
|
|
||||||
var $date; // Date of proposal
|
var $date; // Date of proposal
|
||||||
var $date_livraison;
|
var $date_livraison;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see date_creation
|
||||||
|
*/
|
||||||
|
var $datec;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creation date
|
||||||
|
* @var int
|
||||||
|
*/
|
||||||
|
public $date_creation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see date_validation
|
||||||
|
*/
|
||||||
|
var $datev;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validation date
|
||||||
|
* @var int
|
||||||
|
*/
|
||||||
|
public $date_validation;
|
||||||
|
|
||||||
|
|
||||||
var $user_author_id;
|
var $user_author_id;
|
||||||
var $user_valid_id;
|
var $user_valid_id;
|
||||||
var $user_close_id;
|
var $user_close_id;
|
||||||
@ -76,9 +104,22 @@ class AskPriceSupplier extends CommonObject
|
|||||||
var $total_localtax1; // Total Local Taxes 1
|
var $total_localtax1; // Total Local Taxes 1
|
||||||
var $total_localtax2; // Total Local Taxes 2
|
var $total_localtax2; // Total Local Taxes 2
|
||||||
var $total_ttc; // Total with tax
|
var $total_ttc; // Total with tax
|
||||||
var $price; // deprecated (for compatibility)
|
|
||||||
var $tva; // deprecated (for compatibility)
|
/**
|
||||||
var $total; // deprecated (for compatibility)
|
* @deprecated
|
||||||
|
* @see price_ht
|
||||||
|
*/
|
||||||
|
var $price;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see total_tva
|
||||||
|
*/
|
||||||
|
var $tva;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see total_ttc
|
||||||
|
*/
|
||||||
|
var $total;
|
||||||
|
|
||||||
var $cond_reglement_id;
|
var $cond_reglement_id;
|
||||||
var $cond_reglement_code;
|
var $cond_reglement_code;
|
||||||
@ -88,7 +129,11 @@ class AskPriceSupplier extends CommonObject
|
|||||||
var $remise;
|
var $remise;
|
||||||
var $remise_percent;
|
var $remise_percent;
|
||||||
var $remise_absolue;
|
var $remise_absolue;
|
||||||
var $note; // deprecated (for compatibility)
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_public, note_private
|
||||||
|
*/
|
||||||
|
var $note;
|
||||||
var $note_private;
|
var $note_private;
|
||||||
var $note_public;
|
var $note_public;
|
||||||
var $shipping_method_id;
|
var $shipping_method_id;
|
||||||
@ -1031,7 +1076,7 @@ class AskPriceSupplier extends CommonObject
|
|||||||
$this->remise = $obj->remise;
|
$this->remise = $obj->remise;
|
||||||
$this->remise_percent = $obj->remise_percent;
|
$this->remise_percent = $obj->remise_percent;
|
||||||
$this->remise_absolue = $obj->remise_absolue;
|
$this->remise_absolue = $obj->remise_absolue;
|
||||||
$this->total = $obj->total; // TODO obsolete
|
$this->total = $obj->total; // TODO deprecated
|
||||||
$this->total_ht = $obj->total_ht;
|
$this->total_ht = $obj->total_ht;
|
||||||
$this->total_tva = $obj->tva;
|
$this->total_tva = $obj->tva;
|
||||||
$this->total_localtax1 = $obj->localtax1;
|
$this->total_localtax1 = $obj->localtax1;
|
||||||
@ -1040,14 +1085,14 @@ class AskPriceSupplier extends CommonObject
|
|||||||
$this->socid = $obj->fk_soc;
|
$this->socid = $obj->fk_soc;
|
||||||
$this->fk_project = $obj->fk_projet;
|
$this->fk_project = $obj->fk_projet;
|
||||||
$this->modelpdf = $obj->model_pdf;
|
$this->modelpdf = $obj->model_pdf;
|
||||||
$this->note = $obj->note_private; // TODO obsolete
|
$this->note = $obj->note_private; // TODO deprecated
|
||||||
$this->note_private = $obj->note_private;
|
$this->note_private = $obj->note_private;
|
||||||
$this->note_public = $obj->note_public;
|
$this->note_public = $obj->note_public;
|
||||||
$this->statut = $obj->fk_statut;
|
$this->statut = $obj->fk_statut;
|
||||||
$this->statut_libelle = $obj->statut_label;
|
$this->statut_libelle = $obj->statut_label;
|
||||||
|
|
||||||
$this->datec = $this->db->jdate($obj->datec); // TODO obsolete
|
$this->datec = $this->db->jdate($obj->datec); // TODO deprecated
|
||||||
$this->datev = $this->db->jdate($obj->datev); // TODO obsolete
|
$this->datev = $this->db->jdate($obj->datev); // TODO deprecated
|
||||||
$this->date_creation = $this->db->jdate($obj->datec); //Creation date
|
$this->date_creation = $this->db->jdate($obj->datec); //Creation date
|
||||||
$this->date_validation = $this->db->jdate($obj->datev); //Validation date
|
$this->date_validation = $this->db->jdate($obj->datev); //Validation date
|
||||||
$this->date_livraison = $this->db->jdate($obj->date_livraison);
|
$this->date_livraison = $this->db->jdate($obj->date_livraison);
|
||||||
@ -2431,7 +2476,17 @@ class AskPriceSupplierLine extends CommonObject
|
|||||||
var $fk_parent_line;
|
var $fk_parent_line;
|
||||||
var $desc; // Description ligne
|
var $desc; // Description ligne
|
||||||
var $fk_product; // Id produit predefini
|
var $fk_product; // Id produit predefini
|
||||||
var $product_type = 0; // Type 0 = product, 1 = Service
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_type
|
||||||
|
*/
|
||||||
|
var $fk_product_type;
|
||||||
|
/**
|
||||||
|
* Product type
|
||||||
|
* @var int
|
||||||
|
* @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
|
||||||
|
*/
|
||||||
|
public $product_type = Product::TYPE_PRODUCT;
|
||||||
|
|
||||||
var $qty;
|
var $qty;
|
||||||
var $tva_tx;
|
var $tva_tx;
|
||||||
@ -2459,14 +2514,43 @@ class AskPriceSupplierLine extends CommonObject
|
|||||||
var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
|
var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
|
||||||
var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
|
var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
|
||||||
|
|
||||||
// Ne plus utiliser
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see remise_percent, fk_remise_except
|
||||||
|
*/
|
||||||
var $remise;
|
var $remise;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see subprice
|
||||||
|
*/
|
||||||
var $price;
|
var $price;
|
||||||
|
|
||||||
// From llx_product
|
// From llx_product
|
||||||
var $ref; // Reference produit
|
/**
|
||||||
var $libelle; // Label produit
|
* @deprecated
|
||||||
var $product_desc; // Description produit
|
* @see product_ref
|
||||||
|
*/
|
||||||
|
var $ref;
|
||||||
|
/**
|
||||||
|
* Product reference
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $product_ref;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_label
|
||||||
|
*/
|
||||||
|
var $libelle;
|
||||||
|
/**
|
||||||
|
* Product label
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $product_label;
|
||||||
|
/**
|
||||||
|
* Product description
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $product_desc;
|
||||||
|
|
||||||
var $localtax1_tx; // Local tax 1
|
var $localtax1_tx; // Local tax 1
|
||||||
var $localtax2_tx; // Local tax 2
|
var $localtax2_tx; // Local tax 2
|
||||||
|
|||||||
@ -75,26 +75,35 @@ class Propal extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Status of the quote
|
* Status of the quote
|
||||||
* Check the following constants:
|
|
||||||
* - STATUS_DRAFT
|
|
||||||
* - STATUS_VALIDATED
|
|
||||||
* - STATUS_SIGNED
|
|
||||||
* - STATUS_NOTSIGNED
|
|
||||||
* - STATUS_BILLED
|
|
||||||
* @var int
|
* @var int
|
||||||
|
* @see Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED
|
||||||
*/
|
*/
|
||||||
var $statut;
|
var $statut;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Date of creation
|
* @deprecated
|
||||||
* @var
|
* @see date_creation
|
||||||
*/
|
*/
|
||||||
var $datec;
|
var $datec;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Date of validation
|
* Creation date
|
||||||
* @var
|
* @var int
|
||||||
|
*/
|
||||||
|
public $date_creation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see date_validation
|
||||||
*/
|
*/
|
||||||
var $datev;
|
var $datev;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validation date
|
||||||
|
* @var int
|
||||||
|
*/
|
||||||
|
public $date_validation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Date of the quote
|
* Date of the quote
|
||||||
* @var
|
* @var
|
||||||
@ -102,8 +111,8 @@ class Propal extends CommonObject
|
|||||||
var $date;
|
var $date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Same than date ¿?
|
* @deprecated
|
||||||
* @var
|
* @see date
|
||||||
*/
|
*/
|
||||||
var $datep;
|
var $datep;
|
||||||
var $date_livraison;
|
var $date_livraison;
|
||||||
@ -121,14 +130,17 @@ class Propal extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see total_ht
|
||||||
*/
|
*/
|
||||||
var $price;
|
var $price;
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see total_tva
|
||||||
*/
|
*/
|
||||||
var $tva;
|
var $tva;
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see total_ttc
|
||||||
*/
|
*/
|
||||||
var $total;
|
var $total;
|
||||||
|
|
||||||
@ -142,6 +154,7 @@ class Propal extends CommonObject
|
|||||||
var $remise_absolue;
|
var $remise_absolue;
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
*/
|
*/
|
||||||
var $note;
|
var $note;
|
||||||
var $note_private;
|
var $note_private;
|
||||||
@ -1222,7 +1235,7 @@ class Propal extends CommonObject
|
|||||||
$this->remise = $obj->remise;
|
$this->remise = $obj->remise;
|
||||||
$this->remise_percent = $obj->remise_percent;
|
$this->remise_percent = $obj->remise_percent;
|
||||||
$this->remise_absolue = $obj->remise_absolue;
|
$this->remise_absolue = $obj->remise_absolue;
|
||||||
$this->total = $obj->total; // TODO obsolete
|
$this->total = $obj->total; // TODO deprecated
|
||||||
$this->total_ht = $obj->total_ht;
|
$this->total_ht = $obj->total_ht;
|
||||||
$this->total_tva = $obj->tva;
|
$this->total_tva = $obj->tva;
|
||||||
$this->total_localtax1 = $obj->localtax1;
|
$this->total_localtax1 = $obj->localtax1;
|
||||||
@ -1231,14 +1244,14 @@ class Propal extends CommonObject
|
|||||||
$this->socid = $obj->fk_soc;
|
$this->socid = $obj->fk_soc;
|
||||||
$this->fk_project = $obj->fk_projet;
|
$this->fk_project = $obj->fk_projet;
|
||||||
$this->modelpdf = $obj->model_pdf;
|
$this->modelpdf = $obj->model_pdf;
|
||||||
$this->note = $obj->note_private; // TODO obsolete
|
$this->note = $obj->note_private; // TODO deprecated
|
||||||
$this->note_private = $obj->note_private;
|
$this->note_private = $obj->note_private;
|
||||||
$this->note_public = $obj->note_public;
|
$this->note_public = $obj->note_public;
|
||||||
$this->statut = $obj->fk_statut;
|
$this->statut = $obj->fk_statut;
|
||||||
$this->statut_libelle = $obj->statut_label;
|
$this->statut_libelle = $obj->statut_label;
|
||||||
|
|
||||||
$this->datec = $this->db->jdate($obj->datec); // TODO obsolete
|
$this->datec = $this->db->jdate($obj->datec); // TODO deprecated
|
||||||
$this->datev = $this->db->jdate($obj->datev); // TODO obsolete
|
$this->datev = $this->db->jdate($obj->datev); // TODO deprecated
|
||||||
$this->date_creation = $this->db->jdate($obj->datec); //Creation date
|
$this->date_creation = $this->db->jdate($obj->datec); //Creation date
|
||||||
$this->date_validation = $this->db->jdate($obj->datev); //Validation date
|
$this->date_validation = $this->db->jdate($obj->datev); //Validation date
|
||||||
$this->date = $this->db->jdate($obj->dp); // Proposal date
|
$this->date = $this->db->jdate($obj->dp); // Proposal date
|
||||||
@ -1967,9 +1980,12 @@ class Propal extends CommonObject
|
|||||||
*
|
*
|
||||||
* @return int <0 si ko, >0 si ok
|
* @return int <0 si ko, >0 si ok
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see classifyBilled()
|
||||||
*/
|
*/
|
||||||
function classer_facturee()
|
function classer_facturee()
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $this->classifyBilled();
|
return $this->classifyBilled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2724,7 +2740,7 @@ class Propal extends CommonObject
|
|||||||
* Return clicable link of object (with eventually picto)
|
* Return clicable link of object (with eventually picto)
|
||||||
*
|
*
|
||||||
* @param int $withpicto Add picto into link
|
* @param int $withpicto Add picto into link
|
||||||
* @param string $option Where point the link ('compta', 'expedition', 'document', ...)
|
* @param string $option Where point the link ('expedition', 'document', ...)
|
||||||
* @param string $get_params Parametres added to url
|
* @param string $get_params Parametres added to url
|
||||||
* @return string String with URL
|
* @return string String with URL
|
||||||
*/
|
*/
|
||||||
@ -2912,17 +2928,19 @@ class PropaleLigne extends CommonObjectLine
|
|||||||
var $oldline;
|
var $oldline;
|
||||||
|
|
||||||
// From llx_propaldet
|
// From llx_propaldet
|
||||||
var $rowid;
|
|
||||||
var $fk_propal;
|
var $fk_propal;
|
||||||
var $fk_parent_line;
|
var $fk_parent_line;
|
||||||
var $desc; // Description ligne
|
var $desc; // Description ligne
|
||||||
var $fk_product; // Id produit predefini
|
var $fk_product; // Id produit predefini
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_type
|
||||||
|
*/
|
||||||
|
var $fk_product_type;
|
||||||
/**
|
/**
|
||||||
* Product type.
|
* Product type.
|
||||||
* Use the following constants:
|
|
||||||
* - Product::TYPE_PRODUCT
|
|
||||||
* - Product::TYPE_SERVICE
|
|
||||||
* @var int
|
* @var int
|
||||||
|
* @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
|
||||||
*/
|
*/
|
||||||
var $product_type = Product::TYPE_PRODUCT;
|
var $product_type = Product::TYPE_PRODUCT;
|
||||||
|
|
||||||
@ -2952,14 +2970,43 @@ class PropaleLigne extends CommonObjectLine
|
|||||||
var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
|
var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
|
||||||
var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
|
var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
|
||||||
|
|
||||||
// Ne plus utiliser
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see $remise_percent, $fk_remise_except
|
||||||
|
*/
|
||||||
var $remise;
|
var $remise;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see subprice
|
||||||
|
*/
|
||||||
var $price;
|
var $price;
|
||||||
|
|
||||||
// From llx_product
|
// From llx_product
|
||||||
var $ref; // Reference produit
|
/**
|
||||||
var $libelle; // Label produit
|
* @deprecated
|
||||||
var $product_desc; // Description produit
|
* @see product_ref
|
||||||
|
*/
|
||||||
|
var $ref;
|
||||||
|
/**
|
||||||
|
* Product reference
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $product_ref;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_label
|
||||||
|
*/
|
||||||
|
var $libelle;
|
||||||
|
/**
|
||||||
|
* Product label
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $product_label;
|
||||||
|
/**
|
||||||
|
* Product description
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $product_desc;
|
||||||
|
|
||||||
var $localtax1_tx; // Local tax 1
|
var $localtax1_tx; // Local tax 1
|
||||||
var $localtax2_tx; // Local tax 2
|
var $localtax2_tx; // Local tax 2
|
||||||
@ -3007,7 +3054,8 @@ class PropaleLigne extends CommonObjectLine
|
|||||||
{
|
{
|
||||||
$objp = $this->db->fetch_object($result);
|
$objp = $this->db->fetch_object($result);
|
||||||
|
|
||||||
$this->rowid = $objp->rowid;
|
$this->id = $objp->rowid;
|
||||||
|
$this->rowid = $objp->rowid; // deprecated
|
||||||
$this->fk_propal = $objp->fk_propal;
|
$this->fk_propal = $objp->fk_propal;
|
||||||
$this->fk_parent_line = $objp->fk_parent_line;
|
$this->fk_parent_line = $objp->fk_parent_line;
|
||||||
$this->label = $objp->custom_label;
|
$this->label = $objp->custom_label;
|
||||||
@ -3016,7 +3064,7 @@ class PropaleLigne extends CommonObjectLine
|
|||||||
$this->price = $objp->price; // deprecated
|
$this->price = $objp->price; // deprecated
|
||||||
$this->subprice = $objp->subprice;
|
$this->subprice = $objp->subprice;
|
||||||
$this->tva_tx = $objp->tva_tx;
|
$this->tva_tx = $objp->tva_tx;
|
||||||
$this->remise = $objp->remise;
|
$this->remise = $objp->remise; // deprecated
|
||||||
$this->remise_percent = $objp->remise_percent;
|
$this->remise_percent = $objp->remise_percent;
|
||||||
$this->fk_remise_except = $objp->fk_remise_except;
|
$this->fk_remise_except = $objp->fk_remise_except;
|
||||||
$this->fk_product = $objp->fk_product;
|
$this->fk_product = $objp->fk_product;
|
||||||
|
|||||||
@ -129,7 +129,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Si fichier detail PDF existe
|
// Si fichier detail PDF existe
|
||||||
// TODO obsolete ?
|
// TODO deprecated ?
|
||||||
if (file_exists($filedetail))
|
if (file_exists($filedetail))
|
||||||
{
|
{
|
||||||
print "<tr ".$bc[$var]."><td>Commande detaillee</td>";
|
print "<tr ".$bc[$var]."><td>Commande detaillee</td>";
|
||||||
|
|||||||
@ -74,17 +74,15 @@ class Commande extends CommonOrder
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Status of the order. Check the following constants:
|
* Status of the order. Check the following constants:
|
||||||
* - STATUS_CANCELED
|
|
||||||
* - STATUS_DRAFT
|
|
||||||
* - STATUS_ACCEPTED
|
|
||||||
* - STATUS_CLOSED
|
|
||||||
* @var int
|
* @var int
|
||||||
|
* @see Commande::STATUS_CANCELED, Commande::STATUS_DRAFT, Commande::STATUS_ACCEPTED, Commande::STATUS_CLOSED
|
||||||
*/
|
*/
|
||||||
var $statut;
|
var $statut;
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see billed
|
||||||
*/
|
*/
|
||||||
var $facturee; // deprecated
|
var $facturee;
|
||||||
var $billed; // billed or not
|
var $billed; // billed or not
|
||||||
|
|
||||||
var $brouillon;
|
var $brouillon;
|
||||||
@ -100,7 +98,11 @@ class Commande extends CommonOrder
|
|||||||
var $fk_delivery_address;
|
var $fk_delivery_address;
|
||||||
var $address;
|
var $address;
|
||||||
var $date; // Date commande
|
var $date; // Date commande
|
||||||
var $date_commande; // Date commande (deprecated)
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see date
|
||||||
|
*/
|
||||||
|
var $date_commande;
|
||||||
var $date_livraison; // Date livraison souhaitee
|
var $date_livraison; // Date livraison souhaitee
|
||||||
var $shipping_method_id;
|
var $shipping_method_id;
|
||||||
var $fk_remise_except;
|
var $fk_remise_except;
|
||||||
@ -116,7 +118,11 @@ class Commande extends CommonOrder
|
|||||||
var $rang;
|
var $rang;
|
||||||
var $special_code;
|
var $special_code;
|
||||||
var $source; // Origin of order
|
var $source; // Origin of order
|
||||||
var $note; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
|
*/
|
||||||
|
var $note;
|
||||||
var $note_private;
|
var $note_private;
|
||||||
var $note_public;
|
var $note_public;
|
||||||
var $extraparams=array();
|
var $extraparams=array();
|
||||||
@ -1776,7 +1782,7 @@ class Commande extends CommonOrder
|
|||||||
* @param int $filtre_statut Filter on status
|
* @param int $filtre_statut Filter on status
|
||||||
* @return int <0 if KO, Nb of lines found if OK
|
* @return int <0 if KO, Nb of lines found if OK
|
||||||
*
|
*
|
||||||
* TODO deprecated, move to Shipping class
|
* TODO deprecate, move to Shipping class
|
||||||
*/
|
*/
|
||||||
function loadExpeditions($filtre_statut=-1)
|
function loadExpeditions($filtre_statut=-1)
|
||||||
{
|
{
|
||||||
@ -1823,7 +1829,7 @@ class Commande extends CommonOrder
|
|||||||
*
|
*
|
||||||
* @return int Nb of shipments
|
* @return int Nb of shipments
|
||||||
*
|
*
|
||||||
* TODO deprecated, move to Shipping class
|
* TODO deprecate, move to Shipping class
|
||||||
*/
|
*/
|
||||||
function nb_expedition()
|
function nb_expedition()
|
||||||
{
|
{
|
||||||
@ -1849,7 +1855,7 @@ class Commande extends CommonOrder
|
|||||||
* @param int $filtre_statut Filtre sur statut
|
* @param int $filtre_statut Filtre sur statut
|
||||||
* @return int 0 si OK, <0 si KO
|
* @return int 0 si OK, <0 si KO
|
||||||
*
|
*
|
||||||
* TODO deprecated, move to Shipping class
|
* TODO deprecate, move to Shipping class
|
||||||
*/
|
*/
|
||||||
function livraison_array($filtre_statut=self::STATUS_CANCELED)
|
function livraison_array($filtre_statut=self::STATUS_CANCELED)
|
||||||
{
|
{
|
||||||
@ -2399,9 +2405,12 @@ class Commande extends CommonOrder
|
|||||||
*
|
*
|
||||||
* @return int <0 if ko, >0 if ok
|
* @return int <0 if ko, >0 if ok
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see classifyBilled()
|
||||||
*/
|
*/
|
||||||
function classer_facturee()
|
function classer_facturee()
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $this->classifyBilled();
|
return $this->classifyBilled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3346,6 +3355,7 @@ class OrderLine extends CommonOrderLine
|
|||||||
* Id of parent order
|
* Id of parent order
|
||||||
* @var int
|
* @var int
|
||||||
* @deprecated Use fk_commande
|
* @deprecated Use fk_commande
|
||||||
|
* @see fk_commande
|
||||||
*/
|
*/
|
||||||
public $commande_id;
|
public $commande_id;
|
||||||
|
|
||||||
@ -3367,6 +3377,7 @@ class OrderLine extends CommonOrderLine
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see remise_percent, fk_remise_except
|
||||||
*/
|
*/
|
||||||
var $remise;
|
var $remise;
|
||||||
|
|
||||||
|
|||||||
@ -41,6 +41,7 @@ class Account extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* @var int Use id instead of rowid
|
* @var int Use id instead of rowid
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see id
|
||||||
*/
|
*/
|
||||||
var $rowid;
|
var $rowid;
|
||||||
var $id;
|
var $id;
|
||||||
@ -240,6 +241,11 @@ class Account extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function addline($date, $oper, $label, $amount, $num_chq, $categorie, $user, $emetteur='',$banque='')
|
function addline($date, $oper, $label, $amount, $num_chq, $categorie, $user, $emetteur='',$banque='')
|
||||||
{
|
{
|
||||||
|
// Deprecatîon warning
|
||||||
|
if (is_numeric($oper)) {
|
||||||
|
dol_syslog(__METHOD__ . ": using numeric operations is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
$emetteur=trim($emetteur);
|
$emetteur=trim($emetteur);
|
||||||
$banque=trim($banque);
|
$banque=trim($banque);
|
||||||
|
|||||||
@ -44,7 +44,11 @@ class Deplacement extends CommonObject
|
|||||||
var $fk_user_author;
|
var $fk_user_author;
|
||||||
var $fk_user;
|
var $fk_user;
|
||||||
var $km;
|
var $km;
|
||||||
var $note; // TODO obsolete
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
|
*/
|
||||||
|
var $note; // TODO deprecated
|
||||||
var $note_private;
|
var $note_private;
|
||||||
var $note_public;
|
var $note_public;
|
||||||
var $socid;
|
var $socid;
|
||||||
|
|||||||
@ -92,18 +92,16 @@ class Facture extends CommonInvoice
|
|||||||
var $revenuestamp;
|
var $revenuestamp;
|
||||||
/**
|
/**
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
*/
|
*/
|
||||||
var $note;
|
var $note;
|
||||||
var $note_private;
|
var $note_private;
|
||||||
var $note_public;
|
var $note_public;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check constants for more info:
|
* Invoice status
|
||||||
* - STATUS_DRAFT
|
|
||||||
* - STATUS_VALIDATED
|
|
||||||
* - STATUS_PAID
|
|
||||||
* - STATUS_ABANDONED
|
|
||||||
* @var int
|
* @var int
|
||||||
|
* @see Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_PAID, Facture::STATUS_ABANDONED
|
||||||
*/
|
*/
|
||||||
var $statut;
|
var $statut;
|
||||||
//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
|
//! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon
|
||||||
@ -131,6 +129,9 @@ class Facture extends CommonInvoice
|
|||||||
* @deprecated
|
* @deprecated
|
||||||
*/
|
*/
|
||||||
var $products=array();
|
var $products=array();
|
||||||
|
/**
|
||||||
|
* @var FactureLigne[]
|
||||||
|
*/
|
||||||
var $lines=array();
|
var $lines=array();
|
||||||
var $line;
|
var $line;
|
||||||
var $extraparams=array();
|
var $extraparams=array();
|
||||||
@ -1119,7 +1120,8 @@ class Facture extends CommonInvoice
|
|||||||
$objp = $this->db->fetch_object($result);
|
$objp = $this->db->fetch_object($result);
|
||||||
$line = new FactureLigne($this->db);
|
$line = new FactureLigne($this->db);
|
||||||
|
|
||||||
$line->rowid = $objp->rowid;
|
$line->id = $objp->rowid;
|
||||||
|
$line->rowid = $objp->rowid; // deprecated
|
||||||
$line->label = $objp->custom_label; // deprecated
|
$line->label = $objp->custom_label; // deprecated
|
||||||
$line->desc = $objp->description; // Description line
|
$line->desc = $objp->description; // Description line
|
||||||
$line->product_type = $objp->product_type; // Type of line
|
$line->product_type = $objp->product_type; // Type of line
|
||||||
@ -2105,6 +2107,11 @@ class Facture extends CommonInvoice
|
|||||||
*/
|
*/
|
||||||
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id='', $fk_unit = null)
|
function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id='', $fk_unit = null)
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if ($label) {
|
||||||
|
dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
global $mysoc, $conf, $langs;
|
global $mysoc, $conf, $langs;
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::addline facid=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type, fk_unit=$fk_unit", LOG_DEBUG);
|
dol_syslog(get_class($this)."::addline facid=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type, fk_unit=$fk_unit", LOG_DEBUG);
|
||||||
@ -2289,6 +2296,11 @@ class Facture extends CommonInvoice
|
|||||||
*/
|
*/
|
||||||
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null)
|
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null)
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if ($label) {
|
||||||
|
dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
|
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
|
||||||
|
|
||||||
global $mysoc;
|
global $mysoc;
|
||||||
@ -3685,7 +3697,10 @@ class FactureLigne extends CommonInvoiceLine
|
|||||||
var $fk_facture;
|
var $fk_facture;
|
||||||
//! Id parent line
|
//! Id parent line
|
||||||
var $fk_parent_line;
|
var $fk_parent_line;
|
||||||
var $label; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
*/
|
||||||
|
var $label;
|
||||||
//! Description ligne
|
//! Description ligne
|
||||||
var $desc;
|
var $desc;
|
||||||
|
|
||||||
@ -3717,8 +3732,16 @@ class FactureLigne extends CommonInvoiceLine
|
|||||||
//var $remise; // Montant calcule de la remise % sur PU HT (exemple 20)
|
//var $remise; // Montant calcule de la remise % sur PU HT (exemple 20)
|
||||||
|
|
||||||
// From llx_product
|
// From llx_product
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_ref
|
||||||
|
*/
|
||||||
var $ref; // Product ref (deprecated)
|
var $ref; // Product ref (deprecated)
|
||||||
var $product_ref; // Product ref
|
var $product_ref; // Product ref
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_label
|
||||||
|
*/
|
||||||
var $libelle; // Product label (deprecated)
|
var $libelle; // Product label (deprecated)
|
||||||
var $product_label; // Product label
|
var $product_label; // Product label
|
||||||
var $product_desc; // Description produit
|
var $product_desc; // Description produit
|
||||||
|
|||||||
@ -40,7 +40,16 @@ class Paiement extends CommonObject
|
|||||||
var $ref;
|
var $ref;
|
||||||
var $facid;
|
var $facid;
|
||||||
var $datepaye;
|
var $datepaye;
|
||||||
var $total; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see amount, amounts
|
||||||
|
*/
|
||||||
|
var $total;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see amount, amounts
|
||||||
|
*/
|
||||||
|
var $montant;
|
||||||
var $amount; // Total amount of payment
|
var $amount; // Total amount of payment
|
||||||
var $amounts=array(); // Array of amounts
|
var $amounts=array(); // Array of amounts
|
||||||
var $author;
|
var $author;
|
||||||
|
|||||||
@ -40,6 +40,11 @@ class PaymentSocialContribution extends CommonObject
|
|||||||
var $datec='';
|
var $datec='';
|
||||||
var $tms='';
|
var $tms='';
|
||||||
var $datep='';
|
var $datep='';
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see amount
|
||||||
|
*/
|
||||||
|
var $total;
|
||||||
var $amount; // Total amount of payment
|
var $amount; // Total amount of payment
|
||||||
var $amounts=array(); // Array of amounts
|
var $amounts=array(); // Array of amounts
|
||||||
var $fk_typepaiement;
|
var $fk_typepaiement;
|
||||||
|
|||||||
@ -51,6 +51,8 @@ abstract class ActionsContactCardCommon
|
|||||||
*/
|
*/
|
||||||
private function getInstanceDao()
|
private function getInstanceDao()
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
if (! is_object($this->object))
|
if (! is_object($this->object))
|
||||||
{
|
{
|
||||||
$modelclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php');
|
$modelclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php');
|
||||||
|
|||||||
@ -50,9 +50,21 @@ class Contact extends CommonObject
|
|||||||
var $zip;
|
var $zip;
|
||||||
var $town;
|
var $town;
|
||||||
|
|
||||||
var $fk_departement; // deprecated
|
/**
|
||||||
var $departement_code; // deprecated
|
* @deprecated
|
||||||
var $departement; // deprecated
|
* @see state_id
|
||||||
|
*/
|
||||||
|
var $fk_departement;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see state_code
|
||||||
|
*/
|
||||||
|
var $departement_code;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see state
|
||||||
|
*/
|
||||||
|
var $departement;
|
||||||
var $state_id; // Id of department
|
var $state_id; // Id of department
|
||||||
var $state_code; // Code of department
|
var $state_code; // Code of department
|
||||||
var $state; // Label of department
|
var $state; // Label of department
|
||||||
@ -80,7 +92,11 @@ class Contact extends CommonObject
|
|||||||
var $birthday;
|
var $birthday;
|
||||||
var $default_lang;
|
var $default_lang;
|
||||||
var $note_public; // Public note
|
var $note_public; // Public note
|
||||||
var $note; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_public, note_private
|
||||||
|
*/
|
||||||
|
var $note;
|
||||||
var $note_private; // Private note
|
var $note_private; // Private note
|
||||||
var $no_email; // 1=Don't send e-mail to this contact, 0=do
|
var $no_email; // 1=Don't send e-mail to this contact, 0=do
|
||||||
|
|
||||||
|
|||||||
@ -154,6 +154,7 @@ class Contrat extends CommonObject
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use fk_project instead
|
* @deprecated Use fk_project instead
|
||||||
|
* @see fk_project
|
||||||
*/
|
*/
|
||||||
var $fk_projet;
|
var $fk_projet;
|
||||||
|
|
||||||
@ -1642,6 +1643,8 @@ class Contrat extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function update_statut($user)
|
function update_statut($user)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
// If draft, we keep it (should not happen)
|
// If draft, we keep it (should not happen)
|
||||||
if ($this->statut == 0) return 1;
|
if ($this->statut == 0) return 1;
|
||||||
|
|
||||||
@ -2165,6 +2168,7 @@ class ContratLigne extends CommonObjectLine
|
|||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use $label instead
|
* @deprecated Use $label instead
|
||||||
|
* @see label
|
||||||
*/
|
*/
|
||||||
public $libelle;
|
public $libelle;
|
||||||
|
|
||||||
@ -2189,6 +2193,7 @@ class ContratLigne extends CommonObjectLine
|
|||||||
/**
|
/**
|
||||||
* @var float
|
* @var float
|
||||||
* @deprecated Use $price_ht instead
|
* @deprecated Use $price_ht instead
|
||||||
|
* @see price_ht
|
||||||
*/
|
*/
|
||||||
public $price;
|
public $price;
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
|
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
|
||||||
* Copyright (C) 2011-2014 Philippe Grand <philippe.grand@atoo-net.com>
|
* Copyright (C) 2011-2014 Philippe Grand <philippe.grand@atoo-net.com>
|
||||||
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
|
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
|
||||||
* Copyright (C) 2012-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
* Copyright (C) 2012-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||||
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
|
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -44,6 +44,7 @@ abstract class CommonObject
|
|||||||
/**
|
/**
|
||||||
* @var string Error string
|
* @var string Error string
|
||||||
* @deprecated Use instead the array of error strings
|
* @deprecated Use instead the array of error strings
|
||||||
|
* @see errors
|
||||||
*/
|
*/
|
||||||
public $error;
|
public $error;
|
||||||
|
|
||||||
@ -82,7 +83,7 @@ abstract class CommonObject
|
|||||||
public $errors=array();
|
public $errors=array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string Can be used to pass information when only object is provided to method
|
* @var string[] Can be used to pass information when only object is provided to method
|
||||||
*/
|
*/
|
||||||
public $context=array();
|
public $context=array();
|
||||||
|
|
||||||
@ -96,7 +97,24 @@ abstract class CommonObject
|
|||||||
public $lastname;
|
public $lastname;
|
||||||
public $firstname;
|
public $firstname;
|
||||||
public $civility_id;
|
public $civility_id;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see thirdparty
|
||||||
|
*/
|
||||||
|
public $client;
|
||||||
|
/**
|
||||||
|
* @var Societe
|
||||||
|
*/
|
||||||
public $thirdparty;
|
public $thirdparty;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see project
|
||||||
|
*/
|
||||||
|
public $projet;
|
||||||
|
/**
|
||||||
|
* @var Project
|
||||||
|
*/
|
||||||
|
public $project;
|
||||||
|
|
||||||
// No constructor as it is an abstract class
|
// No constructor as it is an abstract class
|
||||||
|
|
||||||
@ -1646,6 +1664,7 @@ abstract class CommonObject
|
|||||||
* @param string $note New value for note
|
* @param string $note New value for note
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see update_note()
|
||||||
*/
|
*/
|
||||||
function update_note_public($note)
|
function update_note_public($note)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -39,6 +39,7 @@ abstract class CommonObjectLine extends CommonObject
|
|||||||
* Id of the line
|
* Id of the line
|
||||||
* @var int
|
* @var int
|
||||||
* @deprecated Try to use id property as possible (even if field into database is still rowid)
|
* @deprecated Try to use id property as possible (even if field into database is still rowid)
|
||||||
|
* @see id
|
||||||
*/
|
*/
|
||||||
public $rowid;
|
public $rowid;
|
||||||
|
|
||||||
|
|||||||
@ -43,6 +43,7 @@ abstract class CommonOrderLine extends CommonObjectLine
|
|||||||
* Product ref
|
* Product ref
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use product_ref
|
* @deprecated Use product_ref
|
||||||
|
* @see product_ref
|
||||||
*/
|
*/
|
||||||
public $ref;
|
public $ref;
|
||||||
|
|
||||||
@ -56,6 +57,7 @@ abstract class CommonOrderLine extends CommonObjectLine
|
|||||||
* Product label
|
* Product label
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use product_label
|
* @deprecated Use product_label
|
||||||
|
* @see product_label
|
||||||
*/
|
*/
|
||||||
public $libelle;
|
public $libelle;
|
||||||
|
|
||||||
@ -78,7 +80,9 @@ abstract class CommonOrderLine extends CommonObjectLine
|
|||||||
public $qty;
|
public $qty;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* Unit price
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see subprice
|
||||||
*/
|
*/
|
||||||
var $price;
|
var $price;
|
||||||
|
|
||||||
|
|||||||
@ -859,6 +859,7 @@ class Form
|
|||||||
* @param int $limit Maximum number of elements
|
* @param int $limit Maximum number of elements
|
||||||
* @return string HTML string with
|
* @return string HTML string with
|
||||||
* @deprecated Use select_thirdparty instead
|
* @deprecated Use select_thirdparty instead
|
||||||
|
* @see select_thirdparty()
|
||||||
*/
|
*/
|
||||||
function select_company($selected='', $htmlname='socid', $filter='', $showempty=0, $showtype=0, $forcecombo=0, $events=array(), $limit=0)
|
function select_company($selected='', $htmlname='socid', $filter='', $showempty=0, $showtype=0, $forcecombo=0, $events=array(), $limit=0)
|
||||||
{
|
{
|
||||||
@ -1228,6 +1229,7 @@ class Form
|
|||||||
* @param int $force_entity 0 or Id of environment to force
|
* @param int $force_entity 0 or Id of environment to force
|
||||||
* @return void
|
* @return void
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see select_dolusers()
|
||||||
*/
|
*/
|
||||||
function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
|
function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
|
||||||
{
|
{
|
||||||
@ -1466,7 +1468,7 @@ class Form
|
|||||||
$assignedtouser=array();
|
$assignedtouser=array();
|
||||||
if (!empty($_SESSION['assignedtouser']))
|
if (!empty($_SESSION['assignedtouser']))
|
||||||
{
|
{
|
||||||
$assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true);
|
$assignedtouser=json_decode($_SESSION['assignedtouser'], true);
|
||||||
}
|
}
|
||||||
$nbassignetouser=count($assignedtouser);
|
$nbassignetouser=count($assignedtouser);
|
||||||
|
|
||||||
@ -3035,6 +3037,7 @@ class Form
|
|||||||
* @param int $width Force width of box
|
* @param int $width Force width of box
|
||||||
* @return void
|
* @return void
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see formconfirm()
|
||||||
*/
|
*/
|
||||||
function form_confirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=170, $width=500)
|
function form_confirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=170, $width=500)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -423,6 +423,7 @@ class FormCompany
|
|||||||
* @param string $filter Add a SQL filter on list
|
* @param string $filter Add a SQL filter on list
|
||||||
* @return void
|
* @return void
|
||||||
* @deprecated Use print xxx->select_juridicalstatus instead
|
* @deprecated Use print xxx->select_juridicalstatus instead
|
||||||
|
* @see select_juridicalstatus()
|
||||||
*/
|
*/
|
||||||
function select_forme_juridique($selected='', $country_codeid=0, $filter='')
|
function select_forme_juridique($selected='', $country_codeid=0, $filter='')
|
||||||
{
|
{
|
||||||
|
|||||||
@ -249,7 +249,7 @@ class FormFile
|
|||||||
* @param string $modelselected Model to preselect by default
|
* @param string $modelselected Model to preselect by default
|
||||||
* @param string $allowgenifempty Allow generation even if list of template ($genallowed) is empty (show however a warning)
|
* @param string $allowgenifempty Allow generation even if list of template ($genallowed) is empty (show however a warning)
|
||||||
* @param string $forcenomultilang Do not show language option (even if MAIN_MULTILANGS defined)
|
* @param string $forcenomultilang Do not show language option (even if MAIN_MULTILANGS defined)
|
||||||
* @param int $iconPDF Obsolete, see getDocumentsLink
|
* @param int $iconPDF Deprecated, see getDocumentsLink
|
||||||
* @param int $maxfilenamelength Max length for filename shown
|
* @param int $maxfilenamelength Max length for filename shown
|
||||||
* @param string $noform Do not output html form tags
|
* @param string $noform Do not output html form tags
|
||||||
* @param string $param More param on http links
|
* @param string $param More param on http links
|
||||||
@ -261,6 +261,11 @@ class FormFile
|
|||||||
*/
|
*/
|
||||||
function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='')
|
function showdocuments($modulepart,$modulesubdir,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$morepicto='')
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if (0 !== $iconPDF) {
|
||||||
|
dol_syslog(__METHOD__ . ": passing iconPDF parameter is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
global $langs, $conf, $user, $hookmanager;
|
global $langs, $conf, $user, $hookmanager;
|
||||||
global $form, $bc;
|
global $form, $bc;
|
||||||
|
|
||||||
|
|||||||
@ -48,7 +48,16 @@ class FormMail extends Form
|
|||||||
|
|
||||||
var $withsubstit; // Show substitution array
|
var $withsubstit; // Show substitution array
|
||||||
var $withfrom;
|
var $withfrom;
|
||||||
var $withto; // Show recipient emails
|
/**
|
||||||
|
* @var int
|
||||||
|
* @deprecated Fill withto with array before calling method.
|
||||||
|
* @see withto
|
||||||
|
*/
|
||||||
|
public $withtosocid;
|
||||||
|
/**
|
||||||
|
* @var int|int[]
|
||||||
|
*/
|
||||||
|
public $withto; // Show recipient emails
|
||||||
var $withtofree; // Show free text for recipient emails
|
var $withtofree; // Show free text for recipient emails
|
||||||
var $withtocc;
|
var $withtocc;
|
||||||
var $withtoccc;
|
var $withtoccc;
|
||||||
|
|||||||
@ -592,6 +592,7 @@ class FormOther
|
|||||||
* @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
|
* @param array $arrayofcolors Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
|
||||||
* @return void
|
* @return void
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see selectColor()
|
||||||
*/
|
*/
|
||||||
function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
|
function select_color($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='')
|
||||||
{
|
{
|
||||||
@ -611,6 +612,11 @@ class FormOther
|
|||||||
*/
|
*/
|
||||||
function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
|
function selectColor($set_color='', $prefix='f_color', $form_name='', $showcolorbox=1, $arrayofcolors='', $morecss='')
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if ($form_name) {
|
||||||
|
dol_syslog(__METHOD__ . ": form_name parameter is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
global $langs,$conf;
|
global $langs,$conf;
|
||||||
|
|
||||||
$out='';
|
$out='';
|
||||||
|
|||||||
@ -707,6 +707,7 @@ class Translate
|
|||||||
* @param string $amount If not '', show currency + amount according to langs ($10, 10€).
|
* @param string $amount If not '', show currency + amount according to langs ($10, 10€).
|
||||||
* @return string Amount + Currency symbol encoded into UTF8
|
* @return string Amount + Currency symbol encoded into UTF8
|
||||||
* @deprecated Use method price to output a price
|
* @deprecated Use method price to output a price
|
||||||
|
* @see price()
|
||||||
*/
|
*/
|
||||||
function getCurrencyAmount($currency_code, $amount)
|
function getCurrencyAmount($currency_code, $amount)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -278,8 +278,8 @@ function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengt
|
|||||||
* YYYYMMDDHHMMSS
|
* YYYYMMDDHHMMSS
|
||||||
* YYYYMMDDTHHMMSSZ
|
* YYYYMMDDTHHMMSSZ
|
||||||
* YYYY-MM-DDTHH:MM:SSZ (RFC3339)
|
* YYYY-MM-DDTHH:MM:SSZ (RFC3339)
|
||||||
* DD/MM/YY or DD/MM/YYYY (this format should not be used anymore)
|
* DD/MM/YY or DD/MM/YYYY (deprecated)
|
||||||
* DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (this format should not be used anymore)
|
* DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (deprecated)
|
||||||
* @param int $gm 1 =Input date is GM date,
|
* @param int $gm 1 =Input date is GM date,
|
||||||
* 0 =Input date is local date using PHP server timezone
|
* 0 =Input date is local date using PHP server timezone
|
||||||
* @return int Date as a timestamp
|
* @return int Date as a timestamp
|
||||||
@ -292,7 +292,7 @@ function dol_stringtotime($string, $gm=1)
|
|||||||
// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
|
// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
|
||||||
if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$string,$reg))
|
if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$string,$reg))
|
||||||
{
|
{
|
||||||
dol_syslog("dol_stringtotime call to function with deprecated parameter", LOG_WARNING);
|
dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
|
||||||
// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
|
// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
|
||||||
// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
|
// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
|
||||||
$sday = $reg[1];
|
$sday = $reg[1];
|
||||||
|
|||||||
@ -45,10 +45,13 @@ include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
|
|||||||
* @param string $class Class name
|
* @param string $class Class name
|
||||||
* @param string $member Name of property
|
* @param string $member Name of property
|
||||||
* @return mixed Return value of static property
|
* @return mixed Return value of static property
|
||||||
* @deprecated Dolibarr now requires 5.3.0+
|
* @deprecated Dolibarr now requires 5.3.0+, use $class::$property syntax
|
||||||
|
* @see https://php.net/manual/language.oop5.static.php
|
||||||
*/
|
*/
|
||||||
function getStaticMember($class, $member)
|
function getStaticMember($class, $member)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
// This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member
|
// This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member
|
||||||
/*if (version_compare(phpversion(), '5.3.0', '<'))
|
/*if (version_compare(phpversion(), '5.3.0', '<'))
|
||||||
{
|
{
|
||||||
@ -387,11 +390,12 @@ function dol_buildpath($path, $type=0)
|
|||||||
*
|
*
|
||||||
* @param object $object Object to clone
|
* @param object $object Object to clone
|
||||||
* @return object Object clone
|
* @return object Object clone
|
||||||
* @deprecated Dolibarr no longer supports PHP4, you can now use native function
|
* @deprecated Dolibarr no longer supports PHP4, use PHP5 native clone construct
|
||||||
|
* @see https://php.net/manual/language.oop5.cloning.php
|
||||||
*/
|
*/
|
||||||
function dol_clone($object)
|
function dol_clone($object)
|
||||||
{
|
{
|
||||||
dol_syslog("Functions.lib::dol_clone Clone object");
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
$myclone=clone($object);
|
$myclone=clone($object);
|
||||||
return $myclone;
|
return $myclone;
|
||||||
@ -1721,11 +1725,15 @@ function dol_substr($string,$start,$length,$stringencoding='')
|
|||||||
* @param string $url Param to add an url to click values
|
* @param string $url Param to add an url to click values
|
||||||
* @return void
|
* @return void
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see DolGraph
|
||||||
*/
|
*/
|
||||||
function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0,$url='')
|
function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0,$url='')
|
||||||
{
|
{
|
||||||
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
global $theme_datacolor; // To have var kept when function is called several times
|
global $theme_datacolor; // To have var kept when function is called several times
|
||||||
|
|
||||||
if (empty($conf->use_javascript_ajax)) return;
|
if (empty($conf->use_javascript_ajax)) return;
|
||||||
$jsgraphlib='flot';
|
$jsgraphlib='flot';
|
||||||
$datacolor=array();
|
$datacolor=array();
|
||||||
@ -2399,9 +2407,12 @@ function img_mime($file, $titlealt = '')
|
|||||||
* @param int $option Option
|
* @param int $option Option
|
||||||
* @return string Return img tag
|
* @return string Return img tag
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see img_picto
|
||||||
*/
|
*/
|
||||||
function img_phone($titlealt = 'default', $option = 0)
|
function img_phone($titlealt = 'default', $option = 0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
|
|
||||||
if ($titlealt == 'default') $titlealt = $langs->trans('Call');
|
if ($titlealt == 'default') $titlealt = $langs->trans('Call');
|
||||||
@ -2721,9 +2732,12 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
|
|||||||
* @param string $title Title to show
|
* @param string $title Title to show
|
||||||
* @return string Title to show
|
* @return string Title to show
|
||||||
* @deprecated Use print_fiche_titre instead
|
* @deprecated Use print_fiche_titre instead
|
||||||
|
* @see print_fiche_titre
|
||||||
*/
|
*/
|
||||||
function print_titre($title)
|
function print_titre($title)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
print '<div class="titre">'.$title.'</div>';
|
print '<div class="titre">'.$title.'</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4079,9 +4093,12 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
|
|||||||
*
|
*
|
||||||
* @return float Time (millisecondes) with microsecondes in decimal part
|
* @return float Time (millisecondes) with microsecondes in decimal part
|
||||||
* @deprecated Dolibarr does not support PHP4, you should use native function
|
* @deprecated Dolibarr does not support PHP4, you should use native function
|
||||||
|
* @see microtime()
|
||||||
*/
|
*/
|
||||||
function dol_microtime_float()
|
function dol_microtime_float()
|
||||||
{
|
{
|
||||||
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return microtime(true);
|
return microtime(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4301,6 +4318,8 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
|
|||||||
*/
|
*/
|
||||||
function setEventMessage($mesgs, $style='mesgs')
|
function setEventMessage($mesgs, $style='mesgs')
|
||||||
{
|
{
|
||||||
|
dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
if (! is_array($mesgs)) // If mesgs is a string
|
if (! is_array($mesgs)) // If mesgs is a string
|
||||||
{
|
{
|
||||||
if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
|
if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
|
||||||
|
|||||||
@ -42,6 +42,7 @@ if (! function_exists('json_encode'))
|
|||||||
*
|
*
|
||||||
* @param mixed $elements PHP Object to json encode
|
* @param mixed $elements PHP Object to json encode
|
||||||
* @return string Json encoded string
|
* @return string Json encoded string
|
||||||
|
* @deprecated PHP >= 5.3 supports native json_encode
|
||||||
*/
|
*/
|
||||||
function dol_json_encode($elements)
|
function dol_json_encode($elements)
|
||||||
{
|
{
|
||||||
@ -219,6 +220,7 @@ if (! function_exists('json_decode'))
|
|||||||
* @param string $json Json encoded to PHP Object or Array
|
* @param string $json Json encoded to PHP Object or Array
|
||||||
* @param bool $assoc False return an object, true return an array. Try to always use it with true !
|
* @param bool $assoc False return an object, true return an array. Try to always use it with true !
|
||||||
* @return mixed Object or Array or false on error
|
* @return mixed Object or Array or false on error
|
||||||
|
* @deprecated PHP >= 5.3 supports native json_decode
|
||||||
*/
|
*/
|
||||||
function dol_json_decode($json, $assoc=false)
|
function dol_json_decode($json, $assoc=false)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -42,6 +42,7 @@ abstract class DolibarrModules
|
|||||||
/**
|
/**
|
||||||
* @var string Relative path to module style sheet
|
* @var string Relative path to module style sheet
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see module_parts
|
||||||
*/
|
*/
|
||||||
public $style_sheet = '';
|
public $style_sheet = '';
|
||||||
|
|
||||||
|
|||||||
@ -156,10 +156,13 @@ abstract class ModeleNumRefAskPriceSupplier
|
|||||||
* @param int $hidedesc Hide description
|
* @param int $hidedesc Hide description
|
||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Propal class
|
* @deprecated Use the new function generateDocument of AskPriceSupplier class
|
||||||
|
* @see AskPriceSupplier::generateDocument()
|
||||||
*/
|
*/
|
||||||
function askpricesupplier_pdf_create(DoliDB $db, AskPriceSupplier $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function askpricesupplier_pdf_create(DoliDB $db, AskPriceSupplier $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -161,8 +161,11 @@ abstract class ModeleNumRefCommandes
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Commande class
|
* @deprecated Use the new function generateDocument of Commande class
|
||||||
|
* @see Commande::generateDocument()
|
||||||
*/
|
*/
|
||||||
function commande_pdf_create(DoliDB $db, Commande $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function commande_pdf_create(DoliDB $db, Commande $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -156,8 +156,11 @@ class ModelNumRefContracts
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Contrat class
|
* @deprecated Use the new function generateDocument of Contrat class
|
||||||
|
* @see Contrat::generateDocument()
|
||||||
*/
|
*/
|
||||||
function contract_pdf_create(DoliDB $db, Contrat $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function contract_pdf_create(DoliDB $db, Contrat $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -154,8 +154,11 @@ abstract class ModelNumRefExpedition
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 1 if OK -1 if KO
|
* @return int 1 if OK -1 if KO
|
||||||
* @deprecated Use the new function generateDocument of Expedition class
|
* @deprecated Use the new function generateDocument of Expedition class
|
||||||
|
* @see Expedition::generateDocument()
|
||||||
*/
|
*/
|
||||||
function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -156,9 +156,12 @@ abstract class ModeleNumRefFactures
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int <0 if KO, >0 if OK
|
* @return int <0 if KO, >0 if OK
|
||||||
* @deprecated Use the new function generateDocument of Facture class
|
* @deprecated Use the new function generateDocument of Facture class
|
||||||
|
* @see Facture::generateDocument()
|
||||||
*/
|
*/
|
||||||
function facture_pdf_create(DoliDB $db, Facture $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function facture_pdf_create(DoliDB $db, Facture $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -156,9 +156,12 @@ abstract class ModeleNumRefDeliveryOrder
|
|||||||
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
* @param Translate $outputlangs objet lang a utiliser pour traduction
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Livraison class
|
* @deprecated Use the new function generateDocument of Livraison class
|
||||||
|
* @see Livraison::generateDocument()
|
||||||
*/
|
*/
|
||||||
function delivery_order_pdf_create(DoliDB $db, Livraison $object, $modele, $outputlangs='')
|
function delivery_order_pdf_create(DoliDB $db, Livraison $object, $modele, $outputlangs='')
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs);
|
return $object->generateDocument($modele, $outputlangs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -153,6 +153,11 @@ class mailing_fraise extends MailingTargets
|
|||||||
*/
|
*/
|
||||||
function add_to_target($mailing_id,$filtersarray=array())
|
function add_to_target($mailing_id,$filtersarray=array())
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if ($filtersarray) {
|
||||||
|
dol_syslog(__METHOD__ . ": filtersarray parameter is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
global $langs,$_POST;
|
global $langs,$_POST;
|
||||||
$langs->load("members");
|
$langs->load("members");
|
||||||
$langs->load("companies");
|
$langs->load("companies");
|
||||||
|
|||||||
@ -153,9 +153,12 @@ abstract class ModeleNumRefProjects
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Project class
|
* @deprecated Use the new function generateDocument of Project class
|
||||||
|
* @see Project::generateDocument()
|
||||||
*/
|
*/
|
||||||
function project_pdf_create(DoliDB $db, Project $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function project_pdf_create(DoliDB $db, Project $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -154,9 +154,12 @@ abstract class ModeleNumRefTask
|
|||||||
* @param HookManager $hookmanager Hook manager instance
|
* @param HookManager $hookmanager Hook manager instance
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Task class
|
* @deprecated Use the new function generateDocument of Task class
|
||||||
|
* @see Task::generateDocument()
|
||||||
*/
|
*/
|
||||||
function task_pdf_create(DoliDB $db, Task $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
|
function task_pdf_create(DoliDB $db, Task $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -157,9 +157,12 @@ abstract class ModeleNumRefPropales
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of Propal class
|
* @deprecated Use the new function generateDocument of Propal class
|
||||||
|
* @see Propal::generateDocument()
|
||||||
*/
|
*/
|
||||||
function propale_pdf_create(DoliDB $db, Propal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function propale_pdf_create(DoliDB $db, Propal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -151,9 +151,12 @@ abstract class ModeleNumRefSuppliersOrders
|
|||||||
* @param int $hideref Hide ref
|
* @param int $hideref Hide ref
|
||||||
* @return int 0 if KO, 1 if OK
|
* @return int 0 if KO, 1 if OK
|
||||||
* @deprecated Use the new function generateDocument of CommandeFournisseur class
|
* @deprecated Use the new function generateDocument of CommandeFournisseur class
|
||||||
|
* @see CommandeFournisseur::generateDocument()
|
||||||
*/
|
*/
|
||||||
function supplier_order_pdf_create(DoliDB $db, CommandeFournisseur $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
function supplier_order_pdf_create(DoliDB $db, CommandeFournisseur $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -61,6 +61,7 @@ abstract class DolibarrTriggers
|
|||||||
* Error reported by the trigger
|
* Error reported by the trigger
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use $this->errors
|
* @deprecated Use $this->errors
|
||||||
|
* @see errors
|
||||||
*/
|
*/
|
||||||
public $error = '';
|
public $error = '';
|
||||||
|
|
||||||
|
|||||||
@ -63,6 +63,11 @@ class Don extends CommonObject
|
|||||||
var $modelpdf;
|
var $modelpdf;
|
||||||
var $projet;
|
var $projet;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
|
*/
|
||||||
|
var $commentaire;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
|||||||
@ -49,6 +49,12 @@ class PaymentDonation extends CommonObject
|
|||||||
var $fk_user_creat;
|
var $fk_user_creat;
|
||||||
var $fk_user_modif;
|
var $fk_user_modif;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see amount, amounts
|
||||||
|
*/
|
||||||
|
var $total;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
|
|||||||
@ -77,7 +77,21 @@ class Expedition extends CommonObject
|
|||||||
var $trueSize;
|
var $trueSize;
|
||||||
|
|
||||||
var $date_delivery; // Date delivery planed
|
var $date_delivery; // Date delivery planed
|
||||||
var $date_expedition; // Date delivery real
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see date_shipping
|
||||||
|
*/
|
||||||
|
var $date;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see date_shipping
|
||||||
|
*/
|
||||||
|
var $date_expedition;
|
||||||
|
/**
|
||||||
|
* Effective delivery date
|
||||||
|
* @var int
|
||||||
|
*/
|
||||||
|
public $date_shipping;
|
||||||
var $date_creation;
|
var $date_creation;
|
||||||
var $date_valid;
|
var $date_valid;
|
||||||
|
|
||||||
@ -459,8 +473,8 @@ class Expedition extends CommonObject
|
|||||||
$this->statut = $obj->fk_statut;
|
$this->statut = $obj->fk_statut;
|
||||||
$this->user_author_id = $obj->fk_user_author;
|
$this->user_author_id = $obj->fk_user_author;
|
||||||
$this->date_creation = $this->db->jdate($obj->date_creation);
|
$this->date_creation = $this->db->jdate($obj->date_creation);
|
||||||
$this->date = $this->db->jdate($obj->date_expedition); // TODO obsolete
|
$this->date = $this->db->jdate($obj->date_expedition); // TODO deprecated
|
||||||
$this->date_expedition = $this->db->jdate($obj->date_expedition); // TODO obsolete
|
$this->date_expedition = $this->db->jdate($obj->date_expedition); // TODO deprecated
|
||||||
$this->date_shipping = $this->db->jdate($obj->date_expedition); // Date real
|
$this->date_shipping = $this->db->jdate($obj->date_expedition); // Date real
|
||||||
$this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planed
|
$this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planed
|
||||||
$this->fk_delivery_address = $obj->fk_address;
|
$this->fk_delivery_address = $obj->fk_address;
|
||||||
@ -1708,9 +1722,10 @@ class ExpeditionLigne
|
|||||||
|
|
||||||
// From llx_commandedet or llx_propaldet
|
// From llx_commandedet or llx_propaldet
|
||||||
var $qty_asked;
|
var $qty_asked;
|
||||||
var $libelle; // Label produit
|
public $product_ref;
|
||||||
var $product_desc; // Description produit
|
public $product_label;
|
||||||
var $ref;
|
public $product_desc;
|
||||||
|
|
||||||
|
|
||||||
// Invoicing
|
// Invoicing
|
||||||
var $remise_percent;
|
var $remise_percent;
|
||||||
@ -1720,6 +1735,24 @@ class ExpeditionLigne
|
|||||||
var $total_localtax1; // Total Local tax 1
|
var $total_localtax1; // Total Local tax 1
|
||||||
var $total_localtax2; // Total Local tax 2
|
var $total_localtax2; // Total Local tax 2
|
||||||
|
|
||||||
|
public $fk_origin_line;
|
||||||
|
|
||||||
|
// Deprecated
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see fk_origin_line
|
||||||
|
*/
|
||||||
|
var $origin_line_id;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_ref
|
||||||
|
*/
|
||||||
|
var $ref;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_label
|
||||||
|
*/
|
||||||
|
var $libelle;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
|||||||
@ -37,13 +37,8 @@ if (! defined('EURO')) define('EURO',chr(128));
|
|||||||
// Define syslog constants
|
// Define syslog constants
|
||||||
if (! defined('LOG_DEBUG'))
|
if (! defined('LOG_DEBUG'))
|
||||||
{
|
{
|
||||||
if (function_exists("define_syslog_variables"))
|
if (! function_exists("syslog")) {
|
||||||
{
|
// For PHP versions without syslog (like running on Windows OS)
|
||||||
define_syslog_variables(); // Deprecated since php 5.3.0, syslog variables no longer need to be initialized
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Pour PHP sans syslog (comme sous Windows)
|
|
||||||
define('LOG_EMERG',0);
|
define('LOG_EMERG',0);
|
||||||
define('LOG_ALERT',1);
|
define('LOG_ALERT',1);
|
||||||
define('LOG_CRIT',2);
|
define('LOG_CRIT',2);
|
||||||
|
|||||||
@ -55,6 +55,7 @@ class CommandeFournisseur extends CommonOrder
|
|||||||
/**
|
/**
|
||||||
* TODO: Remove
|
* TODO: Remove
|
||||||
* @deprecated
|
* @deprecated
|
||||||
|
* @see product_ref
|
||||||
*/
|
*/
|
||||||
var $ref;
|
var $ref;
|
||||||
var $product_ref;
|
var $product_ref;
|
||||||
@ -78,8 +79,13 @@ class CommandeFournisseur extends CommonOrder
|
|||||||
var $total_localtax2; // Total Local tax 2
|
var $total_localtax2; // Total Local tax 2
|
||||||
var $total_ttc;
|
var $total_ttc;
|
||||||
var $source;
|
var $source;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
|
*/
|
||||||
var $note;
|
var $note;
|
||||||
var $note_public;
|
public $note_private;
|
||||||
|
public $note_public;
|
||||||
var $model_pdf;
|
var $model_pdf;
|
||||||
var $fk_project;
|
var $fk_project;
|
||||||
var $cond_reglement_id;
|
var $cond_reglement_id;
|
||||||
@ -2465,6 +2471,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
|
|||||||
* Supplier ref
|
* Supplier ref
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use ref_supplier
|
* @deprecated Use ref_supplier
|
||||||
|
* @see ref_supplier
|
||||||
*/
|
*/
|
||||||
public $ref_fourn;
|
public $ref_fourn;
|
||||||
|
|
||||||
|
|||||||
@ -58,12 +58,9 @@ class FactureFournisseur extends CommonInvoice
|
|||||||
var $type = self::TYPE_STANDARD;
|
var $type = self::TYPE_STANDARD;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check constants for more info:
|
* Supplier invoice status
|
||||||
* - STATUS_DRAFT
|
|
||||||
* - STATUS_VALIDATED
|
|
||||||
* - STATUS_PAID
|
|
||||||
* - STATUS_ABANDONED
|
|
||||||
* @var int
|
* @var int
|
||||||
|
* @see FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_PAID, FactureFournisseur::STATUS_ABANDONED
|
||||||
*/
|
*/
|
||||||
var $statut;
|
var $statut;
|
||||||
//! 1 si facture payee COMPLETEMENT, 0 sinon (ce champ ne devrait plus servir car insuffisant)
|
//! 1 si facture payee COMPLETEMENT, 0 sinon (ce champ ne devrait plus servir car insuffisant)
|
||||||
@ -85,7 +82,11 @@ class FactureFournisseur extends CommonInvoice
|
|||||||
var $total_localtax1;
|
var $total_localtax1;
|
||||||
var $total_localtax2;
|
var $total_localtax2;
|
||||||
var $total_ttc;
|
var $total_ttc;
|
||||||
var $note; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_private, note_public
|
||||||
|
*/
|
||||||
|
var $note;
|
||||||
var $note_private;
|
var $note_private;
|
||||||
var $note_public;
|
var $note_public;
|
||||||
var $propalid;
|
var $propalid;
|
||||||
@ -100,7 +101,10 @@ class FactureFournisseur extends CommonInvoice
|
|||||||
* @var SupplierInvoiceLine[]
|
* @var SupplierInvoiceLine[]
|
||||||
*/
|
*/
|
||||||
public $lines = array();
|
public $lines = array();
|
||||||
var $fournisseur; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
*/
|
||||||
|
var $fournisseur;
|
||||||
|
|
||||||
//Incorterms
|
//Incorterms
|
||||||
var $fk_incoterms;
|
var $fk_incoterms;
|
||||||
@ -1896,9 +1900,17 @@ class SupplierInvoiceLine extends CommonObjectLine
|
|||||||
|
|
||||||
var $oldline;
|
var $oldline;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_ref
|
||||||
|
*/
|
||||||
public $ref;
|
public $ref;
|
||||||
public $product_ref;
|
public $product_ref;
|
||||||
public $ref_supplier;
|
public $ref_supplier;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see label
|
||||||
|
*/
|
||||||
public $libelle;
|
public $libelle;
|
||||||
public $product_desc;
|
public $product_desc;
|
||||||
|
|
||||||
@ -1906,8 +1918,10 @@ class SupplierInvoiceLine extends CommonObjectLine
|
|||||||
* Unit price before taxes
|
* Unit price before taxes
|
||||||
* @var float
|
* @var float
|
||||||
* @deprecated Use $subprice
|
* @deprecated Use $subprice
|
||||||
|
* @see subprice
|
||||||
*/
|
*/
|
||||||
public $pu_ht;
|
public $pu_ht;
|
||||||
|
public $subprice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unit price included taxes
|
* Unit price included taxes
|
||||||
@ -1919,8 +1933,10 @@ class SupplierInvoiceLine extends CommonObjectLine
|
|||||||
* Total VAT amount
|
* Total VAT amount
|
||||||
* @var float
|
* @var float
|
||||||
* @deprecated Use $total_tva instead
|
* @deprecated Use $total_tva instead
|
||||||
|
* @see total_tva
|
||||||
*/
|
*/
|
||||||
public $tva;
|
public $tva;
|
||||||
|
public $total_tva;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Id of the corresponding supplier invoice
|
* Id of the corresponding supplier invoice
|
||||||
@ -1932,7 +1948,7 @@ class SupplierInvoiceLine extends CommonObjectLine
|
|||||||
* Product label
|
* Product label
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
var $label; // deprecated
|
var $label;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Description of the line
|
* Description of the line
|
||||||
|
|||||||
@ -42,7 +42,11 @@ class ProductFournisseur extends Product
|
|||||||
var $product_fourn_price_id; // id of ligne product-supplier
|
var $product_fourn_price_id; // id of ligne product-supplier
|
||||||
|
|
||||||
var $id; // product id
|
var $id; // product id
|
||||||
var $fourn_ref; // deprecated
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see ref_supplier
|
||||||
|
*/
|
||||||
|
var $fourn_ref;
|
||||||
var $delivery_time_days;
|
var $delivery_time_days;
|
||||||
var $ref_supplier; // ref supplier (can be set by get_buyprice)
|
var $ref_supplier; // ref supplier (can be set by get_buyprice)
|
||||||
var $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
|
var $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
|
||||||
@ -348,7 +352,8 @@ class ProductFournisseur extends Product
|
|||||||
if ($obj)
|
if ($obj)
|
||||||
{
|
{
|
||||||
$this->product_fourn_price_id = $rowid;
|
$this->product_fourn_price_id = $rowid;
|
||||||
$this->fourn_ref = $obj->ref_fourn;
|
$this->fourn_ref = $obj->ref_fourn; // deprecated
|
||||||
|
$this->ref_supplier = $obj->ref_fourn;
|
||||||
$this->fourn_price = $obj->price;
|
$this->fourn_price = $obj->price;
|
||||||
$this->fourn_charges = $obj->charges;
|
$this->fourn_charges = $obj->charges;
|
||||||
$this->fourn_qty = $obj->quantity;
|
$this->fourn_qty = $obj->quantity;
|
||||||
|
|||||||
@ -38,6 +38,10 @@ class Holiday extends CommonObject
|
|||||||
var $error;
|
var $error;
|
||||||
var $errors=array();
|
var $errors=array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see id
|
||||||
|
*/
|
||||||
var $rowid;
|
var $rowid;
|
||||||
var $ref;
|
var $ref;
|
||||||
|
|
||||||
|
|||||||
@ -52,6 +52,11 @@ class Livraison extends CommonObject
|
|||||||
var $ref_customer;
|
var $ref_customer;
|
||||||
var $statut;
|
var $statut;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see note_public, note_private
|
||||||
|
*/
|
||||||
|
var $note;
|
||||||
var $note_public;
|
var $note_public;
|
||||||
var $note_private;
|
var $note_private;
|
||||||
|
|
||||||
@ -1014,10 +1019,8 @@ class Livraison extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* Classe de gestion des lignes de bons de livraison
|
* Classe de gestion des lignes de bons de livraison
|
||||||
*/
|
*/
|
||||||
class LivraisonLigne
|
class LivraisonLigne extends CommonObjectLine
|
||||||
{
|
{
|
||||||
var $db;
|
|
||||||
|
|
||||||
// From llx_expeditiondet
|
// From llx_expeditiondet
|
||||||
var $qty;
|
var $qty;
|
||||||
var $qty_asked;
|
var $qty_asked;
|
||||||
@ -1027,7 +1030,19 @@ class LivraisonLigne
|
|||||||
var $origin_id;
|
var $origin_id;
|
||||||
var $label; // Label produit
|
var $label; // Label produit
|
||||||
var $description; // Description produit
|
var $description; // Description produit
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_ref
|
||||||
|
*/
|
||||||
var $ref;
|
var $ref;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see product_label;
|
||||||
|
*/
|
||||||
|
var $libelle;
|
||||||
|
|
||||||
|
public $product_ref;
|
||||||
|
public $product_label;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
|||||||
@ -52,6 +52,12 @@ class PaymentLoan extends CommonObject
|
|||||||
var $fk_user_creat;
|
var $fk_user_creat;
|
||||||
var $fk_user_modif;
|
var $fk_user_modif;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see amount, amounts
|
||||||
|
*/
|
||||||
|
var $total;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
|
|||||||
@ -43,7 +43,12 @@ class Opensurveysondage extends CommonObject
|
|||||||
var $id;
|
var $id;
|
||||||
|
|
||||||
var $id_sondage;
|
var $id_sondage;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see description
|
||||||
|
*/
|
||||||
var $commentaires;
|
var $commentaires;
|
||||||
|
public $description;
|
||||||
|
|
||||||
var $mail_admin;
|
var $mail_admin;
|
||||||
var $nom_admin;
|
var $nom_admin;
|
||||||
|
|||||||
@ -59,6 +59,11 @@ class Product extends CommonObject
|
|||||||
var $id ;
|
var $id ;
|
||||||
//! Ref
|
//! Ref
|
||||||
var $ref;
|
var $ref;
|
||||||
|
/*
|
||||||
|
* @deprecated
|
||||||
|
* @see label
|
||||||
|
*/
|
||||||
|
var $libelle;
|
||||||
/**
|
/**
|
||||||
* Product label
|
* Product label
|
||||||
* @var string
|
* @var string
|
||||||
@ -183,6 +188,20 @@ class Product extends CommonObject
|
|||||||
|
|
||||||
var $fk_price_expression;
|
var $fk_price_expression;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see fourn_pu
|
||||||
|
*/
|
||||||
|
var $buyprice;
|
||||||
|
public $fourn_pu;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see ref_supplier
|
||||||
|
*/
|
||||||
|
var $ref_fourn;
|
||||||
|
public $ref_supplier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unit code ('km', 'm', 'l', 'p', ...)
|
* Unit code ('km', 'm', 'l', 'p', ...)
|
||||||
* @var string
|
* @var string
|
||||||
@ -817,6 +836,11 @@ class Product extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function delete($id=0)
|
function delete($id=0)
|
||||||
{
|
{
|
||||||
|
// Deprecation warning
|
||||||
|
if (0 == $id) {
|
||||||
|
dol_syslog(__METHOD__ . " with parameter is deprecated", LOG_WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
global $conf,$user,$langs;
|
global $conf,$user,$langs;
|
||||||
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
|
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
|
||||||
|
|
||||||
@ -1252,7 +1276,7 @@ class Product extends CommonObject
|
|||||||
$obj->price = $price_result;
|
$obj->price = $price_result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->buyprice = $obj->price; // \deprecated
|
$this->buyprice = $obj->price; // deprecated
|
||||||
$this->fourn_pu = $obj->price / $obj->quantity; // Prix unitaire du produit pour le fournisseur $fourn_id
|
$this->fourn_pu = $obj->price / $obj->quantity; // Prix unitaire du produit pour le fournisseur $fourn_id
|
||||||
$this->ref_fourn = $obj->ref_fourn; // Ref supplier
|
$this->ref_fourn = $obj->ref_fourn; // Ref supplier
|
||||||
$this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
|
$this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
|
||||||
|
|||||||
@ -46,6 +46,12 @@ class Project extends CommonObject
|
|||||||
var $id;
|
var $id;
|
||||||
var $ref;
|
var $ref;
|
||||||
var $description;
|
var $description;
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
* @deprecated
|
||||||
|
* @see title
|
||||||
|
*/
|
||||||
|
public $titre;
|
||||||
var $title;
|
var $title;
|
||||||
var $date_start;
|
var $date_start;
|
||||||
var $date_end;
|
var $date_end;
|
||||||
@ -66,6 +72,27 @@ class Project extends CommonObject
|
|||||||
var $weekWorkLoad; // Used to store workload details of a projet
|
var $weekWorkLoad; // Used to store workload details of a projet
|
||||||
var $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
|
var $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var int Creation date
|
||||||
|
* @deprecated
|
||||||
|
* @see date_c
|
||||||
|
*/
|
||||||
|
public $datec;
|
||||||
|
/**
|
||||||
|
* @var int Creation date
|
||||||
|
*/
|
||||||
|
public $date_c;
|
||||||
|
/**
|
||||||
|
* @var int Modification date
|
||||||
|
* @deprecated
|
||||||
|
* @see date_m
|
||||||
|
*/
|
||||||
|
public $datem;
|
||||||
|
/**
|
||||||
|
* @var int Modification date
|
||||||
|
*/
|
||||||
|
public $date_m;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
|||||||
@ -606,9 +606,9 @@ class Resource extends CommonObject
|
|||||||
* Fetch all resources available, declared by modules
|
* Fetch all resources available, declared by modules
|
||||||
* Load available resource in array $this->available_resources
|
* Load available resource in array $this->available_resources
|
||||||
*
|
*
|
||||||
* note : deprecated, remplaced by hook getElementResources
|
|
||||||
*
|
|
||||||
* @return int number of available resources declared by modules
|
* @return int number of available resources declared by modules
|
||||||
|
* @deprecated, remplaced by hook getElementResources
|
||||||
|
* @see getElementResources()
|
||||||
*/
|
*/
|
||||||
function fetch_all_available() {
|
function fetch_all_available() {
|
||||||
global $conf;
|
global $conf;
|
||||||
|
|||||||
@ -52,6 +52,8 @@ abstract class ActionsCardCommon
|
|||||||
*/
|
*/
|
||||||
private function getInstanceDao()
|
private function getInstanceDao()
|
||||||
{
|
{
|
||||||
|
dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
|
||||||
|
|
||||||
if (! is_object($this->object))
|
if (! is_object($this->object))
|
||||||
{
|
{
|
||||||
$modelclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php');
|
$modelclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php');
|
||||||
|
|||||||
@ -59,6 +59,7 @@ class Societe extends CommonObject
|
|||||||
* Thirdparty name
|
* Thirdparty name
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use $name instead
|
* @deprecated Use $name instead
|
||||||
|
* @see name
|
||||||
*/
|
*/
|
||||||
public $nom;
|
public $nom;
|
||||||
|
|
||||||
@ -88,18 +89,21 @@ class Societe extends CommonObject
|
|||||||
* State code
|
* State code
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use state_code instead
|
* @deprecated Use state_code instead
|
||||||
|
* @see state_code
|
||||||
*/
|
*/
|
||||||
var $departement_code;
|
var $departement_code;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use state instead
|
* @deprecated Use state instead
|
||||||
|
* @see state
|
||||||
*/
|
*/
|
||||||
var $departement;
|
var $departement;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Use country instead
|
* @deprecated Use country instead
|
||||||
|
* @see country
|
||||||
*/
|
*/
|
||||||
var $pays;
|
var $pays;
|
||||||
var $country_id;
|
var $country_id;
|
||||||
@ -298,6 +302,7 @@ class Societe extends CommonObject
|
|||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
* @deprecated Note is split in public and private notes
|
* @deprecated Note is split in public and private notes
|
||||||
|
* @see note_public, note_private
|
||||||
*/
|
*/
|
||||||
var $note;
|
var $note;
|
||||||
|
|
||||||
@ -2804,7 +2809,7 @@ class Societe extends CommonObject
|
|||||||
if (empty($name)) $name=$member->getFullName($langs);
|
if (empty($name)) $name=$member->getFullName($langs);
|
||||||
|
|
||||||
// Positionne parametres
|
// Positionne parametres
|
||||||
$this->nom=$name; // TODO obsolete
|
$this->nom=$name; // TODO deprecated
|
||||||
$this->name=$name;
|
$this->name=$name;
|
||||||
$this->address=$member->address;
|
$this->address=$member->address;
|
||||||
$this->zip=$member->zip;
|
$this->zip=$member->zip;
|
||||||
|
|||||||
@ -74,8 +74,16 @@ class User extends CommonObject
|
|||||||
var $datem;
|
var $datem;
|
||||||
|
|
||||||
//! If this is defined, it is an external user
|
//! If this is defined, it is an external user
|
||||||
var $societe_id; // deprecated
|
/**
|
||||||
var $contact_id; // deprecated
|
* @deprecated
|
||||||
|
* @see socid
|
||||||
|
*/
|
||||||
|
var $societe_id;
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see contactid
|
||||||
|
*/
|
||||||
|
var $contact_id;
|
||||||
var $socid;
|
var $socid;
|
||||||
var $contactid;
|
var $contactid;
|
||||||
|
|
||||||
|
|||||||
@ -40,8 +40,12 @@ class UserGroup extends CommonObject
|
|||||||
|
|
||||||
var $id; // Group id
|
var $id; // Group id
|
||||||
var $entity; // Entity of group
|
var $entity; // Entity of group
|
||||||
|
/**
|
||||||
|
* @deprecated
|
||||||
|
* @see name
|
||||||
|
*/
|
||||||
var $nom; // Name of group
|
var $nom; // Name of group
|
||||||
var $name; // Name of group // deprecated
|
var $name; // Name of group
|
||||||
var $globalgroup; // Global group
|
var $globalgroup; // Global group
|
||||||
var $note; // Note on group
|
var $note; // Note on group
|
||||||
var $datec; // Creation date of group
|
var $datec; // Creation date of group
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user