mirror of
https://github.com/Karaka-Management/oms-Billing.git
synced 2026-02-13 23:08:42 +00:00
bug fixes
This commit is contained in:
parent
c5d7a7ceaa
commit
ec0263ce2b
|
|
@ -191,7 +191,7 @@
|
||||||
"uri": "{/prefix}sales/analysis/bill",
|
"uri": "{/prefix}sales/analysis/bill",
|
||||||
"target": "self",
|
"target": "self",
|
||||||
"icon": null,
|
"icon": null,
|
||||||
"order": 5,
|
"order": 15,
|
||||||
"from": "Billing",
|
"from": "Billing",
|
||||||
"permission": { "permission": 2, "type": null, "element": null },
|
"permission": { "permission": 2, "type": null, "element": null },
|
||||||
"parent": 1001602001,
|
"parent": 1001602001,
|
||||||
|
|
|
||||||
|
|
@ -83,12 +83,12 @@ class BillType
|
||||||
{
|
{
|
||||||
if ($l11n instanceof BillTypeL11n) {
|
if ($l11n instanceof BillTypeL11n) {
|
||||||
$this->l11n = $l11n;
|
$this->l11n = $l11n;
|
||||||
} elseif ($this->l11n instanceof BillTypeL11n && \is_string($l11n)) {
|
|
||||||
$this->l11n->name = $l11n;
|
|
||||||
} elseif (\is_string($l11n)) {
|
} elseif (\is_string($l11n)) {
|
||||||
$this->l11n = new BillTypeL11n();
|
$this->l11n = new BillTypeL11n();
|
||||||
$this->l11n->name = $l11n;
|
$this->l11n->name = $l11n;
|
||||||
$this->l11n->setLanguage($lang);
|
$this->l11n->setLanguage($lang);
|
||||||
|
} elseif ($this->l11n instanceof BillTypeL11n && \is_string($l11n)) {
|
||||||
|
$this->l11n->name = $l11n;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,5 +14,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
return ['Navigation' => [
|
return ['Navigation' => [
|
||||||
'Archive' => 'Archive',
|
'Archive' => 'Archive',
|
||||||
|
'Bill' => 'Bill',
|
||||||
'Billing' => 'Billing',
|
'Billing' => 'Billing',
|
||||||
]];
|
]];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user