diff --git a/Admin/Install/attributes.json b/Admin/Install/attributes.json index 36ceba9..716e0fc 100755 --- a/Admin/Install/attributes.json +++ b/Admin/Install/attributes.json @@ -290,7 +290,7 @@ { "name": "purchase_tax_code", "l11n": { - "en": "Purchse tax code", + "en": "Purchase tax code", "de": "VSt. code" }, "value_type": 2, diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 73cb317..9134f32 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -192,13 +192,13 @@ "null": false }, "suppliermgmt_attr_type_required": { - "description": "Every item must have this attribute type if set to true.", + "comment": "Every item must have this attribute type if set to true.", "name": "suppliermgmt_attr_type_required", "type": "TINYINT(1)", "null": false }, "suppliermgmt_attr_type_pattern": { - "description": "This is a regex validation pattern.", + "comment": "This is a regex validation pattern.", "name": "suppliermgmt_attr_type_pattern", "type": "VARCHAR(255)", "null": false diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md deleted file mode 100755 index d3e306e..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,5 +0,0 @@ -# Structure - -## ER - -![ER](Modules/SupplierManagement/Docs/Dev/img/er.png) \ No newline at end of file diff --git a/Docs/Dev/img/er.png b/Docs/Dev/img/er.png deleted file mode 100644 index 94ae910..0000000 Binary files a/Docs/Dev/img/er.png and /dev/null differ diff --git a/Docs/Help/de/SUMMARY.md b/Docs/Help/de/SUMMARY.md deleted file mode 100644 index bcbe68d..0000000 --- a/Docs/Help/de/SUMMARY.md +++ /dev/null @@ -1,3 +0,0 @@ -# User Content - -* [Attributes]({%}&page=Help/attributes) diff --git a/Docs/Help/de/accounting.md b/Docs/Help/de/accounting.md deleted file mode 100644 index e69de29..0000000 diff --git a/Docs/Help/de/attributes.md b/Docs/Help/de/attributes.md deleted file mode 100644 index 38547b6..0000000 --- a/Docs/Help/de/attributes.md +++ /dev/null @@ -1,61 +0,0 @@ -# Attributes - -## Default - -The module automatically installs the following default attributes which can be set in the attribute tab in the respective supplier. - -### General - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| abc_class | Custom supplier rating | | -| support_emails | Send email for support ticket changes | yes | -| support_email_address | Email address for support tickets | Account email | -| legal_form | Supplier legal form | | - -### Categories - -Suppliers can be put in categories for horizontal and vertical grouping. By default the system uses segment->section->supplier_group as categories as well as supplier_type. These categories also get used by other modules. Additional groups can be defined but are not used by other modules by default. - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| segment | Level 1 | 1 | -| section | Level 2 | 1 | -| supplier_group | Level 3 | 1 | -| supplier_type | **NOT** hierarchically. | 1 | -| supplier_area | **NOT** hierarchically. Area a supplier belongs to. Useful for grouping suppliers based on location or procurement clerk. | 1 | - -| Level | > | > | > | > | > | > | Sample | -| :---: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | -| 1 | > | > | > | > | Segment 1 | > | Segment 2 | -| 2 | > | > | Section 1.1 | > | Section 1.2 | > | Section 2.1 | -| 3 | Supplier Group 1.1.1 | > | Supplier Group 1.1.2 | > | Supplier Group 1.2.1 | Supplier Group 2.1.1 | Supplier Group 2.1.2 | - -> You could consider the supplier (number) itself `Level 4`. - -### Billing - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| bill_emails | Should bills get emailed to the customer | yes | -| bill_email_address | Email address used for sending bill via email | account email | -| bill_language | Language of the bill | Account language -> default bill language | -| bill_currency | Currency of the bill. Coming soon. | | -| bill_match_pattern | Regex pattern for matching a supplier against their bill. Usually a tax id, bank account or otherwise unique string used in the bills from the supplier. | | -| bill_date_format | Date format used by the supplier | | - -### Purchase & Stock - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| minimum_order | Minimum order amount required | | - -### Accounting - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| purchase_tax_code | Tax code for purchase | | -| vat_id | VAT id for european customers | | -| tax_id | Tax id for local tax id | | -| line_of_credit | Maximum amount allowed to be purchased taking unpaid invoices into account | | -| credit_rating | Credit rating | | \ No newline at end of file diff --git a/Docs/Help/de/introduction.md b/Docs/Help/de/introduction.md deleted file mode 100644 index 14e6a9e..0000000 --- a/Docs/Help/de/introduction.md +++ /dev/null @@ -1,54 +0,0 @@ -# Introduction - -The **Item Management** module is an essential module for any ERP application. This module handles basic item management and is deeply integrated into **Billing** and **Warehouse Management**. - -## Target Group - -The target group for this module is anyone who wants to manage their tangible and non-tangible products. - -# Setup - -This module doesn't have any additional setup requirements and can be simply installed through the module interface. - -# Features - -## Item master file - -The module provides basic item data management - -* Attach documents to items -* Write notes for items -* Overview of most recent notes, documents, invoices and sales statistics (requires **Billing**) - -## Localization - -Localizations allow you to define item names and descriptions in multiple languages. You can also define custom text elements for external use (e.g. descriptions to be exported to other systems such as your own shop system). - -## Attributes - -Attributes allow you to define various item characteristics such as color, medical device class, segmentation, hazardous good, brand, model and many more. - -## Pricing - -By installing the **Billing** module you are can define multiple purchase and sales prices. Prices and discounts can be defined for individual items, customers and suppliers and for customer groups. You may also define quantity based prices. - -## Procurement - -Together with the **Purchase** module you can define stock levels, order conditions and delivery times for automated order suggestion calculations making it a breeze to ensure sufficient stocks. - -## Accounting - -Together with the **Accounting** module you can define cost center, cost object and taxes for every item. - -## Stock - -Together with the **Warehouse Management** module you can also track your stocks and - -# Recommendation - -Other modules that work great with this one together are: - -* [Warehouse Management](WarehouseManagement) -* [Supplier Management](SupplierManagement) -* [Purchase](Purchase) -* [Accounting](Accounting) diff --git a/Docs/Help/de/localization.md b/Docs/Help/de/localization.md deleted file mode 100644 index 94aa062..0000000 --- a/Docs/Help/de/localization.md +++ /dev/null @@ -1,14 +0,0 @@ -# Localization - -## Default - -The module automatically installs the following default localizations which can be set in the localization tab in the respective item. - -* name1 - Primary item name -* name2 - Secondary item name -* info - Internal item info -* internal_matchcodes - Match code for finding item based on a specific name or short description -* description_short - Short item description -* description_long - Long item description -* shop_name1 - Primary item name for a shop system -* shop_name2 - Secondary item name for a shop system \ No newline at end of file diff --git a/Docs/Help/de/pricing.md b/Docs/Help/de/pricing.md deleted file mode 100644 index e69de29..0000000 diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md index 14e6a9e..ec1c0ed 100644 --- a/Docs/Help/en/introduction.md +++ b/Docs/Help/en/introduction.md @@ -1,10 +1,10 @@ # Introduction -The **Item Management** module is an essential module for any ERP application. This module handles basic item management and is deeply integrated into **Billing** and **Warehouse Management**. +The **Supplier Management** module is an essential module for any ERP application. This module handles basic customer management and is deeply integrated into the **Billing** Modules. ## Target Group -The target group for this module is anyone who wants to manage their tangible and non-tangible products. +The target group for this module is the purchase department for managing their suppliers. # Setup @@ -14,41 +14,20 @@ This module doesn't have any additional setup requirements and can be simply ins ## Item master file -The module provides basic item data management +The module provides basic supplier data management -* Attach documents to items -* Write notes for items +* Attach documents to suppliers +* Write notes for suppliers * Overview of most recent notes, documents, invoices and sales statistics (requires **Billing**) -## Localization - -Localizations allow you to define item names and descriptions in multiple languages. You can also define custom text elements for external use (e.g. descriptions to be exported to other systems such as your own shop system). - ## Attributes Attributes allow you to define various item characteristics such as color, medical device class, segmentation, hazardous good, brand, model and many more. ## Pricing -By installing the **Billing** module you are can define multiple purchase and sales prices. Prices and discounts can be defined for individual items, customers and suppliers and for customer groups. You may also define quantity based prices. +By installing the **Billing** module you can define multiple purchase and sales prices. Prices and discounts can be defined for individual items, customers and suppliers and for customer groups. You may also define quantity based prices. -## Procurement +## Finance -Together with the **Purchase** module you can define stock levels, order conditions and delivery times for automated order suggestion calculations making it a breeze to ensure sufficient stocks. - -## Accounting - -Together with the **Accounting** module you can define cost center, cost object and taxes for every item. - -## Stock - -Together with the **Warehouse Management** module you can also track your stocks and - -# Recommendation - -Other modules that work great with this one together are: - -* [Warehouse Management](WarehouseManagement) -* [Supplier Management](SupplierManagement) -* [Purchase](Purchase) -* [Accounting](Accounting) +Together with the **Finance** module you can define the taxes for each supplier. diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index ceb8b72..8616feb 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -13,8 +13,8 @@ declare(strict_types=1); return ['Navigation' => [ - 'Create' => 'Erstellen', - 'List' => 'Liste', - 'Suppliers' => 'Lieferanten', + 'Create' => 'Erstellen', + 'List' => 'Liste', + 'Suppliers' => 'Lieferanten', 'Attributes' => 'Attribute', ]]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 907b3fb..f1b6cb0 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,8 +13,8 @@ declare(strict_types=1); return ['Navigation' => [ - 'Create' => 'Create', - 'List' => 'List', - 'Suppliers' => 'Suppliers', + 'Create' => 'Create', + 'List' => 'List', + 'Suppliers' => 'Suppliers', 'Attributes' => 'Attributes', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 7ce5abd..855b911 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -79,7 +79,6 @@ return ['SupplierManagement' => [ 'PaymentTerm' => 'Zahlungsbezeichnung', 'Permission' => 'Erlaubnis', 'Phone' => 'Telefon', - 'Postal' => 'Post', 'Price' => 'Preis', 'Prices' => 'Preise', 'Productgroup' => 'Produktgruppe', @@ -108,7 +107,7 @@ return ['SupplierManagement' => [ 'Account' => 'Konto', 'EarningIndicator' => 'Verkaufssteuerkennzeichen', 'CostIndicator' => 'Einkaufssteuerkennzeichen', - 'Postal' => 'Reißverschluss', + 'Postal' => 'Reißverschluss', 'Status' => 'Status', 'Bills' => 'Rechnungen', 'ViewAccount' => 'Buchhaltung', diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index aac37b4..8e61329 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -78,7 +78,6 @@ return ['SupplierManagement' => [ 'PaymentTerm' => 'Payment Term', 'Permission' => 'Permission', 'Phone' => 'Phone', - 'Postal' => 'Postal', 'Price' => 'Price', 'Prices' => 'Prices', 'Productgroup' => 'Productgroup', @@ -105,7 +104,7 @@ return ['SupplierManagement' => [ 'CostIndicator' => 'Purchase tax code', 'Wire' => 'Wire', 'YTDSales' => 'YTD Sales', - 'Postal' => 'Postal', + 'Postal' => 'Postal', 'SLV' => 'SLV', 'Bill' => 'Bill', 'Status' => 'Status', diff --git a/Theme/Backend/supplier-view.tpl.php b/Theme/Backend/supplier-view.tpl.php index b941dd3..6fbffd2 100644 --- a/Theme/Backend/supplier-view.tpl.php +++ b/Theme/Backend/supplier-view.tpl.php @@ -358,7 +358,7 @@ echo $this->data['nav']->render(); $count = 0; foreach ($supplier->files as $file) : ++$count; - $url = UriFactory::build('{/base}/media/view?{?}&id=' . $file->id); + $url = UriFactory::build('{/base}/media/view?{?}&id=' . $file->id); $extensionType = FileUtils::getExtensionType($file->extension); ?>