diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index cdfa3602e73..f462ab87453 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -108,6 +108,11 @@ class AccountingAccount extends CommonObject */ public $account_category; + /** + * @var int Label category account + */ + public $account_category_label; + /** * @var int Status */ @@ -193,7 +198,8 @@ class AccountingAccount extends CommonObject $sql .= " AND a.fk_pcg_version = '".$this->db->escape($limittoachartaccount)."'"; } - dol_syslog(get_class($this)."::fetch", LOG_DEBUG); + dol_syslog(get_class($this)."::fetch id=".$id." account_number=".$account_number, LOG_DEBUG); + $result = $this->db->query($sql); if ($result) { $obj = $this->db->fetch_object($result); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 35fd58980b1..00cea686069 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1834,6 +1834,7 @@ if ($id) { $class = ''; $showfield = 1; $valuetoshow = empty($obj->{$value}) ? '' : $obj->{$value}; + $titletoshow = ''; if ($value == 'entity') { $withentity = $valuetoshow; @@ -1965,6 +1966,11 @@ if ($id) { } elseif (in_array($value, array('recuperableonly'))) { $class = "center"; } elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') { + if (!empty($conf->accounting->enabled)) { + $tmpaccountingaccount = new AccountingAccount($db); + $tmpaccountingaccount->fetch(0, $valuetoshow, 1); + $titletoshow = $langs->transnoentitiesnoconv("Pcgtype").': '.$tmpaccountingaccount->pcg_type; + } $valuetoshow = length_accountg($valuetoshow); } elseif ($value == 'fk_tva') { foreach ($form->cache_vatrates as $key => $Tab) { @@ -2012,7 +2018,7 @@ if ($id) { } // Show value for field if ($showfield) { - print '