diff --git a/bin/backend/controls/Comments.js b/bin/backend/controls/Comments.js
index bf6db1112563a2411f0936e835f5f1d652ef9c5b..6362a3777682b77e492579bdfb0e7e96fd667d9c 100644
--- a/bin/backend/controls/Comments.js
+++ b/bin/backend/controls/Comments.js
@@ -19,7 +19,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
 ], function (QUI, QUIControl, Mustache, QUILocale, template) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
+    const lg = 'quiqqer/erp';
 
     return new Class({
 
@@ -37,7 +37,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
         initialize: function (options) {
             this.parent(options);
 
-            this.$filter   = false;
+            this.$filter = false;
             this.$comments = {};
 
             this.addEvents({
@@ -76,10 +76,10 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
                 return;
             }
 
-            var Formatter = this.$getFormatter();
+            const Formatter = this.$getFormatter();
 
             comments = comments.map(function (entry) {
-                var date = new Date(entry.time * 1000),
+                let date = new Date(entry.time * 1000),
                     type = 'fa fa-comment';
 
                 if (typeof entry.type !== 'undefined') {
@@ -123,15 +123,15 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
             });
 
             // grouping
-            var i, len, day, date, entry, title;
+            let i, len, day, date, entry, title;
 
-            var group        = {};
-            var DayFormatter = this.$getDayFormatter();
+            const group = {};
+            const DayFormatter = this.$getDayFormatter();
 
             for (i = 0, len = comments.length; i < len; i++) {
                 entry = comments[i];
-                date  = entry.date;
-                day   = DayFormatter.format(date);
+                date = entry.date;
+                day = DayFormatter.format(date);
 
                 if (typeof group[day] === 'undefined') {
                     group[day] = {
@@ -143,7 +143,7 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
                 title = '';
 
                 if (entry.source !== '') {
-                    var packageTitle = QUILocale.get(entry.source, 'package.title');
+                    let packageTitle = QUILocale.get(entry.source, 'package.title');
 
                     title = QUILocale.get(lg, 'comments.comment.title', {
                         source: packageTitle + ' (' + entry.source + ')'
@@ -170,20 +170,20 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
          * refresh the display
          */
         refresh: function () {
-            var i, data, realData, commentEntries;
-            var self     = this;
-            var comments = [];
+            let i, data, realData, commentEntries;
+            const self = this;
+            const comments = [];
 
-            var sortComments = function (a, b) {
+            const sortComments = function (a, b) {
                 return a.timestamp - b.timestamp;
             };
 
-            var commentClone = Object.clone(this.$comments);
+            const commentClone = Object.clone(this.$comments);
 
-            var filterComments = function (entry) {
-                var message = entry.message.toLowerCase();
-                var type    = entry.type.toLowerCase();
-                var id      = entry.id.toLowerCase();
+            const filterComments = function (entry) {
+                const message = entry.message.toLowerCase();
+                const type = entry.type.toLowerCase();
+                const id = entry.id.toLowerCase();
 
                 if (message.indexOf(self.$filter) === -1 &&
                     type.indexOf(self.$filter) === -1 &&
@@ -201,11 +201,11 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
                 }
 
                 commentEntries = commentClone[i];
-                data           = commentEntries.data;
+                data = commentEntries.data;
 
                 if (this.$filter) {
                     // check filter
-                    data     = [];
+                    data = [];
                     realData = commentEntries.data; // copy
 
                     realData.forEach(filterComments.bind(data));
@@ -229,18 +229,22 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
             });
 
             this.$Elm.getElements('[data-editable]').addEvent('click', function (event) {
-                var Parent = event.target;
+                let Parent = event.target;
 
                 if (!Parent.hasClass('quiqqer-erp-comments-comment')) {
                     Parent = Parent.getParent('.quiqqer-erp-comments-comment');
                 }
 
-                var data = {
+                const data = {
                     id    : Parent.get('data-id'),
                     source: Parent.get('data-source')
                 };
 
-                self.fireEvent('edit', [self, Parent, data]);
+                self.fireEvent('edit', [
+                    self,
+                    Parent,
+                    data
+                ]);
             });
         },
 
@@ -250,9 +254,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
          * @return {window.Intl.DateTimeFormat}
          */
         $getFormatter: function () {
-            var locale = QUILocale.getCurrent();
+            let locale = QUILocale.getCurrent();
 
-            var options = {
+            const options = {
                 // year  : 'numeric',
                 // month : '2-digit',
                 // day   : '2-digit',
@@ -280,9 +284,9 @@ define('package/quiqqer/erp/bin/backend/controls/Comments', [
          * @return {window.Intl.DateTimeFormat}
          */
         $getDayFormatter: function () {
-            var locale = QUILocale.getCurrent();
+            let locale = QUILocale.getCurrent();
 
-            var options = {
+            const options = {
                 year : 'numeric',
                 month: '2-digit',
                 day  : '2-digit'
diff --git a/bin/backend/controls/DeliveryAddress.js b/bin/backend/controls/DeliveryAddress.js
index 70e4f971a39322b10b50f9d19a0b251b1d1027eb..d611f2926bfd6d8243a3cc5bd61923aa883c5e61 100644
--- a/bin/backend/controls/DeliveryAddress.js
+++ b/bin/backend/controls/DeliveryAddress.js
@@ -26,7 +26,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
 ], function (QUI, QUIControl, QUIButton, Countries, Users, QUILocale, Mustache, template) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
+    const lg = 'quiqqer/erp';
 
     return new Class({
 
@@ -47,19 +47,19 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
             this.parent(options);
 
             this.$Addresses = null;
-            this.$Company   = null;
-            this.$Street    = null;
-            this.$ZIP       = null;
-            this.$City      = null;
-            this.$Country   = null;
+            this.$Company = null;
+            this.$Street = null;
+            this.$ZIP = null;
+            this.$City = null;
+            this.$Country = null;
 
             this.$Salutation = null;
-            this.$Firstname  = null;
-            this.$Lastname   = null;
+            this.$Firstname = null;
+            this.$Lastname = null;
 
-            this.checked           = false;
-            this.$loaded           = false;
-            this.$userId           = this.getAttribute('userId');
+            this.checked = false;
+            this.$loaded = false;
+            this.$userId = this.getAttribute('userId');
             this.$AddressSelectBtn = null;
 
             this.addEvents({
@@ -73,8 +73,8 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
          * event: on import
          */
         $onImport: function () {
-            var self = this,
-                Elm  = this.getElm();
+            const self = this,
+                  Elm  = this.getElm();
 
             Elm.set('html', Mustache.render(template, {
                 labelDifferentDeliveryAddress: QUILocale.get(lg, 'control.DeliveryAddress.tpl.labelDifferentDeliveryAddress'),
@@ -108,26 +108,26 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
 
             // address stuff
             this.$addressId = false;
-            this.$Company   = Elm.getElement('[name="delivery-company"]');
-            this.$Street    = Elm.getElement('[name="delivery-street_no"]');
-            this.$ZIP       = Elm.getElement('[name="delivery-zip"]');
-            this.$City      = Elm.getElement('[name="delivery-city"]');
-            this.$Country   = Elm.getElement('[name="delivery-country"]');
+            this.$Company = Elm.getElement('[name="delivery-company"]');
+            this.$Street = Elm.getElement('[name="delivery-street_no"]');
+            this.$ZIP = Elm.getElement('[name="delivery-zip"]');
+            this.$City = Elm.getElement('[name="delivery-city"]');
+            this.$Country = Elm.getElement('[name="delivery-country"]');
 
             this.$Salutation = Elm.getElement('[name="delivery-salutation"]');
-            this.$Firstname  = Elm.getElement('[name="delivery-firstname"]');
-            this.$Lastname   = Elm.getElement('[name="delivery-lastname"]');
+            this.$Firstname = Elm.getElement('[name="delivery-firstname"]');
+            this.$Lastname = Elm.getElement('[name="delivery-lastname"]');
 
             this.$Company.disabled = false;
-            this.$Street.disabled  = false;
-            this.$ZIP.disabled     = false;
-            this.$City.disabled    = false;
+            this.$Street.disabled = false;
+            this.$ZIP.disabled = false;
+            this.$City.disabled = false;
 
             this.$Salutation.disabled = false;
-            this.$Firstname.disabled  = false;
-            this.$Lastname.disabled   = false;
+            this.$Firstname.disabled = false;
+            this.$Lastname.disabled = false;
 
-            var Panel = QUI.Controls.getById(
+            const Panel = QUI.Controls.getById(
                 this.getElm().getParent('.qui-panel').get('data-quiid')
             );
 
@@ -145,7 +145,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                     html : ''
                 }).inject(self.$Country);
 
-                for (var code in result) {
+                for (let code in result) {
                     if (!result.hasOwnProperty(code)) {
                         continue;
                     }
@@ -161,7 +161,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                 }
 
                 self.$Country.disabled = false;
-                self.$loaded           = true;
+                self.$loaded = true;
 
                 self.fireEvent('loaded', [self]);
             });
@@ -241,7 +241,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                 this.$userId = value.uid;
             }
 
-            var Address = {
+            const Address = {
                 company   : '',
                 street_no : '',
                 zip       : '',
@@ -269,7 +269,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                 return Promise.reject('No User-ID');
             }
 
-            var User = Users.get(this.$userId);
+            const User = Users.get(this.$userId);
 
             if (User.isLoaded()) {
                 return Promise.resolve(User);
@@ -285,13 +285,13 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
          */
         $displayAddressData: function (Address) {
             this.$Company.value = Address.company;
-            this.$Street.value  = Address.street_no;
-            this.$ZIP.value     = Address.zip;
-            this.$City.value    = Address.city;
+            this.$Street.value = Address.street_no;
+            this.$ZIP.value = Address.zip;
+            this.$City.value = Address.city;
 
             this.$Salutation.value = Address.salutation;
-            this.$Firstname.value  = Address.firstname;
-            this.$Lastname.value   = Address.lastname;
+            this.$Firstname.value = Address.firstname;
+            this.$Lastname.value = Address.lastname;
 
             this.$Country.value = Address.country;
             this.setAttribute('country', Address.country);
@@ -321,9 +321,9 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
          * @param {DocumentEvent} [event]
          */
         $checkBoxChange: function (event) {
-            var self      = this,
-                Checkbox  = this.getElm().getElement('[name="differentDeliveryAddress"]'),
-                closables = this.getElm().getElements('.closable');
+            const self      = this,
+                  Checkbox  = this.getElm().getElement('[name="differentDeliveryAddress"]'),
+                  closables = this.getElm().getElements('.closable');
 
             if (event) {
                 event.stop();
@@ -334,7 +334,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
             }
 
             if (!this.$userId) {
-                var Panel = QUI.Controls.getById(
+                const Panel = QUI.Controls.getById(
                     this.getElm().getParent('.qui-panel').get('data-quiid')
                 );
 
@@ -388,7 +388,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
          * Select customer address to pre-fill address fields
          */
         $onClickSelectAddress: function () {
-            var self = this;
+            const self = this;
 
             if (!this.$userId) {
                 return;
@@ -408,7 +408,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                             self.getUser().then(function (User) {
                                 return User.getAddressList();
                             }).then(function (addresses) {
-                                for (var i = 0, len = addresses.length; i < len; i++) {
+                                for (let i = 0, len = addresses.length; i < len; i++) {
                                     if (addresses[i].id === addressId) {
                                         self.$displayAddressData(addresses[i]);
                                         break;
diff --git a/bin/backend/controls/ErpUserData.js b/bin/backend/controls/ErpUserData.js
index 61bf550b3a0ab6bcf0638ac8a085b59489164c95..280b2cae069110b6ba3bc1569c35f988e248d130 100644
--- a/bin/backend/controls/ErpUserData.js
+++ b/bin/backend/controls/ErpUserData.js
@@ -29,8 +29,8 @@ define('package/quiqqer/erp/bin/backend/controls/ErpUserData', [
          * @event: on import
          */
         $onImport: function () {
-            var self  = this;
-            var Panel = QUI.Controls.getById(
+            const self = this;
+            const Panel = QUI.Controls.getById(
                 self.getElm().getParent('.qui-panel').get('data-quiid')
             );
 
diff --git a/bin/backend/controls/OutputDialog.js b/bin/backend/controls/OutputDialog.js
index 836f820374ddaf2bda5eec528ae3de3cb61b4a8f..d9b4500178db1cb2936a3cbaa7812c0aa013eb6e 100644
--- a/bin/backend/controls/OutputDialog.js
+++ b/bin/backend/controls/OutputDialog.js
@@ -422,7 +422,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
          * @param {String} msg
          */
         $addMessage: function (msg) {
-            var Now = new Date();
+            const Now = new Date();
 
             new Element('div', {
                 'class': 'quiqqer-erp-outputDialog-messages-entry box message-success',
diff --git a/bin/backend/controls/OutputMailEditor.js b/bin/backend/controls/OutputMailEditor.js
index e011aa29d650c13629eafa1cbec4b06e27177d8e..2fa4e6bc09fedf9a61c169c9067fc31bb4bf6067 100644
--- a/bin/backend/controls/OutputMailEditor.js
+++ b/bin/backend/controls/OutputMailEditor.js
@@ -23,7 +23,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
 ], function (QUI, QUIConfirm, QUIButton, Permissions, QUIAjax, QUILocale, Mustache, template) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
+    const lg = 'quiqqer/erp';
 
     return new Class({
 
@@ -60,17 +60,17 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                 }
             });
 
-            this.$Output      = null;
-            this.$Preview     = null;
+            this.$Output = null;
+            this.$Preview = null;
             this.$cutomerMail = null;
-            this.$Template    = null;
+            this.$Template = null;
 
             this.$subject = null;
             this.$content = null;
 
-            this.$MailSubjectInput  = null;
+            this.$MailSubjectInput = null;
             this.$MailContentEditor = null;
-            this.$Attachments       = null;
+            this.$Attachments = null;
 
             this.addEvents({
                 onOpen  : this.$onOpen,
@@ -82,8 +82,8 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
          * event: on open
          */
         $onOpen: function () {
-            var self    = this,
-                Content = this.getContent();
+            const self    = this,
+                  Content = this.getContent();
 
             this.Loader.show();
 
@@ -101,11 +101,11 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
             Content.addClass('quiqqer-erp-OutputMailEditor');
 
             this.$MailSubjectInput = Content.getElement('.quiqqer-erp-outputMailEditor-mailEditor-subject');
-            this.$subject          = this.getAttribute('mailSubject');
-            this.$content          = this.getAttribute('mailContent');
+            this.$subject = this.getAttribute('mailSubject');
+            this.$content = this.getAttribute('mailContent');
 
             // Add attachments btn
-            var AttachmentBtn = new QUIButton({
+            const AttachmentBtn = new QUIButton({
                 text     : QUILocale.get(lg, 'controls.OutputMailEditor.btn.attachments'),
                 title    : QUILocale.get(lg, 'controls.OutputMailEditor.btn.attachments'),
                 textimage: 'fa fa-paperclip',
@@ -115,7 +115,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                 },
                 events   : {
                     onClick: function (Btn) {
-                        var AttachmentBox = Content.getElement('.quiqqer-erp-outputMailEditor-attachments');
+                        const AttachmentBox = Content.getElement('.quiqqer-erp-outputMailEditor-attachments');
                         AttachmentBox.setStyle('display', 'block');
 
                         self.setAttribute('maxWidth', 1200);
@@ -131,7 +131,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                 this.$getMailData(),
                 Permissions.hasPermission('quiqqer.erp.mail_editor_attach_files')
             ]).then(function (result) {
-                var MailData = result[1];
+                const MailData = result[1];
 
                 self.$Attachments = QUI.Controls.getById(
                     Content.getElement('input[name="attachments"]').get('data-quiid')
@@ -140,7 +140,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                 self.$Attachments.getElm().setStyle('height', 610);
 
                 // Check if user has permission to attach files
-                var hasAttachmentPermission = result[2];
+                const hasAttachmentPermission = result[2];
 
                 if (hasAttachmentPermission) {
                     AttachmentBtn.enable();
@@ -150,9 +150,9 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
                     );
                 }
 
-                var mediaFilesAdded = false;
+                let mediaFilesAdded = false;
 
-                var addMediaFiles = function () {
+                const addMediaFiles = function () {
                     if (mediaFilesAdded) {
                         return;
                     }
@@ -161,10 +161,10 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
 
                     // Add previously selected media items
                     if (self.getAttribute('attachedMediaFileIds') && hasAttachmentPermission) {
-                        var mediaIds = self.getAttribute('attachedMediaFileIds');
+                        const mediaIds = self.getAttribute('attachedMediaFileIds');
 
                         if (mediaIds.length) {
-                            for (var i = 0, len = mediaIds.length; i < len; i++) {
+                            for (let i = 0, len = mediaIds.length; i < len; i++) {
                                 self.$Attachments.addItem(mediaIds[i]);
                             }
 
@@ -210,15 +210,15 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
          * Event: onSubmit
          */
         $onSubmit: function () {
-            var mediaIds = [];
+            let mediaIds = [];
 
             if (this.$Attachments.getValue()) {
                 mediaIds = this.$Attachments.getValue().split(',');
             }
 
-            var uniqueMediaIds = [];
+            const uniqueMediaIds = [];
 
-            for (var i = 0, len = mediaIds.length; i < len; i++) {
+            for (let i = 0, len = mediaIds.length; i < len; i++) {
                 if (!uniqueMediaIds.contains(mediaIds[i])) {
                     uniqueMediaIds.push(mediaIds[i]);
                 }
@@ -242,7 +242,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputMailEditor', [
          * @return {Promise}
          */
         $getMailData: function () {
-            var self = this;
+            const self = this;
 
             return new Promise(function (resolve, reject) {
                 QUIAjax.get('package_quiqqer_erp_ajax_output_getMailData', resolve, {
diff --git a/bin/backend/controls/Panel.js b/bin/backend/controls/Panel.js
index cd7bd8240a850d5398b0c36f60cfd21edf9cb46d..83dba9d39f4abc29bd86b64eaa3467967167dbb0 100644
--- a/bin/backend/controls/Panel.js
+++ b/bin/backend/controls/Panel.js
@@ -78,7 +78,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
          * @param Parent
          */
         $appendItems: function (items, Parent) {
-            var i, len, item, text, Item;
+            let i, len, item, text, Item;
 
             for (i = 0, len = items.length; i < len; i++) {
                 item = items[i];
@@ -109,7 +109,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
          * @param Item
          */
         $itemClick: function (Item) {
-            var needle = Item.getAttribute('require');
+            const needle = Item.getAttribute('require');
 
             if (needle === false || needle === '') {
                 if (Item.isOpen() === false) {
@@ -120,13 +120,13 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
                 return;
             }
 
-            var icon = Item.getAttribute('icon');
+            const icon = Item.getAttribute('icon');
 
             Item.removeIcon(icon);
             Item.setAttribute('icon', 'fa fa-spinner fa-spin');
 
             require([needle], function (cls) {
-                var Instance;
+                let Instance;
 
                 Item.deselect();
 
@@ -143,7 +143,7 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
                 }
 
                 if (typeOf(cls) === 'function') {
-                    var Prom = cls();
+                    const Prom = cls();
 
                     if (!Prom) {
                         Item.removeIcon('fa-spinner');
@@ -155,8 +155,6 @@ define('package/quiqqer/erp/bin/backend/controls/Panel', [
                         Item.removeIcon('fa-spinner');
                         Item.setAttribute('icon', icon);
                     });
-
-                    return;
                 }
             });
         }
diff --git a/bin/backend/controls/articles/Article.js b/bin/backend/controls/articles/Article.js
index 29e3686f1fa641e7eac9b844a4f8aca535d441d1..5924f18b664652d487d6f9c078ebe4ed42446df4 100644
--- a/bin/backend/controls/articles/Article.js
+++ b/bin/backend/controls/articles/Article.js
@@ -44,7 +44,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Article', [
 ], function (QUI, QUIControl, QUIButton, QUIConfirm, QUIElements, DiscountUtils, MoneyUtils, Currency, Mustache, QUILocale, QUIAjax, Editors, template) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
+    const lg = 'quiqqer/erp';
 
     return new Class({
 
diff --git a/bin/backend/controls/articles/SelectArticleList.js b/bin/backend/controls/articles/SelectArticleList.js
index 97181eb319d093fa9e0b4947b6cb12ceb03e97f7..72a9fcca094b1385fe4737d30903bf897a25865c 100644
--- a/bin/backend/controls/articles/SelectArticleList.js
+++ b/bin/backend/controls/articles/SelectArticleList.js
@@ -17,8 +17,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
 ], function (ArticleList) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
-
     return new Class({
 
         Extends: ArticleList,
@@ -55,7 +53,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
          * @return {[]}
          */
         getSelectedArticles: function () {
-            var articles = [];
+            let articles = [];
 
             this.$articles.forEach(function (Article) {
                 if (Article.isSelected()) {
@@ -73,7 +71,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
          */
         $onArticleSelect: function (Article) {
             this.$selectedArticle = Article;
-            this.fireEvent('articleSelect', [this, Article]);
+            this.fireEvent('articleSelect', [
+                this,
+                Article
+            ]);
             this.$calc();
         },
 
@@ -84,7 +85,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
          */
         $onArticleUnSelect: function (Article) {
             this.$selectedArticle = null;
-            this.fireEvent('articleUnSelect', [this, Article]);
+            this.fireEvent('articleUnSelect', [
+                this,
+                Article
+            ]);
             this.$calc();
         },
 
@@ -94,7 +98,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/SelectArticleList', [
          * @return {Array}
          */
         $getArticleDataForCalculation: function () {
-            var returnSelectedOnly = true;
+            let returnSelectedOnly = true;
 
             // Only return selected articles if all articles have been calculated once
             this.$articles.forEach(function (Article) {
diff --git a/bin/backend/controls/articles/Text.js b/bin/backend/controls/articles/Text.js
index 6540fa4ad0b16268dcee0e92ea7454e89e350716..2303928de7459fc51530cc2f9de29d87ab790bf4 100644
--- a/bin/backend/controls/articles/Text.js
+++ b/bin/backend/controls/articles/Text.js
@@ -19,7 +19,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Text', [
 ], function (Article, QUIButton, QUILocale, Mustache, template) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
+    const lg = 'quiqqer/erp';
 
     return new Class({
 
@@ -57,8 +57,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/Text', [
             });
 
             this.$Position = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-pos');
-            this.$Text     = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-text');
-            this.$Buttons  = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-buttons');
+            this.$Text = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-text');
+            this.$Buttons = this.$Elm.getElement('.quiqqer-erp-backend-erpArticleText-buttons');
 
             this.$Loader = new Element('div', {
                 html  : '<span class="fa fa-spinner fa-spin"></span>',
diff --git a/bin/backend/controls/articles/windows/PriceBrutto.js b/bin/backend/controls/articles/windows/PriceBrutto.js
index 12671733864ec2fcb970176a55d2103870018696..c714835be613429bdfc553629438ab2ea77b498e 100644
--- a/bin/backend/controls/articles/windows/PriceBrutto.js
+++ b/bin/backend/controls/articles/windows/PriceBrutto.js
@@ -16,7 +16,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
 ], function (QUI, QUIConfirm, QUILocale, QUIAjax, Mustache, template) {
     "use strict";
 
-    var lg = 'quiqqer/erp';
+    const lg = 'quiqqer/erp';
 
     return new Class({
 
@@ -60,8 +60,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
          * @return {Element}
          */
         $onOpen: function () {
-            var self    = this,
-                Content = this.getContent();
+            const self    = this,
+                  Content = this.getContent();
 
             Content.set('html', Mustache.render(template, {
                 title      : QUILocale.get(lg, 'control.window.price.brutto.label'),
@@ -87,12 +87,15 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceBrutto',
          * submit the window
          */
         submit: function () {
-            var self = this;
+            const self = this;
 
             this.Loader.show();
 
             QUIAjax.get('package_quiqqer_erp_ajax_calcNettoPrice', function (price) {
-                self.fireEvent('submit', [self, price]);
+                self.fireEvent('submit', [
+                    self,
+                    price
+                ]);
                 self.close();
             }, {
                 'package': 'quiqqer/erp',