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

correct merge

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-09-04 20:58:05 +02:00
parent 65b74ad30f
commit 48d8a444e0
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -2702,29 +2702,18 @@ class SupplierProposalLine extends CommonObjectLine
public $oldline; public $oldline;
// From llx_supplier_proposaldet // From llx_supplier_proposaldet
<<<<<<< HEAD
var $rowid; // deprecated
=======
public $rowid; // deprecated public $rowid; // deprecated
>>>>>>> upstream/develop
/** /**
* @var int ID * @var int ID
*/ */
public $id; public $id;
<<<<<<< HEAD
var $fk_supplier_proposal;
var $fk_parent_line;
var $desc; // Description ligne
var $fk_product; // Id produit predefini
=======
public $fk_supplier_proposal; public $fk_supplier_proposal;
public $fk_parent_line; public $fk_parent_line;
public $desc; // Description ligne public $desc; // Description ligne
public $fk_product; // Id produit predefini public $fk_product; // Id produit predefini
>>>>>>> upstream/develop
/** /**
* @deprecated * @deprecated
* @see product_type * @see product_type