Updated General Catalog Database Diagram, created Changelog file and …

…creating screens only have save button.

CHANGES-GeneralCatalog.md

@@ -0,0 +1,2 @@
+#6.0.0 2017-??-??
+ - 2017-08-22 Ported to OTRS6.

Kernel/Output/HTML/Templates/Standard/AdminGeneralCatalog.tt

@@ -247,9 +247,13 @@
                         <div class="Clear"></div>
 
                         <div class="Field SpacingTop">
-                            <button name="SubmitAndContinue" class="CallForAction Primary" id="SubmitAndContinue" type="button" value="Save"><span>[% Translate("Save") | html %]</span></button>
-                            [% Translate("or") | html %]
-                            <button name="Submit" class="CallForAction Primary" id="Submit" type="submit" value="Finish"><span>[% Translate("Save and finish") | html %]</span></button>
+                            [% IF (Data.Class && Data.Class == 'NEW') || Data.ItemEdit  %]
+                                <button name="Submit" class="CallForAction Primary" id="Submit" type="submit" value="Finish"><span>[% Translate("Save") | html %]</span></button>
+                            [% ELSE %]
+                                <button name="SubmitAndContinue" class="CallForAction Primary" id="SubmitAndContinue" type="button" value="Save"><span>[% Translate("Save") | html %]</span></button>
+                                [% Translate("or") | html %]
+                                <button name="Submit" class="CallForAction Primary" id="Submit" type="submit" value="Finish"><span>[% Translate("Save and finish") | html %]</span></button>
+                            [% END %]
                             [% Translate("or") | html %]
                             <a href="[% Env("Baselink") %]Action=[% Env("Action") %]">[% Translate("Cancel") | html %]</a>
                         </div>