Merge branch 'master' into build-line-filter-fix

inventree · Oct 23, 2024 · 4244195 · 4244195
2 parents bcbbd24 + a6bba14
commit 4244195
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 114 deletions.
diff --git a/contrib/container/requirements.txt b/contrib/container/requirements.txt
diff --git a/src/backend/InvenTree/templates/js/translated/company.js b/src/backend/InvenTree/templates/js/translated/company.js
@@ -165,6 +165,7 @@ function supplierPartFields(options={}) {
             icon: 'fa-box',
         },
         pack_quantity: {},
+        active: {},
     };
 
     if (options.part) {

diff --git a/src/backend/InvenTree/templates/js/translated/pricing.js b/src/backend/InvenTree/templates/js/translated/pricing.js
@@ -811,12 +811,10 @@ function loadPurchasePriceHistoryTable(options={}) {
                     }
 
                     var html = '';
-                    var supplier = row.supplier_part_detail.supplier_detail;
 
-                    html += imageHoverIcon(supplier.thumbnail || supplier.image);
                     html += renderLink(order.reference, `/order/purchase-order/${order.pk}/`);
                     html += ' - ';
-                    html += renderLink(supplier.name, `/company/${supplier.pk}/`);
+                    html += renderLink(order.supplier_name, `/company/${order.supplier}/`);
 
                     return html;
                 }

diff --git a/src/backend/InvenTree/templates/js/translated/purchase_order.js b/src/backend/InvenTree/templates/js/translated/purchase_order.js
@@ -2098,7 +2098,7 @@ function loadPurchaseOrderLineItemTable(table, options={}) {
             {
                 sortable: true,
                 sortName: 'MPN',
-                field: 'supplier_part_detail.manufacturer_part_detail.MPN',
+                field: 'mpn',
                 title: '{% trans "MPN" %}',
                 formatter: function(value, row, index, field) {
                     if (row.supplier_part_detail && row.supplier_part_detail.manufacturer_part) {

diff --git a/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx b/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx
@@ -52,12 +52,15 @@ export default function PurchaseHistoryPanel({
             currency: record.purchase_price_currency
           });
 
-          let units = record.supplier_part_detail?.pack_quantity;
+          let packQuatity = record.supplier_part_detail?.pack_quantity;
+          let hasPackQuantity =
+            !!packQuatity &&
+            record.supplier_part_detail?.pack_quantity_native != 1;
 
           return (
             <Group justify="space-between" gap="xs">
               <Text>{price}</Text>
-              {units && <Text size="xs">[{units}]</Text>}
+              {hasPackQuantity && <Text size="xs">[{packQuatity}]</Text>}
             </Group>
           );
         }
@@ -74,11 +77,12 @@ export default function PurchaseHistoryPanel({
           });
 
           let units = record.part_detail?.units;
+          let hasUnits = !!units && units !== 1;
 
           return (
             <Group justify="space-between" gap="xs">
               <Text>{price}</Text>
-              {units && <Text size="xs">[{units}]</Text>}
+              {hasUnits && <Text size="xs">[{units}]</Text>}
             </Group>
           );
         }

diff --git a/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx b/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx
@@ -201,7 +201,7 @@ export function PurchaseOrderLineItemTable({
         title: t`Pack Quantity`
       },
       {
-        accessor: 'supplier_part_detail.SKU',
+        accessor: 'sku',
         title: t`Supplier Code`,
         switchable: false,
         sortable: true,
@@ -213,12 +213,10 @@ export function PurchaseOrderLineItemTable({
         sortable: false
       }),
       {
-        accessor: 'MPN',
+        accessor: 'mpn',
+        ordering: 'MPN',
         title: t`Manufacturer Code`,
-        sortable: true,
-
-        render: (record: any) =>
-          record?.supplier_part_detail?.manufacturer_part_detail?.MPN
+        sortable: true
       },
       CurrencyColumn({
         accessor: 'purchase_price',

diff --git a/src/frontend/tests/pages/pui_stock.spec.ts b/src/frontend/tests/pages/pui_stock.spec.ts
@@ -94,7 +94,10 @@ test('Stock - Serial Numbers', async ({ page }) => {
 
   // Now, with correct quantity
   await page.getByLabel('number-field-quantity').fill('51');
+  await page.waitForTimeout(250);
   await page.getByRole('button', { name: 'Submit' }).click();
+  await page.waitForTimeout(250);
+
   await page
     .getByText(
       /The following serial numbers already exist or are invalid : 200,201,202,203,204/