From e091be6a3de811665a726d9d4e1f69915689ff26 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 30 Aug 2020 20:13:10 +0200 Subject: [PATCH] autofixes --- Models/AccountType.php | 3 + Models/L11nCostCenter.php | 2 +- Models/L11nCostObject.php | 2 +- Models/PermissionState.php | 8 +++ Models/TimeRangeType.php | 3 + Theme/Backend/account-list.tpl.php | 4 +- Theme/Backend/costcenter-list.tpl.php | 10 ++-- Theme/Backend/costobject-list.tpl.php | 10 ++-- Theme/Backend/entries.tpl.php | 66 ++++++++++----------- Theme/Backend/gl-create.tpl.php | 6 +- Theme/Backend/gl-list.tpl.php | 4 +- Theme/Backend/journal-list.tpl.php | 4 +- Theme/Backend/stack-archive-list.tpl.php | 8 +-- Theme/Backend/stack-create.tpl.php | 12 ++-- Theme/Backend/stack-list.tpl.php | 8 +-- Theme/Backend/stack-predefined-list.tpl.php | 10 ++-- tests/Admin/AdminTest.php | 1 + tests/Models/CostCenterTest.php | 2 +- tests/Models/CostObjectTest.php | 2 +- 19 files changed, 90 insertions(+), 75 deletions(-) diff --git a/Models/AccountType.php b/Models/AccountType.php index b2a8fc6..08ea8df 100644 --- a/Models/AccountType.php +++ b/Models/AccountType.php @@ -27,7 +27,10 @@ use phpOMS\Stdlib\Base\Enum; abstract class AccountType extends Enum { public const IMPERSONAL = 0; + public const PERSONAL = 1; + public const CREDITOR = 2; + public const DEBITOR = 4; } diff --git a/Models/L11nCostCenter.php b/Models/L11nCostCenter.php index 9d11417..e336a8e 100644 --- a/Models/L11nCostCenter.php +++ b/Models/L11nCostCenter.php @@ -25,7 +25,7 @@ use phpOMS\Localization\ISO639x1Enum; * @link https://orange-management.org * @since 1.0.0 */ -class L11nCostCenter implements ArrayableInterface, \JsonSerializable +class L11nCostCenter implements \JsonSerializable, ArrayableInterface { /** * Article ID. diff --git a/Models/L11nCostObject.php b/Models/L11nCostObject.php index e13cd10..193575b 100644 --- a/Models/L11nCostObject.php +++ b/Models/L11nCostObject.php @@ -25,7 +25,7 @@ use phpOMS\Localization\ISO639x1Enum; * @link https://orange-management.org * @since 1.0.0 */ -class L11nCostObject implements ArrayableInterface, \JsonSerializable +class L11nCostObject implements \JsonSerializable, ArrayableInterface { /** * Article ID. diff --git a/Models/PermissionState.php b/Models/PermissionState.php index 81f60ff..583d7da 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -27,12 +27,20 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionState extends Enum { public const PERSONAL = 1; + public const IMPERSONAL = 2; + public const JOURNAL = 3; + public const STACK = 4; + public const GL = 5; + public const COST_CENTER = 6; + public const COST_OBJECT = 7; + public const ACCOUNT = 8; + public const ENTRY = 9; } diff --git a/Models/TimeRangeType.php b/Models/TimeRangeType.php index 665a1b8..84ea9f0 100644 --- a/Models/TimeRangeType.php +++ b/Models/TimeRangeType.php @@ -27,7 +27,10 @@ use phpOMS\Stdlib\Base\Enum; abstract class TimeRangeType extends Enum { public const ENTRY_DATE = 0; /* Date of when the entry happened */ + public const DUE_DATE = 1; /* Date of when the entry is due (only for invoices) */ + public const RECEIPT_DATE = 2; /* Date of the receipt */ + public const ASSOCIATED_DATE = 3; /* Date of the association (e.g. when did the articles arrive) */ } diff --git a/Theme/Backend/account-list.tpl.php b/Theme/Backend/account-list.tpl.php index bcff661..6d8ab87 100644 --- a/Theme/Backend/account-list.tpl.php +++ b/Theme/Backend/account-list.tpl.php @@ -1,11 +1,11 @@