Jingga/oms-Accounting
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Accounting.git synced 2026-02-16 12:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
This commit is contained in:
Dennis Eichhorn 2017-01-26 16:42:29 +01:00
commit 2c732d4062
47 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Activate.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -15,7 +15,7 @@
*/ */
namespace Modules\Accounting\Admin; namespace Modules\Accounting\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\ActivateAbstract; use phpOMS\Module\ActivateAbstract;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
@ -36,7 +36,7 @@ class Activate extends ActivateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function activate(Pool $dbPool, InfoManager $info) public static function activate(DatabasePool $dbPool, InfoManager $info)
{ {
parent::activate($dbPool, $info); parent::activate($dbPool, $info);
} }

6
Admin/Deactivate.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -15,7 +15,7 @@
*/ */
namespace Modules\Accounting\Admin; namespace Modules\Accounting\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\DeactivateAbstract;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
@ -36,7 +36,7 @@ class Deactivate extends DeactivateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function deactivate(Pool $dbPool, InfoManager $info) public static function deactivate(DatabasePool $dbPool, InfoManager $info)
{ {
parent::deactivate($dbPool, $info); parent::deactivate($dbPool, $info);
} }

6
Admin/Install/Navigation.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -14,7 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\Accounting\Admin\Install; namespace Modules\Accounting\Admin\Install;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
/** /**
* Navigation class. * Navigation class.
@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool;
*/ */
class Navigation class Navigation
{ {
public static function install(Pool $dbPool) public static function install(string $path, DatabasePool $dbPool)
{ {
$navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);

8
Admin/Installer.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\Accounting\Admin; namespace Modules\Accounting\Admin;
use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function install(Pool $dbPool, InfoManager $info) public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
{ {
parent::install($dbPool, $info); parent::install($path, $dbPool, $info);
switch ($dbPool->get('core')->getType()) { switch ($dbPool->get('core')->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:

6
Admin/Uninstall.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\Accounting\Admin; namespace Modules\Accounting\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\DataStorage\Database\Schema\Builder; use phpOMS\DataStorage\Database\Schema\Builder;
use phpOMS\Module\UninstallAbstract; use phpOMS\Module\UninstallAbstract;
@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function uninstall(Pool $dbPool, InfoManager $info) public static function uninstall(DatabasePool $dbPool, InfoManager $info)
{ {
parent::uninstall($dbPool, $info); parent::uninstall($dbPool, $info);

6
Admin/Update.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -16,7 +16,7 @@
namespace Modules\Accounting\Admin; namespace Modules\Accounting\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UpdateAbstract; use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory; use phpOMS\System\File\Directory;
@ -37,7 +37,7 @@ class Update extends UpdateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function update(Pool $dbPool, array $info) public static function update(DatabasePool $dbPool, array $info)
{ {
Directory::deletePath(__DIR__ . '/Update'); Directory::deletePath(__DIR__ . '/Update');
mkdir('Update'); mkdir('Update');

8
Controller.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -45,7 +45,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
const MODULE_PATH = __DIR__; /* public */ const MODULE_PATH = __DIR__;
/** /**
* Module version. * Module version.
@ -53,7 +53,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
const MODULE_VERSION = '1.0.0'; /* public */ const MODULE_VERSION = '1.0.0';
/** /**
* Module name. * Module name.
@ -61,7 +61,7 @@ class Controller extends ModuleAbstract implements WebInterface
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
const MODULE_NAME = 'Accounting'; /* public */ const MODULE_NAME = 'Accounting';
/** /**
* Providing. * Providing.

2
Models/AccountAbstract.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/AccountBalance.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/AccountInterface.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

10
Models/AccountType.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -30,11 +30,11 @@ use phpOMS\Datatypes\Enum;
*/ */
abstract class AccountType extends Enum abstract class AccountType extends Enum
{ {
const IMPERSONAL = 0; /* public */ const IMPERSONAL = 0;
const PERSONAL = 1; /* public */ const PERSONAL = 1;
const CREDITOR = 2; /* public */ const CREDITOR = 2;
const DEBITOR = 3; /* public */ const DEBITOR = 3;
} }

2
Models/Balance.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/BatchPosting.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/Creditor.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/CreditorAccount.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/Debitor.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/DebitorAccount.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/EntryInterface.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/ImpersonalAccount.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/IncomeStatement.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/InvoicePosting.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/InvoicePostingSimple.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/PersonalAccountAbstract.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/Posting.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/PostingAbstract.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Models/PostingInterface.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

10
Models/TimeRangeType.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD
@ -30,8 +30,8 @@ use phpOMS\Datatypes\Enum;
*/ */
abstract class TimeRangeType extends Enum abstract class TimeRangeType extends Enum
{ {
const ENTRY_DATE = 0; /* Date of when the entry happened */ /* public */ const ENTRY_DATE = 0; /* Date of when the entry happened */
const DUE_DATE = 1; /* Date of when the entry is due (only for invoices) */ /* public */ const DUE_DATE = 1; /* Date of when the entry is due (only for invoices) */
const RECEIPT_DATE = 2; /* Date of the receipt */ /* public */ const RECEIPT_DATE = 2; /* Date of the receipt */
const ASSOCIATED_DATE = 3; /* Date of the association (e.g. when did the articles arrive) */ /* public */ const ASSOCIATED_DATE = 3; /* Date of the association (e.g. when did the articles arrive) */
} }

3
Models/temp/Account.php
View File

@ -1,5 +1,5 @@
<?php <?php
/**
class Account implements StructureElementInterface { class Account implements StructureElementInterface {
private $id = 0; private $id = 0;
private $name = ''; private $name = '';
@ -94,3 +94,4 @@ class Account implements StructureElementInterface {
return $this->total; return $this->total;
} }
} }
*/

2
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/Lang/api.en.lang.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/Lang/en.lang.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/entries.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/gl-create.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/gl-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/gl-profile.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/journal-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/stack-archive-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/stack-create.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/stack-entries.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/stack-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/Backend/stack-predefined-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/backend/Lang/Navigation.en.lang.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/backend/entries.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/backend/gl-create.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/backend/stack-archive-list.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/backend/stack-create.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD

2
Theme/backend/stack-entries.tpl.php
View File

@ -2,7 +2,7 @@
/** /**
* Orange Management * Orange Management
* *
* PHP Version 7.0 * PHP Version 7.1
* *
* @category TBD * @category TBD
* @package TBD * @package TBD