Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,581 Commits 6 Branches 99 Tags 484 MiB
6aeb818137
Commit Graph

2284 Commits

Author SHA1 Message Date
Oliver
ea9f2f81f1
Stock available (#3057) 
* Fix display of stock labels

- If 'shipped' or 'installed', don't display 'allocated' flag

* Switch stock item data around

* Add 'available' and 'allocation' information to the StockItem detail page

- Cache some context data to the view renderer

* Stock table now also displays allocation informatoin
 2022-05-24 15:35:04 +10:00
Oliver
3c02b95f85
Shipment date edit (#3050) 
* Allow user to select shipment date when shipping a salesorder

- Defaults to 'today'

* Retain the tracking number information through the from

* JS linting

* Add unit testing for the SalesOrderShipmentComplete serializer / API endpoint
 2022-05-23 13:57:40 +10:00
Maksim Stojkovic
0ec067da40
[Feature] Shipment Creation in Stock Allocation Modal (#3024) 
* Added order reference to line item options

* Basic working version implemented

* Re-execute fields function in secondary modals

* Added missing argument and parameter

* Added missing parentheses

* Fixed hidden field name for depth > 0
 2022-05-22 09:34:38 +10:00
Matthias Mair
5805685c48 Merge branch 'master' of https://github.com/inventree/InvenTree into style-fixes 2022-05-21 23:57:41 +02:00
Maksim Stojkovic
f036252fb9 Added completePendingShipments to exported section 2022-05-21 01:31:01 +10:00
Maksim Stojkovic
ac35bd8073
Merge branch 'inventree:master' into fr-2986-shipment-page-action 2022-05-21 01:06:58 +10:00
Maksim Stojkovic
c38862b28c Added page action to process pending shipments 2022-05-21 01:05:54 +10:00
Maksim Stojkovic
3eb4898019 Added support for secondary buttons on modals 
Secondary buttons can be added to modal footers beside Close and Submit
Buttons can be linked to callback functions
Callback functions can access options arguments passed to constructForm
 2022-05-21 00:52:45 +10:00
Maksim Stojkovic
f1ca9d7aa8 Added div for extra secondary modal buttons 2022-05-20 22:22:49 +10:00
Matthias Mair
74726f0fda fix endline 2022-05-20 13:35:07 +02:00
Matthias Mair
93b6934127 fix trailing 2022-05-20 13:20:55 +02:00
Maksim Stojkovic
b99a9306ce Added onSuccess support to completeShipment 2022-05-20 20:37:23 +10:00
Maksim Stojkovic
c6b9585c02 Fixed typo 2022-05-20 18:28:02 +10:00
Oliver
8da278a072 Adds option to hide unavailable stock items from the search preview window 2022-05-20 17:10:51 +10:00
Oliver
0f4ed55bed JS fixes 2022-05-20 17:02:28 +10:00
Oliver
8ad141f910 Add extra options to control search results in preview window 
- Allow user to optionally show / hide inactive purchase orders
- Allow user to optionally show / hide inactive sales orders
 2022-05-20 16:57:30 +10:00
Maksim Stojkovic
f2a3b4ab1f Changed completeShipment reload to optional 2022-05-20 16:29:59 +10:00
Oliver
8385080e4c
Merge pull request #3036 from maksimstojkovic/auto-reload-so 
Primitive solution to SO reload on shipment
 2022-05-19 21:16:24 +10:00
Maksim Stojkovic
d9beaab92c Primitive solution to SO reload on shipment 2022-05-19 20:31:55 +10:00
Maksim Stojkovic
2cf67ea0c9 Create default shipment in backend 2022-05-19 00:10:55 +10:00
Maksim Stojkovic
9ae8a6b219 Revert "Create a default shipment when creating SO" 
This reverts commit c7003fbed8.
 2022-05-18 23:43:06 +10:00
Maksim Stojkovic
c7003fbed8 Create a default shipment when creating SO 2022-05-18 22:01:47 +10:00
Oliver Walters
f4b470c396 Merge remote-tracking branch 'inventree/master' into shipment-assign-fix 2022-05-17 18:48:57 +10:00
Oliver Walters
2509db2b88 JS linting 2022-05-17 00:52:01 +10:00
Oliver Walters
ae50546ca6 Display API error information if available 2022-05-17 00:25:32 +10:00
Oliver
86c86bf446
Merge pull request #3006 from SchrodingersGat/bom-delete-fix 
BOM delete fix
 2022-05-16 23:30:22 +10:00
Oliver
042cb021de
Merge pull request #2957 from SchrodingersGat/locate-mixin 
Adds plugin mixin to "locate" items
 2022-05-16 22:57:20 +10:00
Oliver Walters
6658b89946 Refactor BOM item deletion 
- Send delete requests sequentially, rather than simultaneously
- Prevents server overload
- Present a much cleaner dialog to the user
 2022-05-16 22:51:34 +10:00
Oliver Walters
1903ac12cd Allow customization of button class in modal forms 2022-05-16 22:43:29 +10:00
Oliver
3614e09211 Fix "fields" attribute for PurchaseOrderLineItem edit form 
- The 'order' field was not being included
 2022-05-16 09:25:20 +10:00
Oliver Walters
95dbfa1958 Merge remote-tracking branch 'inventree/master' into locate-mixin 
# Conflicts:
#	InvenTree/InvenTree/api.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/plugin/base/integration/mixins.py
#	InvenTree/plugin/mixins/__init__.py
 2022-05-16 00:10:38 +10:00
Oliver Walters
fa954b3812 Merge remote-tracking branch 'inventree/master' into locate-mixin 
# Conflicts:
#	InvenTree/InvenTree/api_version.py
#	InvenTree/InvenTree/urls.py
 2022-05-15 23:44:07 +10:00
Matthias
47673c293e
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-app-refactor 2022-05-12 23:45:12 +02:00
Oliver
a81ea01e8e Model introspection 
- Find the class registered to the model (or log an error)
- Pass the api_url through to the frontend
 2022-05-12 17:28:55 +10:00
Oliver
e112d555d4 Simplify the various settings objects, to improve retrieval of 'parameters' from the base class 
- Remove the GenericReferencedSettingsClass mixin
- Each subclass defines a very simple get_kwargs() method
- Now, at object level *and* class level we can perform lookup of settings and actually get proper data back
- Adds "model" option to setting (precursor of things to come)
 2022-05-12 16:45:27 +10:00
Oliver
c89547f58c Adds exporter and download functionality for BuildOrder table 2022-05-12 12:44:15 +10:00
Oliver
d0ddb47b1f Adds exporter and download button for sales orders 2022-05-12 11:44:05 +10:00
Oliver
1b1f7634b7 Adds exporter and download button for PurchaseOrder table 2022-05-12 11:41:25 +10:00
Matthias
da885456b7
tests for template 2022-05-11 22:47:41 +02:00
Oliver
5af4629163 Order test results by decreasing date for build order 
- This means that "newer" results will be found first
- Thus a newer "true" will beat an older "false"
 2022-05-10 11:54:51 +10:00
Oliver Walters
26499816c1 javascript lint 2022-05-10 08:12:04 +10:00
Oliver Walters
5ea115ae83 hard code url 2022-05-10 01:18:36 +10:00
Oliver Walters
57f3efe758 Adds an endpoint for calling the plugin code to "locate" something 2022-05-09 23:42:28 +10:00
Oliver Walters
4704db5183 Adds 'locate item' and 'locate location' buttons 2022-05-09 22:48:26 +10:00
Oliver Walters
256af802e2 Use the new 'mixin' filter to simplify request of label printer plugins 2022-05-09 22:35:46 +10:00
Oliver Walters
037e057c53 Adds global setting to enable or disable webcam support for barcode scanning 2022-05-09 19:46:11 +10:00
Oliver Walters
e78a5dc104 Keep existing behaviour for notification settings (at least for now) 2022-05-08 22:52:08 +10:00
Oliver Walters
3a9bacb27c Implement new approach for plugin settings 
- URL specifies plugin slug and setting key
 2022-05-08 22:48:47 +10:00
Oliver Walters
5560706c33 User settings are now accessed via unique KEY 2022-05-08 10:58:31 +10:00
Oliver Walters
dd017f36c7 Augment existing frontend code to allow adjustment of notification settings 2022-05-08 10:50:57 +10:00
Oliver Walters
0797e9ebf0 Simplify the new template rendering 
- No extra template code is required for any new page
- All loaded in base.html or page_base.html
- Oh, so clean!
 2022-05-06 23:19:21 +10:00
Oliver Walters
71128a1c8e Refactor the plugin javascript template 
- Can appear in "base.html"
- Only renders anything if there are actually plugins available for the page
 2022-05-06 22:57:15 +10:00
Oliver Walters
c80b36fc2f Adds a new InvenTreePluginMixin mixin class for enabling custom plugin rendering on a page 
- Any view which needs custom plugin code must implement this mixin
- Initially implement for the PartDetail page
 2022-05-06 22:52:52 +10:00
Oliver Walters
b80ff5e460 Tweak display of plugin badges 2022-05-06 21:03:30 +10:00
Matthias Mair
6bd997ffad
Merge branch 'inventree:master' into matmair/issue2385 2022-05-05 11:26:25 +02:00
Matthias
a27f8a427a
Merge branch 'matmair/issue2385' of https://github.com/matmair/InvenTree into matmair/issue2385 2022-05-04 17:40:47 +02:00
Matthias
b16305afef
add html for notification setting 2022-05-04 17:40:04 +02:00
Matthias Mair
cf93ba7cf9
Merge branch 'inventree:master' into matmair/issue2385 2022-05-04 12:23:05 +02:00
Oliver Walters
17c84141b1 Javascript linting 2022-05-04 17:38:01 +10:00
Oliver Walters
adbcd68fe8 Refactor "uninstall stock item" form to use the API 2022-05-04 17:25:24 +10:00
Oliver Walters
bd3d6f47a1 Refactor CancelBuild form 2022-05-04 16:30:46 +10:00
Oliver Walters
a510ca89f7 Refactor CancelSalesOrder form 2022-05-04 15:55:21 +10:00
Oliver Walters
bf48e3204b Refactor PurchaseOrderIssue form 2022-05-04 15:45:13 +10:00
Oliver Walters
5afc3bfce2 Replace PurchaseOrderComplete form 2022-05-04 15:33:50 +10:00
Oliver Walters
e527ddcc86 Extract context information from the OPTIONS request (forms.js) 2022-05-04 15:31:33 +10:00
Oliver Walters
62cd0f39c7 Replace the existing CancelPurchaseOrderForm with an API driven form 2022-05-04 15:14:14 +10:00
Oliver Walters
96c5a8252c remove dead code 2022-05-03 17:33:03 +10:00
Oliver Walters
f0e8e32c8a More refactoring 2022-05-03 17:27:21 +10:00
Oliver Walters
f3e8edaf1f Refactor for SupplierPart detail page 2022-05-03 17:21:33 +10:00
Oliver Walters
05b01e4d6c Refactor order parts for manfuacturer part detail page 2022-05-03 17:16:38 +10:00
Oliver Walters
28f3244574 Order parts from "supplier parts" page 
- Prevent duplicate parts from loading
 2022-05-03 16:52:23 +10:00
Oliver Walters
c0163a476f Refactor 'order parts' window from manufacturer part list 2022-05-03 16:42:00 +10:00
Oliver Walters
bac5a16491 JS linting fxies 2022-05-03 14:28:41 +10:00
Oliver Walters
141b764b94 Modal fixes 2022-05-03 14:01:25 +10:00
Oliver Walters
8cd8581dbf fixes 2022-05-03 13:51:04 +10:00
Oliver Walters
1794f65d19 Button to submit each row individually 2022-05-03 13:44:28 +10:00
Oliver Walters
d69b5811b1 Improved javascript log / warn / error messages 2022-05-03 12:00:28 +10:00
Oliver Walters
4732efb330 Fix callbacks for adding new supplier part and/or purchase order "inline" 2022-05-03 11:42:13 +10:00
Matthias Mair
4125803e6d
Merge branch 'inventree:master' into matmair/issue2385 2022-05-02 21:50:52 +02:00
Oliver Walters
e87a02638e Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/order/serializers.py
#	InvenTree/templates/js/translated/model_renderers.js
 2022-05-02 16:11:11 +10:00
Oliver
cc42977233
Merge pull request #2910 from SchrodingersGat/translation-ci 
Translation CI
 2022-05-01 23:19:58 +10:00
Oliver Walters
0a3613476c Fix empty translation string 2022-05-01 22:34:03 +10:00
Oliver Walters
3777686c92 503 page was missing inventree_extras 
(cherry picked from commit 1a8fd7878ea253f7cdfd50f54850827e634fcb0f)
 2022-05-01 19:44:52 +10:00
Oliver
433ecdb2c3
Merge pull request #2714 from matmair/matmair/issue2694 
[FR] Add delivery cost (excluding unit cost that already exists) in PO
 2022-05-01 10:28:47 +10:00
Kálmán Rózsahegyi
c7692475a8 Add onBarcodeScanClicked() to exported functions 2022-04-30 21:28:55 +02:00
Matthias Mair
c18579088a
Merge branch 'inventree:master' into matmair/issue2385 2022-04-30 19:53:32 +02:00
Matthias Mair
e75daec695
Merge branch 'inventree:master' into matmair/issue2694 2022-04-30 19:50:25 +02:00
Kálmán Rózsahegyi
84bfb0a827 One more try to pass JS checks... 2022-04-30 12:33:44 +02:00
Kálmán Rózsahegyi
51152eee53 More JS style fixes 2022-04-30 12:22:10 +02:00
Kálmán Rózsahegyi
b37bb3eb3e Fix JS styling 2022-04-30 12:14:13 +02:00
Kálmán Rózsahegyi
8b279edee0 Merge branch 'master' into feat-qr-scanner 2022-04-30 11:57:09 +02:00
Oliver
35de490f72 JS linting fixes 2022-04-29 17:13:59 +10:00
Oliver
260680c5c4 Refactor BOM table to not load multi level BOMs by default 
- Click to select which ones to load
 2022-04-29 17:07:54 +10:00
Oliver
1bb2551edb Fixes for model rendering code 2022-04-29 13:51:49 +10:00
Oliver
94fa424440 Table tweaks 2022-04-29 13:13:12 +10:00
Oliver
a80465e85c Display batch code in build output table 2022-04-29 13:03:41 +10:00
Oliver
8fc34a21a6 Reload the untracked stock table when allocation actions are performed 2022-04-29 12:59:20 +10:00
Kalman Rozsahegyi
9e1a143132 Merge branch 'master' into feat-qr-scanner 2022-04-28 22:14:11 +02:00
Oliver Walters
51da1f02a8 JS linting fixes 2022-04-29 01:58:57 +10:00
Oliver Walters
b595fa0e7e Fix loading of untracked parts table 2022-04-29 01:40:59 +10:00