Fix travis
This commit is contained in:
parent
33af0eb0fb
commit
96fcd7cae2
@ -142,7 +142,7 @@ class AssetAccountancyCodes extends CommonObject
|
|||||||
foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
|
foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
|
||||||
$sql = "SELECT " . implode(',', array_keys($mode_info['fields']));
|
$sql = "SELECT " . implode(',', array_keys($mode_info['fields']));
|
||||||
$sql .= " FROM " . MAIN_DB_PREFIX . $mode_info['table'];
|
$sql .= " FROM " . MAIN_DB_PREFIX . $mode_info['table'];
|
||||||
$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . $asset_id : " fk_asset_model = " . $asset_model_id);
|
$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
|
||||||
|
|
||||||
$resql = $this->db->query($sql);
|
$resql = $this->db->query($sql);
|
||||||
if ($resql) {
|
if ($resql) {
|
||||||
@ -216,7 +216,7 @@ class AssetAccountancyCodes extends CommonObject
|
|||||||
foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
|
foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
|
||||||
// Delete old accountancy codes
|
// Delete old accountancy codes
|
||||||
$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
|
$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
|
||||||
$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . $asset_id : " fk_asset_model = " . $asset_model_id);
|
$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
|
||||||
$resql = $this->db->query($sql);
|
$resql = $this->db->query($sql);
|
||||||
if (!$resql) {
|
if (!$resql) {
|
||||||
$this->errors[] = $langs->trans('AssetErrorDeleteAccountancyCodesForMode', $mode_key) . ': ' . $this->db->lasterror();
|
$this->errors[] = $langs->trans('AssetErrorDeleteAccountancyCodesForMode', $mode_key) . ': ' . $this->db->lasterror();
|
||||||
|
|||||||
@ -474,7 +474,7 @@ class AssetDepreciationOptions extends CommonObject
|
|||||||
foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
|
foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
|
||||||
// Delete old accountancy codes
|
// Delete old accountancy codes
|
||||||
$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
|
$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
|
||||||
$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . $asset_id : " fk_asset_model = " . $asset_model_id);
|
$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
|
||||||
$resql = $this->db->query($sql);
|
$resql = $this->db->query($sql);
|
||||||
if (!$resql) {
|
if (!$resql) {
|
||||||
$this->errors[] = $langs->trans('AssetErrorDeleteDepreciationOptionsForMode', $mode_key) . ': ' . $this->db->lasterror();
|
$this->errors[] = $langs->trans('AssetErrorDeleteDepreciationOptionsForMode', $mode_key) . ': ' . $this->db->lasterror();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user