Merge remote-tracking branch 'origin/MAGETWO-54787' into bugfixes

olysenko · olysenko · commit 33182e6afca6 · 2016-07-07T17:22:06.000+03:00
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -54,7 +54,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
 
             $installer->endSetup();
         }
-        if (version_compare($context->getVersion(), '2.0.7', '<')) {
+        if (version_compare($context->getVersion(), '2.0.3', '<')) {
             $this->addColumnBaseGrandTotal($installer);
             $this->addIndexBaseGrandTotal($installer);
         }
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/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_Sales" setup_version="2.0.2">
+    <module name="Magento_Sales" setup_version="2.0.3">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con`
`54`	`54`
`55`	`55`	`$installer->endSetup();`
`56`	`56`	`}`
`57`		`- if (version_compare($context->getVersion(), '2.0.7', '<')) {`
	`57`	`+ if (version_compare($context->getVersion(), '2.0.3', '<')) {`
`58`	`58`	`$this->addColumnBaseGrandTotal($installer);`
`59`	`59`	`$this->addIndexBaseGrandTotal($installer);`
`60`	`60`	`}`