From 89d949d5d8eae53ef85761897703273623306d06 Mon Sep 17 00:00:00 2001
From: Lewis Voncken <lewis@experius.nl>
Date: Mon, 23 Oct 2017 16:39:28 +0000
Subject: [PATCH 1/2] [BUGFIX] Solved error while upgrading from 2.1 to 2.2

Given error while running setup:upgrade:

	`postcode is a required field`

Problem is solved by setting tax_postcode to * if it was NULL
---
 app/code/Magento/Tax/Setup/UpgradeData.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Tax/Setup/UpgradeData.php b/app/code/Magento/Tax/Setup/UpgradeData.php
index c2b9baca84042..49027a633cb70 100644
--- a/app/code/Magento/Tax/Setup/UpgradeData.php
+++ b/app/code/Magento/Tax/Setup/UpgradeData.php
@@ -91,6 +91,9 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                     /** @var \Magento\Directory\Model\Region $region */
                     $region = $this->directoryRegionFactory->create();
                     $region->loadByCode($regionCode, $taxRateData->getTaxCountryId());
+                    if ($taxRateData->getTaxPostcode() === null) {
+                        $taxRateData->setTaxPostcode('*');
+                    }
                     $taxRateData->setTaxRegionId($region->getRegionId());
                     $this->taxRateRepository->save($taxRateData);
                 }

From d42864ba2a8e60ba620516e451e4ac035bd82f6d Mon Sep 17 00:00:00 2001
From: Lewis Voncken <lewis@experius.nl>
Date: Mon, 23 Oct 2017 22:01:04 +0000
Subject: [PATCH 2/2] [TASK] Changed module version from 2.0.2 to 2.0.3

---
 app/code/Magento/Tax/Setup/UpgradeData.php | 2 +-
 app/code/Magento/Tax/etc/module.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Tax/Setup/UpgradeData.php b/app/code/Magento/Tax/Setup/UpgradeData.php
index 49027a633cb70..5ede9cb6180e4 100644
--- a/app/code/Magento/Tax/Setup/UpgradeData.php
+++ b/app/code/Magento/Tax/Setup/UpgradeData.php
@@ -81,7 +81,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 false
             );
         }
-        if (version_compare($context->getVersion(), '2.0.2', '<')) {
+        if (version_compare($context->getVersion(), '2.0.3', '<')) {
             //Update the tax_region_id
             $taxRateList = $this->taxRateRepository->getList($this->searchCriteriaFactory->create());
             /** @var \Magento\Tax\Api\Data\TaxRateInterface $taxRateData */
diff --git a/app/code/Magento/Tax/etc/module.xml b/app/code/Magento/Tax/etc/module.xml
index 4f1c5dbeb12ec..a100b0ac01181 100644
--- a/app/code/Magento/Tax/etc/module.xml
+++ b/app/code/Magento/Tax/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Tax" setup_version="2.0.2">
+    <module name="Magento_Tax" setup_version="2.0.3">
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Checkout"/>