6.23.1 (FINAL RELEASE)

m2epro · Jun 13, 2022 · 7825cb7 · 7825cb7
1 parent ff76c2c
commit 7825cb7
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 69 deletions.
diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Grid/Column/Renderer/Status.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Grid/Column/Renderer/Status.php
@@ -147,7 +147,7 @@ protected function getProductStatus($status)
 
             case Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED:
                 return'<span style="color: orange; font-weight: bold;">' .
-                    Mage::helper('M2ePro')->__('Inactive (Blocked)') . '</span>';
+                    Mage::helper('M2ePro')->__('Incomplete') . '</span>';
         }
 
         return '';

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Other/View/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Other/View/Grid.php
@@ -157,7 +157,7 @@ protected function _prepareColumns()
                     Ess_M2ePro_Model_Listing_Product::STATUS_LISTED  => Mage::helper('M2ePro')->__('Active'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED => Mage::helper('M2ePro')->__('Inactive'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')
-                        ->__('Inactive (Blocked)')
+                        ->__('Incomplete')
                 ),
                 'frame_callback' => array($this, 'callbackColumnStatus')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Search/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/Search/Grid.php
@@ -124,7 +124,7 @@ protected function _prepareColumns()
                 Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_LISTED     => Mage::helper('M2ePro')->__('Active'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED    => Mage::helper('M2ePro')->__('Inactive'),
-                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Incomplete')
             ),
             'frame_callback'            => array($this, 'callbackColumnStatus'),
             'filter_condition_callback' => array($this, 'callbackFilterStatus')
@@ -583,7 +583,7 @@ protected function getProductStatus($status)
 
             case Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED:
                 return'<span style="color: orange; font-weight: bold;">' .
-                Mage::helper('M2ePro')->__('Inactive (Blocked)') . '</span>';
+                Mage::helper('M2ePro')->__('Incomplete') . '</span>';
         }
 
         return '';

diff --git a/...s/M2ePro/Block/Adminhtml/Amazon/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php b/...s/M2ePro/Block/Adminhtml/Amazon/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php
@@ -248,7 +248,7 @@ protected function _prepareColumns()
                     Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_LISTED => Mage::helper('M2ePro')->__('Active'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED => Mage::helper('M2ePro')->__('Inactive'),
-                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Incomplete')
                 ),
                 'renderer'     => 'M2ePro/adminhtml_amazon_grid_column_renderer_status'
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/View/Amazon/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/View/Amazon/Grid.php
@@ -288,7 +288,7 @@ protected function _prepareColumns()
                     Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_LISTED => Mage::helper('M2ePro')->__('Active'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED => Mage::helper('M2ePro')->__('Inactive'),
-                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Incomplete')
                 ),
                 'frame_callback' => array($this, 'callbackColumnStatus'),
                 'filter_condition_callback' => array($this, 'callbackFilterStatus')

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/View/Sellercentral/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Listing/View/Sellercentral/Grid.php
@@ -276,7 +276,7 @@ protected function _prepareColumns()
                     Ess_M2ePro_Model_Listing_Product::STATUS_UNKNOWN => Mage::helper('M2ePro')->__('Unknown'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_LISTED => Mage::helper('M2ePro')->__('Active'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED => Mage::helper('M2ePro')->__('Inactive'),
-                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Incomplete')
                 ),
                 'frame_callback' => array($this, 'callbackColumnStatus')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Grid/Column/Renderer/ViewLogIcon/Listing.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Grid/Column/Renderer/ViewLogIcon/Listing.php
@@ -22,7 +22,7 @@ protected function getAvailableActions()
             Log::ACTION_STOP_PRODUCT_ON_COMPONENT   => $this->__('Stop'),
             Log::ACTION_REMAP_LISTING_PRODUCT       => $this->__('Relink'),
             Log::ACTION_STOP_AND_REMOVE_PRODUCT     => $this->__('Stop on Channel / Remove from Listing'),
-            Log::ACTION_CHANNEL_CHANGE              => $this->__('Channel Change')
+            Log::ACTION_CHANNEL_CHANGE              => $this->__('External Change')
         );
     }
 

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Grid/Column/Renderer/Status.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Grid/Column/Renderer/Status.php
@@ -157,7 +157,7 @@ protected function getProductStatus($row, $status, $statusChangeReasons = array(
                 break;
             case Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED:
                 $html ='<span style="color: orange; font-weight: bold;">'
-                    . Mage::helper('M2ePro')->__('Inactive (Blocked)') . '</span>';
+                    . Mage::helper('M2ePro')->__('Incomplete') . '</span>';
                 break;
         }
 

diff --git a/...community/Ess/M2ePro/Block/Adminhtml/Walmart/Grid/Column/Renderer/ViewLogIcon/Listing.php b/...community/Ess/M2ePro/Block/Adminhtml/Walmart/Grid/Column/Renderer/ViewLogIcon/Listing.php
@@ -20,7 +20,7 @@ protected function getAvailableActions()
                 Log::ACTION_DELETE_PRODUCT_FROM_COMPONENT => $this->__('Remove Item from Channel'),
                 Log::ACTION_DELETE_AND_REMOVE_PRODUCT     => $this->__('Remove from Channel & Listing'),
                 Log::ACTION_DELETE_PRODUCT_FROM_LISTING   => $this->__('Delete Item from Listing'),
-                Log::ACTION_RESET_BLOCKED_PRODUCT         => $this->__('Reset Inactive (Blocked) Item'),
+                Log::ACTION_RESET_BLOCKED_PRODUCT         => $this->__('Reset Incomplete Item'),
             );
     }
 

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/Other/View/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/Other/View/Grid.php
@@ -152,7 +152,7 @@ protected function _prepareColumns()
                 'options'        => array(
                     Ess_M2ePro_Model_Listing_Product::STATUS_LISTED  => Mage::helper('M2ePro')->__('Active'),
                     Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED => Mage::helper('M2ePro')->__('Inactive'),
-                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                    Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Incomplete')
                 ),
                 'frame_callback' => array($this, 'callbackColumnStatus')
             )

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/Search/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/Search/Grid.php
@@ -119,7 +119,7 @@ protected function _prepareColumns()
                 Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_LISTED     => Mage::helper('M2ePro')->__('Active'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED    => Mage::helper('M2ePro')->__('Inactive'),
-                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Incomplete')
             ),
             'frame_callback'            => array($this, 'callbackColumnStatus'),
             'filter_condition_callback' => array($this, 'callbackFilterStatus')
@@ -173,7 +173,7 @@ protected function getProductStatus($row, $status)
 
             case Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED:
                 return'<span style="color: orange; font-weight: bold;">' .
-                Mage::helper('M2ePro')->__('Inactive (Blocked)') . '</span>';
+                Mage::helper('M2ePro')->__('Incomplete') . '</span>';
         }
 
         return '';

diff --git a/.../M2ePro/Block/Adminhtml/Walmart/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php b/.../M2ePro/Block/Adminhtml/Walmart/Listing/Variation/Product/Manage/Tabs/Variations/Grid.php
@@ -224,7 +224,7 @@ protected function _prepareColumns()
                 Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_LISTED     => Mage::helper('M2ePro')->__('Active'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED    => Mage::helper('M2ePro')->__('Inactive'),
-                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Incomplete')
             ),
             'renderer'                  => 'M2ePro/adminhtml_walmart_grid_column_renderer_status',
             'filter_condition_callback' => array($this, 'callbackFilterStatus')
@@ -318,7 +318,7 @@ protected function _prepareMassaction()
         $this->getMassactionBlock()->addItem(
             'resetProducts',
             array(
-                'label'   => Mage::helper('M2ePro')->__('Reset Inactive (Blocked) Item(s)'),
+                'label'   => Mage::helper('M2ePro')->__('Reset Incomplete Item(s)'),
                 'url'     => '',
                 'confirm' => Mage::helper('M2ePro')->__('Are you sure?')
             ),
@@ -914,7 +914,7 @@ protected function _toHtml()
         $resetBlockedProductsMessage = Mage::helper('M2ePro')
             ->escapeJs(
                 Mage::helper('M2ePro')
-                    ->__('Reset Inactive (Blocked) Items')
+                    ->__('Reset Incomplete Items')
             );
 
         $errorChangingProductOptions = $helper->escapeJs($helper->__('Please Select Product Options.'));

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/View.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/View.php
@@ -284,7 +284,7 @@ public function getGridHtml()
             Mage::helper('M2ePro')->__('Retiring From Walmart And Removing from Listing Selected Items')
         );
         $resetBlockedProductsMessage = Mage::helper('M2ePro')->escapeJs(
-            Mage::helper('M2ePro')->__('Reset Inactive (Blocked) Items')
+            Mage::helper('M2ePro')->__('Reset Incomplete Items')
         );
 
         $removingSelectedItemsMessage = $helper->escapeJs($helper->__('Removing From Listing Selected Items'));

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/View/Walmart/Grid.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Walmart/Listing/View/Walmart/Grid.php
@@ -264,7 +264,7 @@ protected function _prepareColumns()
                 Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_LISTED => Mage::helper('M2ePro')->__('Active'),
                 Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED => Mage::helper('M2ePro')->__('Inactive'),
-                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+                Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED => Mage::helper('M2ePro')->__('Incomplete')
             ),
             'frame_callback' => array($this, 'callbackColumnStatus'),
             'filter_condition_callback' => array($this, 'callbackFilterStatus')
@@ -346,7 +346,7 @@ protected function _prepareMassaction()
 
         $this->getMassactionBlock()->addItem(
             'resetProducts', array(
-                'label'    => Mage::helper('M2ePro')->__('Reset Inactive (Blocked) Item(s)'),
+                'label'    => Mage::helper('M2ePro')->__('Reset Incomplete Item(s)'),
                 'url'      => '',
                 'confirm'  => Mage::helper('M2ePro')->__('Are you sure?')
             ), 'other'

diff --git a/app/code/community/Ess/M2ePro/CHANGELOG b/app/code/community/Ess/M2ePro/CHANGELOG
@@ -1,4 +1,13 @@
-* 6.23.0 (30/05/2022) 
+* 6.23.1 (13/06/2022) 
+
+Common: [Fixed] Log type was not updated from "Channel Change" to "External Change" for Products in M2E Pro Listing [#3455]
+eBay: [Fixed] Multi-variation listings were disabled for some supported eBay categories [#3429]
+Amazon: [Fixed] Product is added to M2E Pro Listing with incorrect ASIN/ISBN when using the "Sell on another Marketplace" feature [#3503]
+Amazon: [Improved] "Inactive/Blocked" product status replaced with "Incomplete" [#3657]
+Walmart: [Fixed] Server error appears at the step of configuring the Unmanaged item and moving it to M2E Pro Listing [#3652]
+Walmart: [Improved] "Inactive/Blocked" product status replaced with "Incomplete" [#3657]
+
+* 6.23.0 (30/05/2022)
 
 Common: [Added] Possibility to disable import of Ship by date to Magento orders [#3504]
 Amazon: [Fixed] The time is offset according to the Magento time zone when the Restock Date is set to a Custom Value [#3533]

diff --git a/app/code/community/Ess/M2ePro/Helper/Component/Amazon.php b/app/code/community/Ess/M2ePro/Helper/Component/Amazon.php
@@ -54,7 +54,7 @@ public function getHumanTitleByListingProductStatus($status)
             Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
             Ess_M2ePro_Model_Listing_Product::STATUS_LISTED     => Mage::helper('M2ePro')->__('Active'),
             Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED    => Mage::helper('M2ePro')->__('Inactive'),
-            Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+            Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Incomplete')
         );
 
         if (!isset($statuses[$status])) {

diff --git a/app/code/community/Ess/M2ePro/Helper/Component/Walmart.php b/app/code/community/Ess/M2ePro/Helper/Component/Walmart.php
@@ -53,7 +53,7 @@ public function getHumanTitleByListingProductStatus($status)
             Ess_M2ePro_Model_Listing_Product::STATUS_NOT_LISTED => Mage::helper('M2ePro')->__('Not Listed'),
             Ess_M2ePro_Model_Listing_Product::STATUS_LISTED     => Mage::helper('M2ePro')->__('Active'),
             Ess_M2ePro_Model_Listing_Product::STATUS_STOPPED    => Mage::helper('M2ePro')->__('Inactive'),
-            Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Inactive (Blocked)')
+            Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED    => Mage::helper('M2ePro')->__('Incomplete')
         );
 
         if (!isset($statuses[$status])) {

diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Listing.php b/app/code/community/Ess/M2ePro/Model/Amazon/Listing.php
@@ -1138,9 +1138,7 @@ public function addProductFromAnotherAmazonSite(
         /** @var Ess_M2ePro_Model_Listing_Product $listingProduct */
         $listingProduct = $this->getParentObject()->addProduct(
             $sourceListingProduct->getProductId(),
-            Ess_M2ePro_Helper_Data::INITIATOR_USER,
-            false,
-            false
+            Ess_M2ePro_Helper_Data::INITIATOR_USER
         );
 
         $logModel = Mage::getModel('M2ePro/Listing_Log');
@@ -1167,37 +1165,6 @@ public function addProductFromAnotherAmazonSite(
                 Ess_M2ePro_Model_Log_Abstract::TYPE_NOTICE
             );
 
-            $listingProduct->getChildObject()->setData(
-                'general_id',
-                $sourceListingProduct->getChildObject()->getGeneralId()
-            );
-
-            $listingProduct->getChildObject()->setData(
-                'is_general_id_owner',
-                $sourceListingProduct->getChildObject()->isGeneralIdOwner()
-            );
-
-            $sourceAdditionalData = $sourceListingProduct->getSettings('additional_data');
-            $additionalData = $listingProduct->getSettings('additional_data');
-            $keys = array(
-                'variation_product_attributes',
-                'variation_virtual_channel_attributes',
-                'variation_channel_variations',
-                'variation_channel_attributes_sets',
-                'variation_virtual_product_attributes',
-                'variation_matched_attributes'
-            );
-
-            foreach ($keys as $key) {
-                if (!isset($sourceAdditionalData[$key])) {
-                    continue;
-                }
-
-                $additionalData[$key] = $sourceAdditionalData[$key];
-            }
-
-            $listingProduct->setSettings('additional_data', $additionalData);
-
             if ($sourceListing->getMarketplaceId() == $this->getParentObject()->getMarketplaceId()) {
                 $listingProduct->getChildObject()->setData(
                     'template_description_id',
@@ -1215,7 +1182,6 @@ public function addProductFromAnotherAmazonSite(
 
             // @codingStandardsIgnoreLine
             $listingProduct->getChildObject()->save();
-            $listingProduct->save();
 
             return $listingProduct;
         }

diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Magento/Product/Rule/Custom/AmazonStatus.php b/app/code/community/Ess/M2ePro/Model/Amazon/Magento/Product/Rule/Custom/AmazonStatus.php
@@ -83,7 +83,7 @@ public function getOptions()
             ),
             array(
                 'value' => Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED,
-                'label' => Mage::helper('M2ePro')->__('Inactive (Blocked)'),
+                'label' => Mage::helper('M2ePro')->__('Incomplete'),
             ),
         );
     }

diff --git a/app/code/community/Ess/M2ePro/Model/Listing/Log.php b/app/code/community/Ess/M2ePro/Model/Listing/Log.php
@@ -62,7 +62,7 @@ class Ess_M2ePro_Model_Listing_Log extends Ess_M2ePro_Model_Log_Abstract
     const ACTION_SWITCH_TO_MFN_ON_COMPONENT     = 30;
     const _ACTION_SWITCH_TO_MFN_ON_COMPONENT    = 'Switching Fulfillment to MFN';
     const ACTION_RESET_BLOCKED_PRODUCT          = 32;
-    const _ACTION_RESET_BLOCKED_PRODUCT         = 'Reset Inactive (Blocked) Item';
+    const _ACTION_RESET_BLOCKED_PRODUCT         = 'Reset Incomplete Item';
 
     const ACTION_CHANGE_PRODUCT_SPECIAL_PRICE_FROM_DATE  = 19;
     const _ACTION_CHANGE_PRODUCT_SPECIAL_PRICE_FROM_DATE = 'Change of Product Special Price from date in Magento Store';

diff --git a/app/code/community/Ess/M2ePro/Model/Order/Proxy.php b/app/code/community/Ess/M2ePro/Model/Order/Proxy.php
@@ -344,8 +344,8 @@ protected function getNameParts($fullName)
             $parts = array($parts[0], $parts[$partsCount - 1]);
         }
 
-        $currentInfo['firstname'] = isset($parts[0]) ? $parts[0] : 'N/A';
-        $currentInfo['lastname'] = isset($parts[1]) ? $parts[1] : 'N/A';
+        $currentInfo['firstname'] = isset($parts[0]) ? $parts[0] : 'NA';
+        $currentInfo['lastname'] = isset($parts[1]) ? $parts[1] : 'NA';
 
         return $currentInfo;
     }

diff --git a/app/code/community/Ess/M2ePro/Model/Walmart/Listing/Product.php b/app/code/community/Ess/M2ePro/Model/Walmart/Listing/Product.php
@@ -877,7 +877,7 @@ public function mapChannelItemProduct()
 
     public function addVariationAttributes()
     {
-        if (!$this->getVariationManager()->isVariationProduct()) {
+        if (!$this->getVariationManager()->isRelationParentType()) {
             return;
         }
 

diff --git a/app/code/community/Ess/M2ePro/Model/Walmart/Listing/Product/Action/Type/Validator.php b/app/code/community/Ess/M2ePro/Model/Walmart/Listing/Product/Action/Type/Validator.php
@@ -220,7 +220,7 @@ protected function validateOnlinePriceInvalidBlocked()
     {
         if ($this->getListingProduct()->isBlocked() && $this->getWalmartListingProduct()->isOnlinePriceInvalid()) {
             $message = <<<HTML
-The action cannot be submitted. Your Item is in Inactive (Blocked) status because it violates Walmart pricing rules.
+The action cannot be submitted. Your Item is in Incomplete status because it violates Walmart pricing rules.
  Please adjust the Item Price to comply with the Walmart requirements.
  Once the changes are applied, Walmart Item will become Active automatically.
 HTML;
@@ -236,7 +236,7 @@ protected function validateMissedOnChannelBlocked()
     {
         if ($this->getListingProduct()->isBlocked() && $this->getWalmartListingProduct()->isMissedOnChannel()) {
             $message = <<<HTML
-The action cannot be submitted. Your Item is in Inactive (Blocked) status because it seems that the corresponding
+The action cannot be submitted. Your Item is in Incomplete status because it seems that the corresponding
  Walmart Item does not exist in your Channel inventory. Please contact Walmart Support Team to resolve the issue.
 HTML;
 
@@ -254,7 +254,7 @@ protected function validateGeneralBlocked()
             !$this->getWalmartListingProduct()->isOnlinePriceInvalid()
         ) {
             $message = <<<HTML
-The action cannot be submitted. Your Item is in Inactive (Blocked) status because some Item data may
+The action cannot be submitted. Your Item is in Incomplete status because some Item data may
  contradict Walmart rules. To restore the Item to Active status, please adjust the related Policy settings and
  click Reset next to that Item. M2E Pro will resubmit the Item automatically.
 HTML;

diff --git a/app/code/community/Ess/M2ePro/Model/Walmart/Magento/Product/Rule/Custom/WalmartStatus.php b/app/code/community/Ess/M2ePro/Model/Walmart/Magento/Product/Rule/Custom/WalmartStatus.php
@@ -83,7 +83,7 @@ public function getOptions()
             ),
             array(
                 'value' => Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED,
-                'label' => Mage::helper('M2ePro')->__('Inactive (Blocked)'),
+                'label' => Mage::helper('M2ePro')->__('Incomplete'),
             ),
         );
     }

diff --git a/app/code/community/Ess/M2ePro/composer.json b/app/code/community/Ess/M2ePro/composer.json
@@ -2,7 +2,7 @@
   "name": "m2epro/magento1-extension",
   "description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Walmart platforms.",
   "type": "magento-module",
-  "version": "6.23.0",
+  "version": "6.23.1",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ public function getOptions() @@
                 ),
                 array(
                     'value' => Ess_M2ePro_Model_Listing_Product::STATUS_BLOCKED,
-                    'label' => Mage::helper('M2ePro')->__('Inactive (Blocked)'),
+                    'label' => Mage::helper('M2ePro')->__('Incomplete'),
                 ),
             );
         }
@@ Expand Down @@