From 63e70e4fb0c954cc7f98a04b9f5ac897125448fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Hennes?= <nenes_fr@yahoo.fr>
Date: Wed, 2 Jun 2021 12:16:41 +0200
Subject: [PATCH] Fix #5

---
 customerautogroups/changelog.txt               | 4 +++-
 customerautogroups/controllers/admin/rules.php | 6 +++++-
 customerautogroups/customerautogroups.php      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/customerautogroups/changelog.txt b/customerautogroups/changelog.txt
index 441414d..7221473 100644
--- a/customerautogroups/changelog.txt
+++ b/customerautogroups/changelog.txt
@@ -9,4 +9,6 @@ V 0.3.2 - 2016-06-18 : Correction conditions < && <=
 V 0.3.3 - 2016-12-02 : Optimisation des lablels des filtres de la grille // Grid filters labels optimisation
 V 0.3.4 - 2016-12-07 : PS norms
 V 0.4.0 - 2017-04-06 : Compatibilité Prestashop 1.7 // Prestashop 1.7 compatibility
-V 0.5.0 - 2017-06-15 : Nouvelles conditions de filtres NOT LIKE, IN, NOT IN // New filters conditions NOT LIKE, IN, NOT IN
\ No newline at end of file
+V 0.5.0 - 2017-06-15 : Nouvelles conditions de filtres NOT LIKE, IN, NOT IN // New filters conditions NOT LIKE, IN, NOT IN
+V 0.5.1 - 2021-06-02 : #4 Backend error
+                       #5 Fix Column 'name' in where clause is ambiguous
\ No newline at end of file
diff --git a/customerautogroups/controllers/admin/rules.php b/customerautogroups/controllers/admin/rules.php
index 4559a1c..c6445d0 100644
--- a/customerautogroups/controllers/admin/rules.php
+++ b/customerautogroups/controllers/admin/rules.php
@@ -79,7 +79,11 @@ public function __construct()
                 'align' => 'center',
                 'class' => 'fixed-width-xs'
             ),
-            'name' => array('title' => $this->l('Name')),
+            'name' => array(
+                'title' => $this->l('Name'),
+                'lang' => true,
+                'filter_key' => 'b!name',
+            ),
             'condition_type_name' => array(
                 'title' => $this->l('Condition Type'),
                 'align' => 'center',
diff --git a/customerautogroups/customerautogroups.php b/customerautogroups/customerautogroups.php
index b6372ec..1dc6ad5 100644
--- a/customerautogroups/customerautogroups.php
+++ b/customerautogroups/customerautogroups.php
@@ -25,7 +25,7 @@ public function __construct()
         $this->author        = 'hhennes';
         $this->name          = 'customerautogroups';
         $this->tab           = 'others';
-        $this->version       = '0.5.0';
+        $this->version       = '0.5.1';
         $this->bootstrap = true;
         $this->need_instance = 0;