From fa523e087c14390707c38263772bc3d18391897f Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Sun, 8 Oct 2017 18:48:05 -0700
Subject: [PATCH] Fixed error msg about unsupported stock type.

---
 src/Mod/Path/InitGui.py                | 5 +++--
 src/Mod/Path/PathScripts/PathJobCmd.py | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py
index 96f800fda5..d1a8dd317e 100644
--- a/src/Mod/Path/InitGui.py
+++ b/src/Mod/Path/InitGui.py
@@ -152,12 +152,13 @@ class PathWorkbench (Workbench):
         if len(FreeCADGui.Selection.getSelection()) == 1:
             obj = FreeCADGui.Selection.getSelection()[0]
             if obj.isDerivedFrom("Path::Feature"):
+                self.appendContextMenu("", "Separator")
                 self.appendContextMenu("", ["Path_Inspect"])
                 selectedName = obj.Name
-                if "Job" in selectedName:
-                    self.appendContextMenu("", ["Path_ExportTemplate"])
                 if "Remote" in selectedName:
                     self.appendContextMenu("", ["Refresh_Path"])
+                if "Job" in selectedName:
+                    self.appendContextMenu("", ["Path_ExportTemplate"])
             if isinstance (obj.Proxy, PathScripts.PathOp.ObjectOp):
                 self.appendContextMenu("", ["Path_OperationCopy"])
             if obj.isDerivedFrom("Path::Feature"):
diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py
index d9be97b97a..89767819f0 100644
--- a/src/Mod/Path/PathScripts/PathJobCmd.py
+++ b/src/Mod/Path/PathScripts/PathJobCmd.py
@@ -143,12 +143,13 @@ class DlgJobTemplateExport:
             self.dialog.postProcessingGroup.setChecked(False)
 
         if job.Stock and not PathJob.isResourceClone(job, 'Stock', 'Stock'):
-            if hasattr(job.Stock, 'ExtXNeg'):
+            stockType = PathStock.StockType.FromStock(job.Stock)
+            if stockType == PathStock.StockType.FromBase:
                 seHint = translate('PathJob', "Base -/+ %.2f/%.2f %.2f/%.2f %.2f/%.2f") % (job.Stock.ExtXneg, job.Stock.ExtXpos, job.Stock.ExtYneg, job.Stock.ExtYpos, job.Stock.ExtZneg, job.Stock.ExtZpos)
                 self.dialog.stockPlacement.setChecked(False)
-            elif hasattr(job.Stock, 'Length') and hasattr(job.Stock, 'Width'):
+            elif stockType == PathStock.StockType.CreateBox:
                 seHint = translate('PathJob', "Box: %.2f x %.2f x %.2f") % (job.Stock.Length, job.Stock.Width, job.Stock.Height)
-            elif hasattr(job.Stock, 'Radius'):
+            elif stockType == PathStock.StockType.CreateCylinder:
                 seHint = translate('PathJob', "Cylinder: %.2f x %.2f") % (job.Stock.Radius, job.Stock.Height)
             else:
                 seHint = '-'