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
7,805 Commits 6 Branches 99 Tags 484 MiB
ff92d70ecb
Commit Graph

6288 Commits

Author SHA1 Message Date
Oliver Walters
0835fe92a0 bom.js 2021-08-30 15:54:31 +10:00
Oliver Walters
51eb40f3bc forms.js 2021-08-30 15:47:58 +10:00
Oliver Walters
bb3b6fdc4d label.js 2021-08-30 15:34:46 +10:00
Oliver Walters
e0e7788af6 More js fixes 2021-08-30 15:32:01 +10:00
Oliver Walters
50b54f0966 order.js 2021-08-30 14:57:17 +10:00
Oliver Walters
00f012311d inventree.js 2021-08-30 14:49:40 +10:00
Oliver Walters
90a75ac7cb nav.js 2021-08-30 14:44:44 +10:00
Oliver Walters
7d5b859233 part.js 2021-08-30 14:39:58 +10:00
Oliver Walters
3e03b1c31d report.js 2021-08-30 14:12:35 +10:00
Oliver Walters
c846aeb60f stock.js 2021-08-30 14:07:34 +10:00
Oliver Walters
65874447ed bug fix 2021-08-30 13:13:12 +10:00
Oliver Walters
5d45fce240 remove import / export calls 2021-08-30 13:10:58 +10:00
Oliver Walters
24ca1c5641 Add "helpers.js" for common functions 2021-08-30 13:06:02 +10:00
Oliver Walters
140a2092c8 fixes for table_filters.js 2021-08-28 22:18:20 +10:00
Oliver Walters
0620e656a0 Fix linting errors or tables.js 2021-08-28 22:12:41 +10:00
Oliver Walters
d0ccf8647d Add js linting to github workflow 2021-08-28 20:59:41 +10:00
Oliver Walters
f57a31c9b5 Add a test framework script to pull down rendered javascript files 
- Use the testing framework so we don't need to spin up a server
 2021-08-28 20:46:51 +10:00
Matthias
c34a5967b8
user-settings template for social accounts 2021-08-26 23:17:00 +02:00
Oliver Walters
3adf30a00c Simple fix for category parameter settings 2021-08-26 22:50:50 +10:00
Oliver
e5de69cd96
Update version.py 
Actually bump the API version
 2021-08-26 22:13:13 +10:00
Oliver
320ca451cc
Merge pull request #2023 from inventree/units-in-api 
Add "units" to PartBriefSerializer
 2021-08-26 22:12:27 +10:00
Oliver
610c05384b
Merge pull request #2020 from SchrodingersGat/mpn-sorting-fix 
Mpn sorting fix
 2021-08-26 22:06:06 +10:00
Oliver Walters
ec88415f3d Add "units" to PartBriefSerializer 2021-08-26 21:54:25 +10:00
Oliver
ac8a0be74a Enable sorting by total_price 2021-08-26 08:48:19 +10:00
Oliver
bad246bca6 Fixes for ordering of stock table 2021-08-26 08:24:31 +10:00
Oliver
212a7eeed1 Disable filtering for total_price (as this is not a database field!) 2021-08-26 07:59:47 +10:00
Oliver
8660f13ef5 Allow sorting by purchase price (unit price) 2021-08-26 07:50:19 +10:00
Oliver
51992a92c1 Change name of purchaseorder line item table 
- Was conflicting with purchaseorder table
- Saved column selections were being overridden
 2021-08-25 18:00:32 +10:00
Oliver
4b8ef2ad62 Implements custom filtering back end 2021-08-25 17:46:42 +10:00
Oliver
9c9407b1ab Add unit test for catching bug 
- Turns out that in an image was uploaded with more than ~2000 vertical pixels it would crash
- Smaller images worked fine?
 2021-08-25 14:48:45 +10:00
Oliver
dcc8acb49a Data must be copied in a particular way 2021-08-25 14:12:26 +10:00
Oliver
44ab487b62 Fix for file upload bug 2021-08-25 12:05:41 +10:00
Oliver
c9756d30bd Add a custom OrderingFilter class 
Needs further work
 2021-08-25 12:04:15 +10:00
Oliver
2923589c4a Fix sortName for purchase order line item table 2021-08-25 12:02:25 +10:00
Matthias
118bac0591
fix layout 2021-08-25 00:08:50 +02:00
Matthias
aebea33718
enrich login template with login buttons 2021-08-24 23:53:20 +02:00
Matthias
d569d70f5b
use config.yaml for SSO providers 2021-08-24 19:35:41 +02:00
Matthias
1311558cac
add in SSO for #1421 2021-08-24 19:12:43 +02:00
Oliver
0073a77e16
Merge pull request #2008 from matmair/fix-for-1986 
Fix for 1986
 2021-08-24 14:13:50 +10:00
Oliver
36a0496dd7 Wrap search preview results in <a> 
- Allows clicking with middle mouse (for e.g.) to open in new tab
 2021-08-24 13:11:37 +10:00
Oliver
44ecd958a2
Merge pull request #2011 from SchrodingersGat/boolean-form-fixes 
Fix for "part" form fields
 2021-08-24 12:10:00 +10:00
Oliver
8fc79f45a3 Fix for "part" form fields 
- Specify "default" rather than overriding "value"
 2021-08-24 11:55:58 +10:00
Oliver
7646535aaf Hide "Sales Orders" tab if part is not salable 2021-08-24 11:48:42 +10:00
Matthias
391bb0dbe4
disable ordering on loadStockTable 2021-08-23 22:14:51 +02:00
Matthias
4efcfbecaf
refactor stock.js columns into a variable 2021-08-23 22:07:20 +02:00
eeintech
35738ce026 Updated all 'add' buttons to 'btn-success' CSS class 2021-08-23 14:52:35 -04:00
eeintech
6f742319e5 Corrected color of 'new' orders UI button 2021-08-23 12:48:47 -04:00
Oliver
90d0b8b15d Bump API version 2021-08-23 21:45:40 +10:00
Oliver
5d4f35958d Point table at the new read-only field 2021-08-23 21:45:32 +10:00
Oliver
bb8b85c375 Separate purchase_price and purchase_price_currency for StockItem serializer 
- Add "purchase_price_string" for a read-only stringified representation
- Unit testing
 2021-08-23 21:44:12 +10:00
Oliver
d267d04bed Allow validation of empty money values 2021-08-23 21:43:31 +10:00
Oliver
f96051d863 Replace print statement with a logger warning 2021-08-23 21:39:54 +10:00
Oliver
8662e6a109 Fix a super annoying validation issue 
- Was throwing opaque "too many values to unpack" error
- Simply needed the name of the field.
 2021-08-23 21:39:00 +10:00
Oliver
1fb76b9987
Merge pull request #1999 from matmair/turn-of-functions 
Disable functions in navbars
 2021-08-23 20:29:28 +10:00
Matthias Mair
4c8fdab072
fixed descriptions 2021-08-23 09:44:52 +02:00
Oliver
fd1dd792c6
Merge pull request #1957 from matmair/bpm-purchase-price 
BOM - show purchase price
 2021-08-23 11:07:30 +10:00
Matthias
9fd4b5cce3
use new setting for part-actions 
PR complete for #1999
 2021-08-22 23:36:49 +02:00
Matthias
b674d851f2
disable fucntions in master nav 2021-08-22 22:30:21 +02:00
Matthias
3682eaac14
disable links in navbar in company views 2021-08-22 22:27:53 +02:00
Matthias
d4efdf86e5
new settingsthe settings-page 2021-08-22 22:09:07 +02:00
Matthias
8edfada22a
adding settings definitions for turning off features 2021-08-22 22:08:41 +02:00
Oliver
b6df623554
Merge pull request #1997 from SchrodingersGat/new-po-from-order 
Refactor buttons in "order parts" wizard
 2021-08-23 00:49:27 +10:00
Oliver Walters
174b7ba7f2 Fix for "new purchase order" button 2021-08-23 00:28:36 +10:00
Oliver Walters
449e0c0af2 Refactor button in first step of "order parts" wizard 
- "new supplier part" button was broken
- Was linked to the old "launchModalForm" code
- Now calls createSupplierPart
 2021-08-23 00:17:45 +10:00
Oliver Walters
f2e58ebbdd remove some unused images 2021-08-22 23:54:43 +10:00
Oliver
370fbea396
Merge pull request #1987 from matmair/fix-for-1986 
Disable table sorting when order is fixed
 2021-08-22 23:47:21 +10:00
Matthias
38af66c0de
fix linebreak in tooltip 
found during fixing #1989
 2021-08-21 00:07:45 +02:00
Matthias
8fad704d76
disable ordering on stock 2021-08-20 22:53:25 +02:00
Matthias
5a59a37a89
disable ordering on category 2021-08-20 22:52:57 +02:00
Matthias
109b8c943e
disable ordering on part-name 2021-08-20 22:52:14 +02:00
Matthias
7533a9ac0c
disable ordering on IPN if fixed ordering 2021-08-20 22:51:36 +02:00
Matthias Mair
e24a158919
Merge branch 'inventree:master' into bpm-purchase-price 2021-08-20 00:42:50 +02:00
Matthias
cb1e7a6cc5
only process purchase_price if prices present 2021-08-19 23:22:58 +02:00
eeintech
ec7392303d Fixed company templates 2021-08-19 10:47:46 -04:00
Oliver
f0415640d5 Run periodic (daily) task to clear out expired sessions 2021-08-19 16:34:57 +10:00
Oliver
2095d66677 Fix entrypoint / cmd for production server 2021-08-18 16:29:54 +10:00
Oliver
da834d8bcc Reduce cruft in logs 2021-08-18 00:04:38 +10:00
Oliver
0294a1c323 Fix for staticfile collection 
- Was generating a *lot* of warning messages
- Ref: https://github.com/django-compressor/django-compressor/issues/720
 2021-08-17 21:02:45 +10:00
Oliver
d5d89c67b1 Error out if the static or media directories are not properly defined 2021-08-17 20:42:19 +10:00
Guusggg
d8eefec065
Print multi part label (#1963) 
* Added description as list for StockLocation

* Merge pull request #1874 from SchrodingersGat/docker-dev-fix

Copy static files when starting dev server

(cherry picked from commit 50eb70f538)

* Merge pull request #1877 from eeintech/fix_search_js

Fixed missing comma propagating to translated JS files

(cherry picked from commit 2009773d9d)

* Merge pull request #1890 from matmair/fix-for-1888

catch connection errors in exchange update

(cherry picked from commit db57e9516b)

* Merge pull request #1887 from matmair/settings-safety

settings fixes

(cherry picked from commit d154ca08ea)

* 0.4.2

* Merge pull request #1894 from SchrodingersGat/non-int-serial-fix

Fix for non-integer serial numbers

(cherry picked from commit 529742b520)

* 0.4.4

Bump release version

* Bump version number -> 0.4.5

* Added a simple menu item to print multiple part labels. This does not follow the style of the Stock label functions but it works!

* Revert "Added description as list for StockLocation"

This reverts commit f5178e9fc3.

* Added the right version number

Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
 2021-08-17 12:42:40 +10:00
eeintech
99839e78fd Added navbar on part import page 2021-08-16 10:21:57 -04:00
Oliver
23b2b56de4 StockItemAttachment 2021-08-16 10:56:00 +10:00
Oliver
6141ddc3eb SalesOrderAttachment and PurchaseOrderAttachment 2021-08-16 10:53:28 +10:00
Oliver
f8b22bc7b7 Refactor BuildAttachment model 2021-08-16 10:49:31 +10:00
Oliver
d9f29b4a70 Updates for InvenTree serializer classes 
- Catch and re-throw errors correctly
 2021-08-16 10:41:26 +10:00
Oliver
3dcf1746e6 Functionality for renaming attached files 2021-08-16 10:41:02 +10:00
Oliver
ff8dcabb12 New custom serializer for handling attachments 2021-08-15 22:43:52 +10:00
Oliver
1998dabe9b Small tweaks here and there 2021-08-15 21:47:37 +10:00
Oliver
8861ffad81 PEP fixes 2021-08-15 12:06:31 +10:00
Oliver
cef09acd54 Partial reversion of some stuff 2021-08-15 12:05:53 +10:00
Oliver
faab1f2464 Provide global_settings and user_settings as context objects 
- Adds a new context middleware
- Refactor the way that settings are provided to the javascript layer
 2021-08-15 11:57:05 +10:00
Oliver
28bccea57b Cleanup 2021-08-14 13:43:38 +10:00
Oliver
32fafc76d7 css tweaks 2021-08-14 13:42:50 +10:00
Oliver
f753e11f10 Improve error notification for modal forms 
- Scroll to error
- Add red border and background to the form
 2021-08-14 13:41:19 +10:00
Oliver
f72eb4266a remove old debug message 2021-08-14 12:31:22 +10:00
Oliver
2b13512145 Check that supplier and manufacturer parts are created 2021-08-14 10:43:45 +10:00
Oliver
6fa4e33062 Unit testing for new API form features 2021-08-14 10:39:05 +10:00
Oliver
26c07961cb Bug fix for API 2021-08-14 10:23:57 +10:00
Oliver
6eb4709658 Adds initial stock quantity 2021-08-14 10:23:42 +10:00
Matthias
00d4efb920
PEP fix 2021-08-13 17:54:17 +02:00