diff --git a/lib/caditem.py b/lib/caditem.py index a8ed8b9..f2c858f 100644 --- a/lib/caditem.py +++ b/lib/caditem.py @@ -641,8 +641,6 @@ class CadItem(DataModel): self.check_key_both_columns("aenderungstext_sivas", "aenderungstext_neu", missing) # Freigabevermerk self.check_key_both_columns("freigabevermerk_sivas", "freigabevermerk_neu", missing) - # Automatische Zusatzinformationen - self.check_key_existence("zusatzinfos_auto_text", missing) if len(missing) > 0: return (False, missing) else: @@ -870,7 +868,6 @@ class CadItem(DataModel): ret = False if re.findall(r'1 out of 1', content): - os.remove(path) self.message_info('Preparation sucessful', 'preparation_sucessful', {'path':impf_pfad}) ret = True elif re.findall(r'Error', content): @@ -1209,8 +1206,12 @@ class CadItem(DataModel): # Material material = self.get_content('material_sivas', 'material_neu') + if material: - data["WerkstoffNE"] = material + if not aus_halbzeug: + data["WerkstoffNE"] = material + else: + data["WerkstoffNE"] = "" # Oberfläche oberflaeche = self.get_gui_data('oberflaeche_neu')