Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-28 09:34:53 +02:00
parent d8bf4a0ecf 50d50c2e10
commit fe4260a014
335 changed files with 3278 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/commande/class/commande.class.php
View File

@@ -42,8 +42,16 @@ require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
*/
class Commande extends CommonOrder
{
public $element='commande';
public $table_element='commande';
/**
* @var string ID to identify managed object
*/
public $element='commande';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='commande';
public $table_element_line = 'commandedet';
public $class_element_line = 'OrderLine';
public $fk_element = 'fk_commande';
@@ -3796,7 +3804,11 @@ class Commande extends CommonOrder
*/
class OrderLine extends CommonOrderLine
{
/**
* @var string ID to identify managed object
*/
public $element='commandedet';
public $table_element='commandedet';
var $oldline;
@@ -3818,7 +3830,12 @@ class OrderLine extends CommonOrderLine
// From llx_commandedet
var $fk_parent_line;
var $fk_facture;
var $label;
/**
* @var string proper name for given parameter
*/
public $label;
var $fk_remise_except;
var $rang = 0;
var $fk_fournprice;