Skip to content

Commit

Permalink
DHLGKP-278: raise version number, update changlog
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasMueller75 committed Jun 22, 2020
1 parent cc30547 commit 8724ed2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.8.0] - 2020-06-22

### Added
- shipment product Merchandise shipment
- shipment default selection for automatic shipment creation

### Removed

- austrian shipment products


## [1.7.0] - 2020-05-08

### Changed
Expand Down
5 changes: 3 additions & 2 deletions doc/src/EndKundenDoku.rst
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,9 @@ steuern, welche Bestellungen von der automatischen Verarbeitung ausgeschlossen w

Die Einstellung *Versandprodukt (Inland)* legt das Standard-Versandprodukt für die
automatische Sendungserstellung nationaler Sendungen fest. Hier stehen folgende Produkte zur Verfügung:
* Paket National für Sendungen bis 31,5 kg
* Warenpost National (Merchandise Shipment) für kleinere/leichtere Sendungen

- Paket National für Sendungen bis 31,5 kg
- Warenpost National (Merchandise Shipment) für kleinere/leichtere Sendungen

Standardwerte für Sendungen
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
5 changes: 3 additions & 2 deletions doc/src/EndUserDoc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,9 @@ automatically.

The setting *Shipping Product (Domestic)* defines the domestic default shipping product for automated shipment orders.
The following products are available:
* National Shipment (Paket National) for parcels up to 31.5 kg
* Merchandise Shipment (Warenpost) for smaller/low weight goods

- National Shipment (Paket National) for parcels up to 31.5 kg
- Merchandise Shipment (Warenpost) for smaller/low weight goods

Shipment Defaults
~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion src/app/code/community/Dhl/Versenden/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<config>
<modules>
<Dhl_Versenden>
<version>1.7.0</version>
<version>1.8.0</version>
</Dhl_Versenden>
</modules>
<global>
Expand Down

0 comments on commit 8724ed2

Please sign in to comment.