Merge remote-tracking branch 'origin/master'

ui/src/pages/OrderList.vue

@@ -126,6 +126,13 @@
           </q-icon>
         </q-td>
       </template>
+      <template #body-cell-HasUretimUrunu="props">
+        <q-td :props="props" class="text-left">
+          <span v-if="props.row.HasUretimUrunu" class="text-weight-bold text-negative">
+            ÜRETİME VERİLECEK ÜRÜNÜ VAR
+          </span>
+        </q-td>
+      </template>
 
       <template #body-cell-OrderDate="props">
         <q-td :props="props" class="text-center">
@@ -366,6 +373,7 @@ const columns = [
     format: val => Number(val || 0).toLocaleString('tr-TR', { minimumFractionDigits: 2 }) + ' %'
   },
   { name: 'IsCreditableConfirmed', label: 'Durum', field: 'IsCreditableConfirmed', align: 'center', sortable: true },
+  { name: 'HasUretimUrunu', label: 'Üretim', field: 'HasUretimUrunu', align: 'left', sortable: true, style: 'min-width:190px;white-space:nowrap', headerStyle: 'min-width:190px;white-space:nowrap' },
   { name: 'Description', label: 'Açıklama', field: 'Description', align: 'left', sortable: false, classes: 'ol-col-desc', headerClasses: 'ol-col-desc', style: 'width:160px;max-width:160px', headerStyle: 'width:160px;max-width:160px' },
   { name: 'pdf', label: 'PDF', field: 'pdf', align: 'center', sortable: false }
 ]