Merge branch 'master' into efs_port

config.py

@@ -24,7 +24,7 @@ saveInRoot = False
 
 # Version data
 
-version = "2.3.0"
+version = "2.3.1"
 tag = "Stable"
 expansionName = "YC120.7"
 expansionVersion = "1.2"

gui/bitmap_loader.py

@@ -49,7 +49,7 @@ class BitmapLoader(object):
     @classmethod
     def getStaticBitmap(cls, name, parent, location):
         static = wx.StaticBitmap(parent)
-        static.SetBitmap(cls.getBitmap(name, location))
+        static.SetBitmap(cls.getBitmap(name or 0, location))
         return static
 
     @classmethod

service/port.py

@@ -46,7 +46,7 @@ from eos.saveddata.fighter import Fighter
 from eos.saveddata.module import Module, State, Slot
 from eos.saveddata.ship import Ship
 from eos.saveddata.citadel import Citadel
-from eos.saveddata.fit import Fit
+from eos.saveddata.fit import Fit, ImplantLocation
 from service.market import Market
 from utils.strfunctions import sequential_rep, replace_ltgt
 from abc import ABCMeta, abstractmethod
@@ -306,6 +306,8 @@ class Port(object):
                 fit.character = sFit.character
                 fit.damagePattern = sFit.pattern
                 fit.targetResists = sFit.targetResists
+                useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"]
+                fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT
                 db.save(fit)
                 # IDs.append(fit.ID)
                 if iportuser:  # Pulse
@@ -337,6 +339,8 @@ class Port(object):
             fit.character = sFit.character
             fit.damagePattern = sFit.pattern
             fit.targetResists = sFit.targetResists
+            useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"]
+            fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT
             db.save(fit)
         return fits