diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index aa82e99..eb1cb99 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -191,7 +191,7 @@ "uri": "{/prefix}sales/analysis/bill", "target": "self", "icon": null, - "order": 5, + "order": 15, "from": "Billing", "permission": { "permission": 2, "type": null, "element": null }, "parent": 1001602001, diff --git a/Models/BillType.php b/Models/BillType.php index d6239f2..ae9dcd8 100755 --- a/Models/BillType.php +++ b/Models/BillType.php @@ -83,12 +83,12 @@ class BillType { if ($l11n instanceof BillTypeL11n) { $this->l11n = $l11n; - } elseif ($this->l11n instanceof BillTypeL11n && \is_string($l11n)) { - $this->l11n->name = $l11n; } elseif (\is_string($l11n)) { $this->l11n = new BillTypeL11n(); $this->l11n->name = $l11n; $this->l11n->setLanguage($lang); + } elseif ($this->l11n instanceof BillTypeL11n && \is_string($l11n)) { + $this->l11n->name = $l11n; } } diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 0b50238..4ff2a35 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -14,5 +14,6 @@ declare(strict_types=1); return ['Navigation' => [ 'Archive' => 'Archive', + 'Bill' => 'Bill', 'Billing' => 'Billing', ]];