Opomba

EveryThing/Pages/Invoices/Print.cshtml

@@ -173,6 +173,9 @@
                         <th class="py-1 text-right">
                             @Model.Translation.Price
                         </th>
+                            <th class="py-1 text-right">
+                                @Model.Translation.Discount
+                            </th>
                         <th class="py-1 text-right">
                             @Model.Translation.Amount
                         </th>
@@ -222,6 +225,7 @@
                                  || Model.Invoice.Type == Models.Invoice.Invoice.InvoiceType.BuyersOrder)
                             {
                                 <td class="text-right">@Html.DisplayFor(x => item.Price)</td>
+                                <td class="text-right">@Html.DisplayFor(x => item.Discount)%</td>
                                 <td class="text-right">@Html.DisplayFor(x => item.TotalValue)</td>
                             }
                             else if (Model.Invoice.Type == Models.Invoice.Invoice.InvoiceType.Order)

EveryThing/Pages/Invoices/Print.cshtml.cs

@@ -42,6 +42,7 @@ namespace EveryThing.Pages.Invoices
             public string Article { get; set; } = "Artikel";
             public string Quantity { get; set; } = "Količina";
             public string Price { get; set; } = "Cena";
+            public string Discount { get; set; } = "Rabat";
             public string Amount { get; set; } = "Znesek";
             public string Dimensions { get; set; } = "Dimenzije";
             public string Total { get; set; } = "Skupaj";
@@ -301,6 +302,7 @@ namespace EveryThing.Pages.Invoices
                         OrderNumber = invoiceState == Invoice.InvoiceState.Offer ? "Anfrage No." : "Bestellnummer",
                         Price = "Preis(€)",
                         Quantity = "Menge(Stk)",
+                        Discount = "Rabatt",
                         SwiftBic = "SWIFT/BIC",
                         Total = "Gesamtsumme",
                         Project = "Projekt",

EveryThing/Pages/Projects/DetailsPartItem.cshtml

@@ -1,7 +1,11 @@
 @using System.Globalization
 @model EveryThing.Models.Project.ProjectPartItem
 
-<tr data-idpartitem="@Model.IdProjectPartItem" style="cursor: pointer;" ondblclick="if(!$(event.target).closest('a,button,input').length) { $('[data-toggle=tooltip]').tooltip('hide'); $(this).find('.btn-tbl-inline-edit').click(); }">
+@{
+    var hasNote = !string.IsNullOrWhiteSpace(Model.Note);
+}
+
+<tr data-idpartitem="@Model.IdProjectPartItem" class="@(hasNote ? "project-part-item-has-note" : "")" style="cursor: pointer;" ondblclick="if(!$(event.target).closest('a,button,input').length) { $('[data-toggle=tooltip]').tooltip('hide'); $(this).find('.btn-tbl-inline-edit').click(); }">
     <td style="width: 20px;">
         @if(Model.Status != Models.Project.ProjectPartItemStatus.Shipped)
         {
@@ -18,6 +22,10 @@
             @Html.DisplayFor(modelItem => Model.IdItemFk)
         }
         <br/>
+        @if (hasNote)
+        {
+            <i class="fas fa-sticky-note text-warning mr-1" data-toggle="tooltip" data-placement="top" title="@Model.Note"></i>
+        }
         @(Model.ProjectPartNumberFormatted)
     </td>
     <td>

EveryThing/Pages/Projects/Edit.cshtml

@@ -13,6 +13,10 @@
         border-top: none;
     }
 
+    .project-part-item-has-note {
+        background-color: #fff8e1;
+    }
+
     .tab-panel-invoices{
         height: 490px;
         overflow-y: auto;