gestion: suggestion <automatique> si wifi ou chbre

gestion/gest_crans.py

@@ -2676,18 +2676,11 @@ def menu_principal():
             try:
                 if choix == 'Fixe':
                     becane = MachineFixe(proprio)
-                    #Saisie prédictive de la mac
-                    try:
-                        prise = proprio.chbre().lower()[0] + becane.prise()
-                        becane.ip("<automatique>", lock=False)
-                        f = open('/usr/scripts/var/last_macs/' + prise, 'r')
-                        becane.mac(f.read(), lock=False)
-                        f.close()
-                    except:
-                        pass
-
                 elif choix == 'Wifi':
                     becane = MachineWifi(proprio)
+                # Suggestion: ne pas relever la mac
+                if choix == 'Wifi' or (choix == 'Fixe' and proprio.chbre() not in ['', 'EXT']):
+                    becane.mac("<automatique>")
             except ValueError, c:
                 arg  = u'--title "Nouvelle machine" '
                 arg += u'--msgbox "%s\n\n\n" 0 0' % to_unicode(c.args[0])