merge

tryton/gui/window/dblogin.py

@@ -490,7 +490,7 @@ class DBLogin(object):
             self.profiles.write(configfile)
 
         for idx, row in enumerate(self.profile_store):
-            if row[0] == profile_name:
+            if row[0] == profile_name and row[1]:
                 self.combo_profile.set_active(idx)
                 self.profile_changed(self.combo_profile)
                 break
@@ -526,6 +526,8 @@ class DBLogin(object):
         host, port = host_entry.split(':', 1) if ':' in host_entry else ('', '')
         database = self.entry_database.get_text().strip()
         for idx, profile_info in enumerate(self.profile_store):
+            if not profile_info[1]:
+                continue
             profile = profile_info[0]
             if (host == self.profiles.get(profile, 'host')
                     and port == self.profiles.get(profile, 'port')

tryton/gui/window/view_form/view/list.py

@@ -818,23 +818,22 @@ class ViewList(ParserView):
             value = 0.0
             value_selected = 0.0
             loaded = True
+            child_fieldname = self.children[child][0]
             for record in self.screen.group:
-                if not record.loaded:
+                if not record.get_loaded([child_fieldname]):
                     loaded = False
                     break
+                field_value = record.fields_get()[child_fieldname].get(record,
+                    check_load=False)
                 if record.id in ids or not ids:
                     if not value_selected:
-                        value_selected = record.fields_get()[self.children[child][0]]\
-                                .get(record, check_load=False)
+                        value_selected = field_value
                     else:
-                        value_selected += record.fields_get()[self.children[child][0]]\
-                                .get(record, check_load=False)
+                        value_selected += field_value
                 if not value:
-                    value = record.fields_get()[self.children[child][0]]\
-                            .get(record, check_load=False)
+                    value = field_value
                 else:
-                    value += record.fields_get()[self.children[child][0]]\
-                            .get(record, check_load=False)
+                    value += field_value
 
             if loaded:
                 label_str = locale.format('%.' + str(self.children[child][3]) + 'f',