diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 0a59114..99153b8 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -18,7 +18,7 @@ "pid": "/sales/bill", "type": 3, "subtype": 1, - "name": "List", + "name": "Open", "uri": "{/prefix}sales/bill/list", "target": "self", "icon": null, @@ -79,7 +79,7 @@ "pid": "/purchase/bill", "type": 3, "subtype": 1, - "name": "List", + "name": "Open", "uri": "{/prefix}purchase/bill/list", "target": "self", "icon": null, @@ -211,5 +211,36 @@ "permission": { "permission": 2, "type": null, "element": null }, "parent": 1001602001, "children": [] + }, + { + "id": 1005108001, + "pid": "/purchase/analysis", + "type": 3, + "subtype": 1, + "name": "Bill", + "uri": "{/prefix}purchase/analysis/bill", + "target": "self", + "icon": null, + "order": 15, + "from": "Billing", + "permission": { "permission": 2, "type": null, "element": null }, + "parent": 1001602001, + "children": [] + }, + { + "id": 1005109001, + "pid": "/", + "type": 2, + "subtype": 1, + "name": "Billing", + "uri": "{/prefix}private/billing/dashboard?{?}", + "target": "self", + "icon": null, + "order": 5, + "from": "Billing", + "permission": { "permission": 2, "type": null, "element": null }, + "parent": 1003401001, + "children": [ + ] } ] diff --git a/Admin/Install/db.json b/Admin/Install/db.json index bb0593a..06b640a 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -606,5 +606,50 @@ "foreignKey": "editor_doc_id" } } + }, + "billing_bill_responsible": { + "name": "billing_bill_responsible", + "fields": { + "billing_bill_responsible_id": { + "name": "billing_bill_responsible_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "billing_bill_responsible_bill": { + "name": "billing_bill_responsible_bill", + "type": "INT", + "null": false, + "foreignTable": "billing_bill", + "foreignKey": "billing_bill_id" + }, + "billing_bill_responsible_group": { + "name": "billing_bill_responsible_group", + "type": "INT", + "null": false, + "foreignTable": "group", + "foreignKey": "group_id" + }, + "billing_bill_responsible_account": { + "name": "billing_bill_responsible_account", + "type": "INT", + "null": false, + "foreignTable": "account", + "foreignKey": "account_id" + }, + "billing_bill_responsible_forwarded_by": { + "name": "billing_bill_responsible_forwarded_by", + "type": "INT", + "null": false, + "foreignTable": "account", + "foreignKey": "account_id" + }, + "billing_bill_responsible_forwarded_at": { + "name": "billing_bill_responsible_forwarded_at", + "type": "DATETIME", + "null": false + } + } } } \ No newline at end of file diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 45a8dd1..ef62789 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -29,6 +29,7 @@ use Modules\ClientManagement\Models\ClientMapper; use Modules\ItemManagement\Models\ItemMapper; use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\MediaMapper; +use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullMedia; use Modules\Media\Models\PathSettings; use Modules\Media\Models\UploadStatus; @@ -285,7 +286,7 @@ final class ApiController extends Controller if ($collection === null) { $collection = MediaMapper::getParentCollection($path)->limit(1)->execute(); - if ($collection instanceof NullMedia) { + if ($collection instanceof NullCollection) { $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( '/Modules/Media/Files', $path, diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 159ee6b..8eaf2f2 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,6 +13,7 @@ declare(strict_types=1); return ['Navigation' => [ + 'Open' => 'Open', 'Archive' => 'Archive', 'Bill' => 'Bill', 'Billing' => 'Billing', diff --git a/Theme/Backend/purchase-bill.tpl.php b/Theme/Backend/purchase-bill.tpl.php index ec65d7c..4bbad90 100755 --- a/Theme/Backend/purchase-bill.tpl.php +++ b/Theme/Backend/purchase-bill.tpl.php @@ -218,7 +218,7 @@ echo $this->getData('nav')->render(); ?>
- +