diff --git a/bin/backend/controls/articles/product/AddProductWindow.js b/bin/backend/controls/articles/product/AddProductWindow.js index 169d4e75f3c132557e85cda393578d0a2efccaa6..21c292628f28db536b48700996547fe199890c7b 100644 --- a/bin/backend/controls/articles/product/AddProductWindow.js +++ b/bin/backend/controls/articles/product/AddProductWindow.js @@ -367,8 +367,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/product/AddProductWind new QUIConfirm({ title : QUILocale.get('quiqqer/erp', 'window.products.variant.select.title'), icon : 'fa fa-shopping-bag', - maxHeight: 500, - maxWidth : 700, + maxHeight: 1000, + maxWidth : 1400, autoclose: false, events : { onOpen: function (Win) { @@ -390,7 +390,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/product/AddProductWind columnModel: columns, pagination : false, width : Win.getContent().getSize().x - 40, - height : 300 + height : 800, + storageKey : 'quiqqer-erp-addproductwindow-variants', }); Win.$VariantGrid.addEvents({ @@ -416,7 +417,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/product/AddProductWind let fields = { 'productNo' : 3, 'price_netto': 1, - 'priority' : 18 + 'priority' : 18, + 'ean' : 21 }; // add variant fields to field object @@ -490,7 +492,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/product/AddProductWind entry[needle] = '-'; } else { const valueTitle = getAttributeListValueTitle(field[0]); - const value = field[0].value; + const value = field[0].value; if (valueTitle) { entry[needle] = '(' + value + ') ' + valueTitle; @@ -565,21 +567,21 @@ define('package/quiqqer/erp/bin/backend/controls/articles/product/AddProductWind dataIndex: 'productNo', dataType : 'text', width : 100, - sortable : false + //sortable : false }, { header : QUILocale.get('quiqqer/system', 'title'), dataIndex: 'title', dataType : 'text', width : 200, - sortable : false + //sortable : false }, { header : QUILocale.get('quiqqer/products', 'products.product.panel.grid.nettoprice'), dataIndex: 'price_netto_display', dataType : 'text', width : 100, - sortable : false, + //sortable : false, className: 'grid-align-right' } ]; @@ -591,12 +593,18 @@ define('package/quiqqer/erp/bin/backend/controls/articles/product/AddProductWind fieldId : variantFields[i].id, dataType : 'text', width : 150, - sortable : false + //sortable : false }); } // end colums columns = columns.concat([ + { + header : QUILocale.get('quiqqer/erp', 'products.product.panel.grid.ean'), + dataIndex: 'ean', + dataType : 'number', + width : 120, + }, { header : QUILocale.get('quiqqer/system', 'editdate'), dataIndex: 'e_date', diff --git a/locale.xml b/locale.xml index f44e315873f2a67c54f4720abce346fbdffc6000..ffcb8b8e4ca5cac0ee3bf63c65dd71a63d1c9cca 100644 --- a/locale.xml +++ b/locale.xml @@ -679,6 +679,11 @@ <groups name="quiqqer/erp" datatype="js"> + <locale name="products.product.panel.grid.ean"> + <de><![CDATA[GTIN / EAN]]></de> + <en><![CDATA[GTIN / EAN]]></en> + </locale> + <locale name="ContactEmailSelectWindow.title"> <de><![CDATA[Kontat E-Mail-Adresse auswählen]]></de> <en><![CDATA[Choose contact email address]]></en> @@ -1296,10 +1301,10 @@ Allowed characters: Letters, numbers and _ ä ö ü ß]]></en> </locale> <locale name="window.products.variant.select.content"> <de><![CDATA[ - Du hast ein Varianten-Parent ausgwewählt. Welche Variante dieses Produktes möchtest du einfügen? + Du hast einen Vater-Artikel ausgwewählt. Bitte wähle eine Variante. ]]></de> <en><![CDATA[ - You have selected a variant parent. Which variant of this product do you want to insert? + You have selected a variant parent. Please choose a variant. ]]></en> </locale> </groups>