diff --git a/Admin/Install/attributes.json b/Admin/Install/attributes.json index 1c6f608..75796e4 100755 --- a/Admin/Install/attributes.json +++ b/Admin/Install/attributes.json @@ -523,6 +523,7 @@ "default_value": "", "values": [ { "value": "GENERAL" }, + { "value": "REDUCED" }, { "value": "SOFTWARE" }, { "value": "SERVICE" } ] diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 24fd34d..ab9effb 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -67,7 +67,7 @@ } }, "itemmgmt_item_relation_type": { - "description": "Items can be related in many ways e.g. expansions, services, successor, tools, spare parts, materials", + "comment": "Items can be related in many ways e.g. expansions, services, successor, tools, spare parts, materials", "name": "itemmgmt_item_relation_type", "fields": { "itemmgmt_item_relation_type_id": { @@ -243,13 +243,13 @@ "autoincrement": true }, "itemmgmt_material_category": { - "description": "product, packaging", + "comment": "product, packaging", "name": "itemmgmt_material_category", "type": "TINYINT(1)", "null": false }, "itemmgmt_material_subcategory": { - "description": "primary, secondary, tertiary, retail", + "comment": "primary, secondary, tertiary, retail", "name": "itemmgmt_material_subcategory", "type": "INT", "null": false @@ -296,7 +296,7 @@ "null": false }, "itemmgmt_item_l11n_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": "itemmgmt_item_l11n_type_required", "type": "TINYINT(1)", "null": false @@ -383,13 +383,13 @@ "null": false }, "itemmgmt_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": "itemmgmt_attr_type_required", "type": "TINYINT(1)", "null": false }, "itemmgmt_attr_type_pattern": { - "description": "This is a regex validation pattern.", + "comment": "This is a regex validation pattern.", "name": "itemmgmt_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 f537ccd..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,5 +0,0 @@ -# Structure - -## ER - -![ER](Modules/ItemManagement/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 7f8bc67..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 3e679fe..0000000 --- a/Docs/Help/de/SUMMARY.md +++ /dev/null @@ -1,4 +0,0 @@ -# User Content - -* [Attributes]({%}&page=Help/attributes) -* [Localization]({%}&page=Help/localization) 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 6eb9b17..0000000 --- a/Docs/Help/de/attributes.md +++ /dev/null @@ -1,116 +0,0 @@ -# Attributes - -## Default - -The module automatically installs the following default attributes which can be set in the attribute tab in the respective item. - -### General - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| default_sales_container | Default sales container to be used | First container created for the item | -| default_purchase_container | Default purchase container to be used | First container created for the item | -| internal_item | Is the item only meant for internal purposes (e.g. cleaning utilities)? | | -| bill_fees | Is special item on invoices (e.g. shipping cost, insurance fees, ...) | | -| upc | Universal product code | | -| hs_code | Harmonized system code (HS code) | | -| hazmat | Hazardous material type | | -| color | Item color | | -| length | Item length | | -| weight | Item weight | | -| height | Item height | | -| volume | Item volume | | -| release_date | Date of first release | | -| license | License type | | -| it_platform | Is it platform | | -| brand | Brand name | | -| model | Model description | | -| os | Operating system | | -| os_version | Operating system version | | -| dual_use | Is dual use item | | -| contract | Contract id related to this item | | -| subscription | Is item with subscription model | | -| subscription_interval_types | Interval types of the subscription (e.g. monthly) | | -| subscription_interval_value | Interval of the subscription | | -| subscription_renewal_type | How does the subscription renew | | -| subscription_interval_end | When does the subscription end? | | -| one_click_pay_cc | One click payment link for credit card payment | | -| one_click_pay_cc_id | One click id for credit card payment | | -| one_click_pay_paypal | One click payment link for paypal payment | | -| iso_keep_dry | Does the item need to be kept dry? | | -| iso_temparature_lower_limit | Lowest temperature for storage/transportation | | -| iso_temparature_upper_limit | Highest temperature for storage/transportation | | -| iso_shelf_life | What is the shelf life in days? | | -| country_of_origin | Country of origin | | -| country_of_assembly | Country of assembly | | -| country_of_last_processing | Country of last processing | | -| consumablefor | Is consumable for other item? Id of item required | | -| successorof | Is successor of other item? Id of item required | | -| variantof | Is variant of other item? Id of item required | | -| accessoryfor | Is accessory for other item? Id of item required | | -| sparepartfor | Is sparepart for other item? Id of item required | | -| isfamilyfriendly | Is familyfriendly item? | | -| item_condition | Condition of the item (e.g. used) | | -| gtin | GTIN | | -| eu_medical_device_class | EU medical device class | | -| fda_medical_regulatory_class | FDA medical regulatory class | | - -### Categories - -Items can be put in categories for horizontal and vertical grouping. By default the system uses segment->section->sales_group->product_group as categories as well as product_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 | -| sales_group | Level 3 | 1 | -| product_group | Level 4 | 1 | -| product_type | **NOT** hierarchically but to the side (e.g. machine, consumable, spare part, ...) | 1 | - -The following table shows an example item segmentation for the hierarchically categories: - -| Level | > | > | > | > | > | > | Sample | -| :---: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | :-------------------: | -| 1 | > | > | > | > | Segment 1 | > | Segment 2 | -| 2 | > | > | Section 1.1 | > | Section 1.2 | > | Section 2.1 | -| 3 | Sales Group 1.1.1 | > | Sales Group 1.1.2 | > | Sales Group 1.2.1 | Sales Group 2.1.1 | Sales Group 2.1.2 | -| 4 | Product Group 1.1.1.1 | Product Group 1.1.2.1 | Product Group 1.1.2.2 | Product Group 1.2.1.1 | Product Group 1.2.1.2 | Product Group 2.1.1.1 | Product Group 2.1.2.1 | - -> You could consider the item (number) itself `Level 5`. - -### Purchase & Stock - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| lead_time | Lead time in days for the procurement. Important for automatic order suggestions. | 3 days | -| admin_time | Internal administration time in seconds needed **per quantity** until a delivered item becomes ready for sales (e.g. quality control). Important for automatic order suggestions. | 10 seconds | -| maximum_stock_quantity | Maximum stock quantity to limit the automatic order suggestion. Only needed for certain algorithms. | | -| minimum_stock_quantity | Minimum stock quantity that should always be in stock. Important for automatic order suggestions. Alternatively, see **minimum_stock_range**. | | -| minimum_stock_range | Minimum stock range in days that should always be in stock. Important for automatic order suggestions. Alternatively, see **minimum_stock_quantity**. | 1 day | -| minimum_order_quantity | Minimum order quantity when ordering. Important for automatic order suggestions. | | -| order_quantity_steps | Minimum quantity increments above the minimum_order_quantity. This allows item purchases in increments of 10, 100 etc. Important for automatic order suggestions. | 1 | -| order_suggestion_type | Coming soon | | -| order_suggestion_optimization_type | Coming soon | | -| order_suggestion_history_duration | Coming soon | | -| order_suggestion_averaging_method | Coming soon | | -| order_suggestion_comparison_duration_type | Coming soon | | -| stock_evaluation_category | How should the item value for the stock evaluation be determined? | Average | - -### Shop - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| shop_item | Is the item used in a shop? | | -| shop_featured | Is the item a featured item? | | -| shop_front | Should the item be shown on the front page of the shop? | | -| shop_external_link | Link for the item to an external website (e.g. manufacturer website) | | - -### Accounting - -| Attribute | Description | Internal default value | -| --------- | ----------- | ---------------------- | -| sales_tax_code | Tax code for sales | | -| purchase_tax_code | Tax code for purchase | | -| costcenter | Cost center for accounting | | -| costobject | Cost object for accounting | | - 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/de/procurement.md b/Docs/Help/de/procurement.md deleted file mode 100644 index e69de29..0000000 diff --git a/Docs/Help/de/stock.md b/Docs/Help/de/stock.md deleted file mode 100644 index e69de29..0000000 diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md index 14e6a9e..bda1e49 100644 --- a/Docs/Help/en/introduction.md +++ b/Docs/Help/en/introduction.md @@ -4,7 +4,7 @@ The **Item Management** module is an essential module for any ERP application. T ## 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 anyone who wants to manage their tangible and non-tangible products. This usually applies to the sales and purchase department. # Setup @@ -30,7 +30,7 @@ Attributes allow you to define various item characteristics such as color, medic ## 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 @@ -48,7 +48,6 @@ Together with the **Warehouse Management** module you can also track your stocks Other modules that work great with this one together are: -* [Warehouse Management](WarehouseManagement) -* [Supplier Management](SupplierManagement) -* [Purchase](Purchase) -* [Accounting](Accounting) +* [Warehouse Management]({/}?id=WarehouseManagement) +* [Supplier Management]({/}?id=SupplierManagement) +* [Purchase]({/}?id=Purchase) diff --git a/Theme/Backend/item-view.tpl.php b/Theme/Backend/item-view.tpl.php index 9b42485..fe9a05b 100644 --- a/Theme/Backend/item-view.tpl.php +++ b/Theme/Backend/item-view.tpl.php @@ -257,7 +257,7 @@ echo $this->data['nav']->render(); $count = 0; foreach ($item->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); ?>