Merge branch 'front'

admin/comboboxitemdelegate.cpp

@@ -48,12 +48,12 @@ QString ComboBoxItemDelegate::displayText(const QVariant &value, const QLocale&
 static QString get_index_string(int index) {
     switch (index) {
         case 0:
-            return "For Sale";
+            return "Till salu";
         case 1:
-            return "Not For Sale";
+            return "Ej till salu";
         case 2:
-            return "Hidden";
+            return "Dold";
         default:
-            return "Error";
+            return "ERROR";
     }
 }

kassa/widget.cpp

@@ -97,6 +97,7 @@ Widget::Widget(QWidget *parent) :
     ui->productList->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
     ui->productList->hideColumn(0);
     ui->productList->hideColumn(1);
+    ui->productList->hideColumn(2);
 
     QSqlTableModel* totalLogModel = new QSqlTableModel;
     totalLogModel->setTable("total_log");