Add Expiry Date on Receive Line Item #8867

jacobfelknor · 2025-01-09T22:00:11Z

Addresses #6176

Add option in PUI receive line item form for adding an expiry.
Update test PurchaseOrderReceive.test_valid to include an expiry_date

netlify · 2025-01-09T22:02:04Z

✅ Deploy Preview for inventree-web-pui-preview ready!

Name	Link
🔨 Latest commit	`1bbc97c`
🔍 Latest deploy log	https://app.netlify.com/sites/inventree-web-pui-preview/deploys/6782bbe97a97260008c84c57
😎 Deploy Preview	https://deploy-preview-8867--inventree-web-pui-preview.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
Lighthouse	1 paths audited Performance: 100 (no change from production) Accessibility: 86 (no change from production) Best Practices: 100 (no change from production) SEO: 78 (no change from production) PWA: - View the detailed breakdown and full score reports

To edit notification comments on pull requests, go to your Netlify site configuration.

jacobfelknor · 2025-01-09T22:05:51Z

weird - my pre-commit checks passed locally, but fail in actions. Any suggestions?

matmair · 2025-01-10T01:34:10Z

Thank you for implementing this @jacobfelknor!
Loogs good in general. Due to the change in the API response you will need to bump the api version in api_version.py - and provide a short description in the text block (including a link to this PR). The changes in the API schema are visible in the CI - https://github.com/jacobfelknor/InvenTree/actions/runs/12701501246/job/35406119149#step:10:30

Regarding the pre-cmmit issue: not really sure what caused it - could also not get it to change anything on my setup. I simply reset that file for now to keep this PR going. Dependencies tend to be difficult in a lot of surprising ways.

codecov · 2025-01-10T01:40:49Z

Codecov Report

Attention: Patch coverage is 64.70588% with 6 lines in your changes missing coverage. Please review.

Project coverage is 84.99%. Comparing base (dcff7a5) to head (1bbc97c).
Report is 6 commits behind head on master.

Files with missing lines	Patch %	Lines
src/frontend/src/forms/PurchaseOrderForms.tsx	45.45%	5 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #8867      +/-   ##
==========================================
- Coverage   85.23%   84.99%   -0.25%     
==========================================
  Files        1177     1177              
  Lines       51804    52221     +417     
  Branches     2094     2101       +7     
==========================================
+ Hits        44156    44386     +230     
- Misses       7119     7310     +191     
+ Partials      529      525       -4

Flag	Coverage Δ
backend	`86.98% <100.00%> (+<0.01%)`	⬆️
pui	`69.33% <45.45%> (+0.22%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

SchrodingersGat · 2025-01-10T02:08:06Z

@jacobfelknor nice work, implementation looks very clean!

Functionality

Tested it locally, seems to work very nicely indeed!

Unit Testing

I have made some suggestions to tweak two of the changed code lines which will fix the CI issues. An "empty" date must be None - not an empty string

Default Values

When specifying the "expiry date" via the UI form - it would be useful to pull out the "default value" from the part information.

This is stored in the default_expiry field for the associated part - and should be available via the API

Hidden if Disabled

For the UI side of things, please ensure that the UI elements are hidden if the STOCK_ENABLE_EXPIRY global setting is disabled. There are multiple examples in the existing frontend code showing how to use the useGlobalSettingsState hook to check this

src/backend/InvenTree/order/serializers.py

src/backend/InvenTree/order/models.py

jacobfelknor · 2025-01-10T17:47:10Z

Sounds good, I will work on these changes now

jacobfelknor · 2025-01-10T19:17:55Z

src/frontend/src/forms/PurchaseOrderForms.tsx

+  const [expiryDateOpen, expiryDateHandlers] = useDisclosure(false, {
+    onOpen: () => {
+      // check the default part expiry. Assume expiry is relative to today
+      const defaultExpiry = record.part_detail?.default_expiry;


I am assuming the number of days specified in default_expiry should be relative to the receive date.

I'm not well-versed in formatting javascript dates... but coming from Python this doesn't feel great. Open to suggestion here if there is a better way

Could it be as simple as adding N days to the current date, right?

Yes... that is what I'm doing... but the formatting is what gets so verbose (lines 311-314). Does the form require me to format it in "YYYY-MM-DD"?

We already have dayjs dependency in the frontend code, so you could do something like:

// Generate a date 10 days in the future const futureDate = dayjs().add(10, 'day').format('YYYY-MM-DD');

I like that much better. Thanks for the tip. Updated

SchrodingersGat · 2025-01-12T02:56:28Z

@jacobfelknor thanks for the great work here :)

jacobfelknor added 2 commits January 9, 2025 18:51

Add expiry on line item receive from PO

497cde5

add backend test

b6b0af5

jacobfelknor requested a review from SchrodingersGat as a code owner January 9, 2025 22:00

jacobfelknor mentioned this pull request Jan 9, 2025

[FR] Stock Expiry when Receiving Line Item in PO #6176

Open

2 tasks

jacobfelknor mentioned this pull request Jan 9, 2025

Add expiry date to po line item receive inventree/inventree-python#254

Merged

reset pre-commit

104951a

matmair assigned jacobfelknor Jan 10, 2025

matmair added enhancement This is an suggested enhancement or new feature order Related to purchase orders / sales orders labels Jan 10, 2025

matmair added this to the 1.0.0 milestone Jan 10, 2025

SchrodingersGat reviewed Jan 10, 2025

View reviewed changes

src/backend/InvenTree/order/serializers.py Outdated Show resolved Hide resolved

SchrodingersGat reviewed Jan 10, 2025

View reviewed changes

src/backend/InvenTree/order/models.py Outdated Show resolved Hide resolved

jacobfelknor added 4 commits January 10, 2025 17:56

increment inventree api version

0cd2a9f

use None as default expiry date

1084f39

check global setting STOCK_ENABLE_EXPIRY

bd3e3b0

check for default expiry in line item receive

579a61b

jacobfelknor commented Jan 10, 2025

View reviewed changes

use dayjs

1bbc97c

SchrodingersGat merged commit e8c1417 into inventree:master Jan 12, 2025
27 checks passed

SchrodingersGat mentioned this pull request Jan 13, 2025

Allow null value for expiry_date field #8886

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Expiry Date on Receive Line Item #8867

Add Expiry Date on Receive Line Item #8867

jacobfelknor commented Jan 9, 2025

netlify bot commented Jan 9, 2025 •

edited

Loading

jacobfelknor commented Jan 9, 2025

matmair commented Jan 10, 2025

codecov bot commented Jan 10, 2025 •

edited

Loading

SchrodingersGat commented Jan 10, 2025 •

edited

Loading

jacobfelknor commented Jan 10, 2025

jacobfelknor Jan 10, 2025

SchrodingersGat Jan 10, 2025

jacobfelknor Jan 10, 2025

SchrodingersGat Jan 11, 2025

jacobfelknor Jan 11, 2025

SchrodingersGat commented Jan 12, 2025

Add Expiry Date on Receive Line Item #8867

Add Expiry Date on Receive Line Item #8867

Conversation

jacobfelknor commented Jan 9, 2025

netlify bot commented Jan 9, 2025 • edited Loading

✅ Deploy Preview for inventree-web-pui-preview ready!

jacobfelknor commented Jan 9, 2025

matmair commented Jan 10, 2025

codecov bot commented Jan 10, 2025 • edited Loading

Codecov Report

SchrodingersGat commented Jan 10, 2025 • edited Loading

Functionality

Unit Testing

Default Values

Hidden if Disabled

jacobfelknor commented Jan 10, 2025

jacobfelknor Jan 10, 2025

Choose a reason for hiding this comment

SchrodingersGat Jan 10, 2025

Choose a reason for hiding this comment

jacobfelknor Jan 10, 2025

Choose a reason for hiding this comment

SchrodingersGat Jan 11, 2025

Choose a reason for hiding this comment

jacobfelknor Jan 11, 2025

Choose a reason for hiding this comment

SchrodingersGat commented Jan 12, 2025

netlify bot commented Jan 9, 2025 •

edited

Loading

codecov bot commented Jan 10, 2025 •

edited

Loading

SchrodingersGat commented Jan 10, 2025 •

edited

Loading