lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean deprecated var

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-21 13:14:58 +02:00
parent 9eeaf5c3eb
commit c81c744aaf
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/list.php
View File

@ -64,7 +64,7 @@ $dateend=dol_mktime(0, 0, 0, GETPOST('dateendmonth','int'), GETPOST('dateendday'
if ($status == '' && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
$filter = GETPOST("filter",'',3);
$filter = GETPOST("filter",'alpha',3);
$filtert = GETPOST("filtert","int",3);
$usergroup = GETPOST("usergroup","int",3);
$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;

3
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -475,7 +475,6 @@ class FactureRec extends CommonInvoice
$line->id = $objp->rowid;
$line->rowid = $objp->rowid;
$line->label = $objp->custom_label; // Label line
$line->desc = $objp->description; // Description line
$line->description = $objp->description; // Description line
$line->product_type = $objp->product_type; // Type of line
@ -488,6 +487,8 @@ class FactureRec extends CommonInvoice
$line->qty = $objp->qty;
$line->subprice = $objp->subprice;
$line->label = $objp->custom_label; // @deprecated
$line->vat_src_code = $objp->vat_src_code;
$line->tva_tx = $objp->tva_tx;
$line->localtax1_tx = $objp->localtax1_tx;

1
htdocs/compta/facture/class/facture.class.php
View File

@ -2565,6 +2565,7 @@ class Facture extends CommonInvoice
// Deprecation warning
if ($label) {
dol_syslog(__METHOD__ . ": using line label is deprecated", LOG_WARNING);
//var_dump(debug_backtrace(false));exit;
}
global $mysoc, $conf, $langs;

21
htdocs/contrat/class/contrat.class.php
View File

@ -767,17 +767,7 @@ class Contrat extends CommonObject
$line->fk_user_cloture = $objp->fk_user_cloture;
$line->fk_unit = $objp->fk_unit;
$line->ref = $objp->product_ref; // deprecated
if (empty($objp->fk_product))
{
$line->label = ''; // deprecated
$line->libelle = $objp->description; // deprecated
}
else
{
$line->label = $objp->product_label; // deprecated
$line->libelle = $objp->product_label; // deprecated
}
$line->ref = $objp->product_ref; // deprecated
$line->product_ref = $objp->product_ref; // Ref product
$line->product_desc = $objp->product_desc; // Description product
$line->product_label = $objp->product_label; // Label product
@ -2459,12 +2449,15 @@ class ContratLigne extends CommonObjectLine
var $fk_contrat;
var $fk_product;
var $statut; // 0 inactive, 4 active, 5 closed
var $type; // 0 for product, 1 for service
var $type; // 0 for product, 1 for service
/**
* @var string
* @deprecated
*/
var $label;
/**
* @var string
* @deprecated Use $label instead
* @see label
* @deprecated
*/
public $libelle;