Clean code
This commit is contained in:
parent
8db75f0d04
commit
27cbd16bb9
@ -26,7 +26,7 @@
|
|||||||
// $object must be defined
|
// $object must be defined
|
||||||
// $permissiontoadd must be defined
|
// $permissiontoadd must be defined
|
||||||
// $permissiontodelete must be defined
|
// $permissiontodelete must be defined
|
||||||
// $backurlforlist may be defined
|
// $backurlforlist must be defined
|
||||||
// $backtopage may be defined
|
// $backtopage may be defined
|
||||||
// $noback may be defined
|
// $noback may be defined
|
||||||
// $triggermodname may be defined
|
// $triggermodname may be defined
|
||||||
@ -128,9 +128,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// var_dump($object); exit;
|
|
||||||
if (!$error) {
|
if (!$error) {
|
||||||
|
|
||||||
$result = $object->create($user);
|
$result = $object->create($user);
|
||||||
if ($result > 0) {
|
if ($result > 0) {
|
||||||
// Creation OK
|
// Creation OK
|
||||||
|
|||||||
@ -202,8 +202,11 @@ class Mo extends CommonObject
|
|||||||
*/
|
*/
|
||||||
public $lines = array();
|
public $lines = array();
|
||||||
|
|
||||||
public $fk_parent_line;
|
/**
|
||||||
|
* @var integer Mo parent line
|
||||||
|
* */
|
||||||
|
|
||||||
|
public $fk_parent_line;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1206,13 +1209,15 @@ class Mo extends CommonObject
|
|||||||
*
|
*
|
||||||
* @return array|int array of lines if OK, <0 if KO
|
* @return array|int array of lines if OK, <0 if KO
|
||||||
*/
|
*/
|
||||||
public function getLinesArray($role = '')
|
public function getLinesArray($rolefilter = '')
|
||||||
{
|
{
|
||||||
$this->lines = array();
|
$this->lines = array();
|
||||||
|
|
||||||
$objectline = new MoLine($this->db);
|
$objectline = new MoLine($this->db);
|
||||||
if($role) $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.((int) $this->id),'role' => $role));
|
|
||||||
else $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.((int) $this->id)));
|
$TFilters = array('customsql'=>'fk_mo = '.((int) $this->id));
|
||||||
|
if(!empty($rolefilter)) $TFilters['role'] = $rolefilter;
|
||||||
|
$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
|
||||||
|
|
||||||
if (is_numeric($result)) {
|
if (is_numeric($result)) {
|
||||||
$this->error = $this->error;
|
$this->error = $this->error;
|
||||||
|
|||||||
@ -47,8 +47,6 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
|
|||||||
$TBomLineId = GETPOST('bomlineid', 'array');
|
$TBomLineId = GETPOST('bomlineid', 'array');
|
||||||
//$lineid = GETPOST('lineid', 'int');
|
//$lineid = GETPOST('lineid', 'int');
|
||||||
|
|
||||||
|
|
||||||
//var_dump($_POST); exit;
|
|
||||||
// Initialize technical objects
|
// Initialize technical objects
|
||||||
$object = new Mo($db);
|
$object = new Mo($db);
|
||||||
$objectbom = new BOM($db);
|
$objectbom = new BOM($db);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user