forked from Wavyzz/dolibarr
FIX last_main_doc var not saved
Conflicts: htdocs/core/class/commonobject.class.php
This commit is contained in:
@@ -311,6 +311,12 @@ abstract class CommonObject
|
|||||||
*/
|
*/
|
||||||
public $modelpdf;
|
public $modelpdf;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var string
|
||||||
|
* Contains relative path of last generated main file
|
||||||
|
*/
|
||||||
|
public $last_main_doc;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int Bank account ID
|
* @var int Bank account ID
|
||||||
* @see SetBankAccount()
|
* @see SetBankAccount()
|
||||||
@@ -4611,10 +4617,15 @@ abstract class CommonObject
|
|||||||
if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
|
if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
|
||||||
if ($update_main_doc_field && ! empty($this->table_element))
|
if ($update_main_doc_field && ! empty($this->table_element))
|
||||||
{
|
{
|
||||||
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'";
|
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
|
||||||
$sql.= ' WHERE rowid = '.$this->id;
|
$sql.= ' WHERE rowid = '.$this->id;
|
||||||
|
|
||||||
$resql = $this->db->query($sql);
|
$resql = $this->db->query($sql);
|
||||||
if (! $resql) dol_print_error($this->db);
|
if (! $resql) dol_print_error($this->db);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user