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
3,574 Commits 6 Branches 99 Tags 484 MiB
56660d52f2
Commit Graph

2792 Commits

Author SHA1 Message Date
Oliver Walters
69b8eed028 Fixes for aggregation issues 
- Ensure that "distinct=True" is set!
- ARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
 2020-04-19 22:54:46 +10:00
Oliver Walters
85d1c585c0 Update to django3! 
- This is required to fix some issues with query aggregations as "distinct=True" cannot be set for Sum operations until django 3.0
- Multiple annotations on the same queryset were returning invalid results
- Ref: https://code.djangoproject.com/ticket/10060
- Ref: https://docs.djangoproject.com/en/3.0/topics/db/aggregation/#combining-multiple-aggregations
- django-dbbackup required updating for django3 support
- django-qr-code for now is disabled, a new solution needs to be worked out
 2020-04-19 22:44:16 +10:00
Oliver Walters
51e2f5c46b Merge remote-tracking branch 'inventree/master' 2020-04-18 15:46:33 +10:00
Oliver Walters
880655c141 Small fix for config template 2020-04-18 13:22:52 +10:00
Oliver Walters
6e3f603413 Improvements for token authentication 
- Do not POST username and password data
- This is already encoded in the Authorization: Basic headers
 2020-04-18 12:06:50 +10:00
Oliver Walters
4822d3fd63 Merge remote-tracking branch 'inventree/master' 2020-04-17 21:49:00 +10:00
Oliver Walters
37fcb810e4 Add error checking for thumbnail file migration 2020-04-17 19:23:43 +10:00
Oliver Walters
cbfb3b55e6 Merge remote-tracking branch 'upstream/master' 2020-04-17 19:14:15 +10:00
Oliver Walters
75fed2ebdd Unit testing for barcode API endpoint 2020-04-17 08:40:59 +10:00
Oliver Walters
91012d2788 Delete unused import 2020-04-17 08:40:37 +10:00
Oliver Walters
762d735618 Merge remote-tracking branch 'inventree/master' 2020-04-16 21:55:59 +10:00
Oliver
cf5af4dc77
Merge pull request #722 from SchrodingersGat/barcode 
Create simple endpoint for barcode decode
 2020-04-16 21:55:24 +10:00
Oliver Walters
0ee53758b4 Add same optio for stock table 2020-04-16 21:43:21 +10:00
Oliver Walters
206d67337f Option to disable filters for part table 2020-04-16 21:41:45 +10:00
Oliver Walters
7ab58f683f Fix search result tables 2020-04-16 21:33:35 +10:00
Oliver Walters
10ee8bc666 Use existing serializers to encode information for barcode response 2020-04-15 23:41:16 +10:00
Oliver Walters
d19e287cb5 Template rendering improvements 2020-04-15 14:24:59 +10:00
Oliver Walters
610f85597f Expose supplier_reference to external API 2020-04-15 14:18:17 +10:00
Oliver Walters
c12a482e4d Add "supplier_reference" field to PurchaseOrder 
- This is the code that the Supplier uses for the particuarl sales order
 2020-04-15 13:32:14 +10:00
Oliver Walters
44addc9d7f Bugfix 2020-04-15 07:54:38 +10:00
Oliver Walters
d57fed6142 Change fingerprint icon to barcode 2020-04-15 00:30:00 +10:00
Oliver Walters
a58e2e84f8 Add "ActionPlugin" interface 
- Plugin for running a custom action
 2020-04-15 00:16:42 +10:00
Oliver Walters
4d7407ee51 Logic fix 2020-04-14 23:38:42 +10:00
Oliver Walters
7faa0d199d Push even more barcode decoding to the individual plugin 
- DigiKey barcode is NOT json formatted, for example...
 2020-04-14 23:33:03 +10:00
Oliver Walters
e56c018a4a Display StockItem UID if one exists 2020-04-14 23:28:46 +10:00
Oliver Walters
bad56f64e3 Server does more of the heavy-lifting of the barcode decoding 2020-04-14 23:22:57 +10:00
Oliver Walters
977316cb3a Include UID field in StockItem API 2020-04-14 22:57:46 +10:00
Oliver Walters
ba4a1fd771 Add a 'uid' field to StockItem model 
- To be used for barcode asociation and lookup
 2020-04-14 22:54:05 +10:00
Oliver Walters
277b28a7e9 Create a "unique(ish)" hash for barcode data 2020-04-14 22:38:32 +10:00
Oliver Walters
f742f32804 Added some doc string 2020-04-14 22:33:03 +10:00
Oliver Walters
94e400d0e1 Simplify barcode plugin class 2020-04-14 22:30:29 +10:00
Oliver Walters
5de85defa7 Validation of InvenTree style barcodes 2020-04-14 22:00:58 +10:00
Oliver Walters
4a615e05ae Further barcode work 
- Simplify InvenTree barcode format
- Create base-clas for plugin
 2020-04-14 21:30:43 +10:00
Oliver Walters
70589b06e1 doc 2020-04-14 19:27:43 +10:00
Oliver Walters
7c9eb90bea URL fix 2020-04-14 08:25:10 +10:00
Oliver Walters
cb1298847e Load barcode plugins and throw test data at them 2020-04-14 01:18:57 +10:00
Oliver Walters
38fab9c681 Test API info endpoint 2020-04-14 01:18:30 +10:00
Oliver Walters
b286a5e30c Plugin framework 
- Registers some very simple barcode plugins
 2020-04-14 01:17:44 +10:00
Oliver Walters
653d502a73 Fix the manufacturer migration so it reverses properly 2020-04-13 23:58:10 +10:00
Oliver Walters
9ff5032020 Create simple endpoint for barcode decode 2020-04-13 23:39:56 +10:00
Oliver Walters
3b08b962c1 Fix order of operations 2020-04-13 23:19:23 +10:00
Oliver Walters
fb8c0e5180 Fix buggy migration 
- Need to use raw SQL queries as the database model does not match the python model
 2020-04-13 22:53:14 +10:00
Oliver Walters
47530b7d2a Improvements for "SupplierPartCreate" form 2020-04-13 22:21:20 +10:00
Oliver Walters
0e55911a6b Index page rendering is now a lot faster 
- Hide some elements which are currently very expensive to compute
-
 2020-04-13 22:07:14 +10:00
Oliver Walters
90ac3a5a8a Add custom user filter for 'starred' status 2020-04-13 21:30:34 +10:00
Oliver Walters
124fab3eee Display a part as 'starred' in the part table 2020-04-13 21:30:17 +10:00
Oliver Walters
b850beb687 Add ability to filter by 'starred' status 2020-04-13 21:24:36 +10:00
Oliver Walters
2e1c4e9792 Merge remote-tracking branch 'inventree/master' 2020-04-13 20:43:00 +10:00
Oliver Walters
80fa40694c Unit testing fixes 
- For some reason the builds were passing locally?
 2020-04-13 20:36:51 +10:00
Oliver Walters
9c7813992d Remove old 'manufacturer_name' field 2020-04-13 20:26:24 +10:00
Oliver Walters
c17c014b33 More cleanup 
- Allow user filtering for purchase-order table in part view
- Remove some debug strings

(cherry picked from commit ea466c3588)
 2020-04-13 20:21:13 +10:00
Oliver Walters
307dd25f87 Fixes for unit testing 
(cherry picked from commit eb3b5308ab)
 2020-04-13 20:21:08 +10:00
Oliver Walters
8fa3d77416 Short-circuit the custom migration if there are no SupplierPart objects 
- This allows the unit testing to run!

(cherry picked from commit f243b567fd)
 2020-04-13 20:21:04 +10:00
Oliver Walters
8c55831321 Fix supplier-part-table for Part view 
(cherry picked from commit 2839f94773)
 2020-04-13 20:21:00 +10:00
Oliver Walters
7c892263f8 More API fixes 
- Allow searching supplier parts by manufacturer name
- Better rendering of supplier part table

(cherry picked from commit 62199aedf5)
 2020-04-13 20:20:55 +10:00
Oliver Walters
f88d03db88 Fix "supplier parts" tab for Company display 
Also PEP fixes

(cherry picked from commit a50ecb24c1)
 2020-04-13 20:20:51 +10:00
Oliver Walters
bced189c64 Cleanup display of "SupplierPart" page 
(cherry picked from commit f067eae7d2)
 2020-04-13 20:20:43 +10:00
Oliver Walters
14d18e9d95 "Part" column in Stock table links to supplier part 
(cherry picked from commit 5f0080cc54)
 2020-04-13 20:20:38 +10:00
Oliver Walters
2506aa110b API changes 
- Allow SupplierPart to be filtered by 'company' in addition to 'supplier' and 'manufacturer'
- Stock can now also be filtered by 'company'

(cherry picked from commit 1b1cd944be)
 2020-04-13 20:20:33 +10:00
Oliver Walters
696c101628 Change related name for SuppleirPart.supplier 
(cherry picked from commit 635c4339e0)
 2020-04-13 20:20:28 +10:00
Oliver Walters
0001b889f0 Update company API 
- option to include manufacturer_detail
- improve company serializer

(cherry picked from commit 2ea1e72c44)
 2020-04-13 20:20:23 +10:00
Oliver Walters
4e3825682a Doc fix for mgiration 
(cherry picked from commit 6ef32dfa2d)
 2020-04-13 20:20:18 +10:00
Oliver Walters
04097791bb Custom migration for walking user through the process of mapping supplierpart to manufacturer 
(cherry picked from commit 290002fe9d)
 2020-04-13 20:20:13 +10:00
Oliver Walters
2695368651 Add migration to create a 'manufacturer' field to the SupplierPart model 
(cherry picked from commit 890e938662)
 2020-04-13 20:20:08 +10:00
Oliver Walters
00315aa855 Add 'manufacturer' field to SupplierPart object 
- ForeignKey link to Company model

(cherry picked from commit acebe61ac5)
 2020-04-13 20:20:04 +10:00
Oliver Walters
8b366fc4a0 Rename "manufacturer" to "manufacturer_name" 
(cherry picked from commit e9e734acce)
 2020-04-13 20:19:59 +10:00
Oliver Walters
2a4e8cd062 Improve company search results page 
(cherry picked from commit 34abf34c0f)
 2020-04-13 20:19:53 +10:00
Oliver Walters
d05ba9ee1a Customize "CompanyCreate" form based on calling url 
(cherry picked from commit 8adc83b650)
 2020-04-13 20:19:48 +10:00
Oliver Walters
67d9d2bb04 Separate views for customer / supplier / manufacturer 
(cherry picked from commit 9e9e29679d)
 2020-04-13 20:19:21 +10:00
Oliver Walters
edfb19db13 Company table now in separate javascript file 
(cherry picked from commit 95354f09da)
 2020-04-13 20:19:16 +10:00
Oliver Walters
094a0fe709 Improvements to company API 
- Filter by is_manufacturer
- Better table display

(cherry picked from commit f427ee4754)
 2020-04-13 20:19:10 +10:00
Oliver Walters
906ed7f64d Add "is_manufacturer" field to company model 
(cherry picked from commit fd45db9e22)
 2020-04-13 20:19:03 +10:00
Oliver Walters
a8ceddc8e4 Merge remote-tracking branch 'inventree/master' 2020-04-12 01:05:42 +10:00
Oliver Walters
5e2ed06c2d Add some more translations 2020-04-12 01:00:49 +10:00
Oliver Walters
3c46e12839 Further work on decimal rounding 
- Prevent numbers from being represented in scientific notation
 2020-04-12 00:56:15 +10:00
Oliver Walters
04cee99791 Update for supplier part list table rendering 2020-04-12 00:46:29 +10:00
Oliver Walters
f1f27f08cb Add icons to part base 2020-04-12 00:40:48 +10:00
Oliver Walters
f248b20ba4 Fix 2020-04-12 00:33:43 +10:00
Oliver Walters
6ed482d9eb Update translations 2020-04-12 00:33:10 +10:00
Oliver Walters
fd8273e3e2 Improve build base rendering 
- Consolidate style
- Fix rendering of part pricing
 2020-04-12 00:31:59 +10:00
Oliver Walters
a65c80dbf3 Small fixes here and there 2020-04-12 00:20:29 +10:00
Oliver Walters
7503596ea4 More fixes 
- Add a set of template tags for rendering status codes
- Improve build API filtering
- Remove some outdated files
- Fix unit testing
 2020-04-12 00:10:33 +10:00
Oliver Walters
59778130cd Revert display of "INACTIVE" parts 2020-04-11 23:09:21 +10:00
Oliver Walters
de6f2d37e5 Coalesce baby, yeah! 2020-04-11 23:05:07 +10:00
Oliver Walters
2560613e36 Update API docstring 2020-04-11 23:03:03 +10:00
Oliver Walters
f5a8b110b5 Filter part table by 'is_component' status 2020-04-11 23:02:18 +10:00
Oliver Walters
0f90e8f522 Filter parts by 'is_assembly' 
Also greatly improve rendering of the Part table
 2020-04-11 22:57:40 +10:00
Oliver Walters
e1c6ad7761 Logic fix for part filtering 2020-04-11 22:57:16 +10:00
Oliver Walters
e86bc4fa6d Add ability to filter parts by "low_stock" 
- Huzzah for the "Coalesce" function, eh?
 2020-04-11 22:43:51 +10:00
Oliver Walters
f06078f4ac CSS tweaks 
- Still doesn't look exactly right
 2020-04-11 22:25:34 +10:00
Oliver Walters
5e706554b1 Part table filtering 
- Filter by active status
- Filter by 'is_template' status
- Filter by 'has_stock'
- Allow cascading sublocations
- API improvements to allow new features
 2020-04-11 22:10:15 +10:00
Oliver Walters
d606df16f7 Bug fixes: 
- prevent addition of empty filter tags
 2020-04-11 22:09:09 +10:00
Oliver Walters
57d7d729c1 More table rendering fixes 2020-04-11 21:23:26 +10:00
Oliver Walters
e69f6c5b9d table fixes 2020-04-11 21:08:27 +10:00
Oliver Walters
0fc353ebac Filter purchase-order table for 2020-04-11 20:59:57 +10:00
Oliver Walters
6a0c5b78ae Refactor the purchase-order table 
- Filter by order status
 2020-04-11 20:56:31 +10:00
Oliver Walters
ba7c0bdea0 Improvements for status code generation 
- Now includes labels
- Python template generates javascript which is then rendered? I don't even follow it any more
 2020-04-11 20:48:02 +10:00
Oliver Walters
5d70f496a5 Ability to filter build list by status 2020-04-11 20:03:31 +10:00
Oliver Walters
f0ffb0f8c0 Ability to include part_detail in build API 
- Build list now uses bootstrapTable
 2020-04-11 19:59:16 +10:00
Oliver Walters
a4e45eab13 Skeleton for AJAXified build table 2020-04-11 19:36:01 +10:00
Oliver Walters
2f71233d62 More refactoring 2020-04-11 14:47:41 +10:00
Oliver Walters
e3102900b6 Allow stock API to filter by parts which are not active 2020-04-11 14:41:07 +10:00
Oliver Walters
393597612e More styling improvements 2020-04-11 14:36:48 +10:00
Oliver Walters
dddaa102b3 Layout improvements 2020-04-11 14:19:21 +10:00
Oliver Walters
64f8034a4c Many more refactoring 2020-04-11 14:14:45 +10:00
Oliver Walters
5d2441776e Further work on templated filter options 2020-04-11 13:38:51 +10:00
Oliver Walters
c1b59eeaab Render filter options as a template 
- This allows the values to be seen by the translation layer
- Also means that whenever a new option is added, it will be automatically available to the front-end!
 2020-04-11 13:24:23 +10:00
Oliver Walters
57c5d6c97a Moar refactoring 2020-04-11 12:30:24 +10:00
Oliver Walters
33ac34cc40 Add blank option to filter selection 2020-04-11 11:02:14 +10:00
Oliver Walters
41b208992c cleanup existing code 2020-04-11 11:01:11 +10:00
Oliver Walters
db8d95dba7 Refactoring - delete some unused functions 2020-04-11 10:59:15 +10:00
Oliver Walters
0c5f23ef98 More filter functionality 2020-04-11 10:57:02 +10:00
Oliver Walters
58636139af Refactoring filtering code 2020-04-11 10:14:31 +10:00
Oliver Walters
613dd9d471 Add (very rough) function to add new custom table filters 
- The javascript needs a LOT of work!
 2020-04-11 00:45:18 +10:00
Oliver Walters
b2565270a5 Cleanup logic for refreshing table with original filters 2020-04-11 00:20:46 +10:00
Oliver Walters
4256d09e80 Bugfix for bootstrap-table.j 
"Refreshing" the table options did not work proper good
 2020-04-10 23:54:10 +10:00
Oliver Walters
5d141a0b98 Display a list of filters for Stock table 
- Delete a filter by pressing "X" button
 2020-04-10 16:46:34 +10:00
Oliver Walters
5aa43a5a18 Load / save stock table filters in session storage 2020-04-10 12:54:54 +10:00
Oliver Walters
eeeb04c9f4 Unit testing for Order app API 2020-04-10 08:02:51 +10:00
Oliver Walters
ba2b1ce581 Merge remote-tracking branch 'inventree/master' 2020-04-10 01:12:11 +10:00
Oliver
57da521833
Merge pull request #706 from SchrodingersGat/stocktake-api 
Stocktake api
 2020-04-10 01:11:42 +10:00
Oliver Walters
8da71037ae Update translations 2020-04-10 01:04:55 +10:00
Oliver
47764ca179
Update version.py 
Add a _pre suffix
 2020-04-10 01:03:54 +10:00
Oliver Walters
bc91975f2c Fixes for Stocktransfer API endpoint 2020-04-10 01:01:39 +10:00
Oliver Walters
5b2665edb1 Better API validation 2020-04-10 00:53:04 +10:00
Oliver Walters
41b3f1d39c API cleanup 
Add / Remove / Count endpoints now work
 2020-04-10 00:03:43 +10:00
Oliver Walters
3e5dc65c49 Bugfix for notes field 2020-04-10 00:03:21 +10:00
Oliver Walters
58a0f40889 Simplifiy stock adjustment APIs 
- Separate API endpoints for count / add / remove / transfer
- Unit testing
 2020-04-09 22:24:05 +10:00
Oliver Walters
1b3f8a9309 Unit testing for the stocktake API 2020-04-09 21:19:13 +10:00
Oliver Walters
f6a1ddf8e7 Re-enable stocktake API 2020-04-09 21:18:55 +10:00
Oliver Walters
5aec63d9e4 Remove unused includes 2020-04-07 14:20:43 +10:00
Oliver Walters
8786776fd6 Remove some tests 
- CI complications
 2020-04-07 13:08:30 +10:00
Oliver Walters
e94592e42d Moar unit testing plz 2020-04-07 12:09:25 +10:00
Oliver Walters
623a0844d3 Coverage tests for new functions 2020-04-07 11:50:46 +10:00
Oliver Walters
d06018cbbe PEP fixes 2020-04-07 11:40:10 +10:00
Oliver Walters
95032141ce Toot toot! It's the refactor tractor. 
- Create helper functions to qualify media and static files
 2020-04-07 11:38:57 +10:00
Oliver Walters
ae9ef04013 Use the company thumbnail in the Company API 2020-04-07 11:27:56 +10:00
Oliver Walters
e0655f61d8 Check if Company thumbnails are created on Company app start 2020-04-07 11:23:30 +10:00
Oliver Walters
1a233e7949 Create thumbnails for Company model 2020-04-07 11:17:00 +10:00
Oliver Walters
16d3a87e78 Delete old code 2020-04-07 08:12:10 +10:00
Oliver Walters
7fb89e4dbe Check for missing part thumbnails when the server first runs 2020-04-07 08:08:54 +10:00
Oliver Walters
97f605ef55 Remove some weird trailing zeros 2020-04-07 00:19:51 +10:00
Oliver Walters
1356718bb7 Improver company website icon 2020-04-07 00:19:43 +10:00
Oliver Walters
4a02a90954 Merge remote-tracking branch 'inventree/master' 2020-04-07 00:08:44 +10:00
Oliver Walters
b8bbd15c88 Icon cleanup 2020-04-06 22:02:27 +10:00
Oliver Walters
96547b885e Include supplier-part information in Stock API 2020-04-06 22:02:23 +10:00
Oliver Walters
93eeeec2f3 Merge remote-tracking branch 'inventree/master' 2020-04-06 21:15:06 +10:00
Oliver Walters
3eb585df27 fixes for unit testing 2020-04-06 21:01:24 +10:00
Oliver Walters
0840cebd57 Rearrange purchase order table 2020-04-06 20:56:07 +10:00
Oliver Walters
44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters
e6f6a936e0 Can haz moar icons? 2020-04-06 20:24:45 +10:00
Oliver Walters
751937e0c2 Use InstanceName around the place 
- Report in /api/ endpoint
- Display in About window
- Include in any generated barcode
 2020-04-06 20:11:36 +10:00
Oliver Walters
071c317bae Add 'InstanceName' setting 
- Will be auto-generated if it does not already exist
 2020-04-06 19:28:08 +10:00
Oliver Walters
b8f7555a73 Merge remote-tracking branch 'inventree/master' 2020-04-06 16:25:48 +10:00
Oliver Walters
92cb7211ce Rename 'image_url' to 'thumbnail' in PartBrief API 2020-04-06 12:57:04 +10:00
Oliver Walters
535f1994b1 Fix order API reference 2020-04-06 12:02:23 +10:00
Oliver Walters
87a09a7220 Rename Order.URL to Order.link 2020-04-06 11:56:52 +10:00
Oliver Walters
a306ad0bc3 Alter "URL" to "link" for Company models 2020-04-06 11:36:25 +10:00
Oliver Walters
789712acbe Rename Build.URL -> Build.link 2020-04-06 11:28:35 +10:00
Oliver Walters
bbe714c8f7 Bugs! 
Thanks, unit testing
 2020-04-06 11:21:34 +10:00
Oliver Walters
b28487760a Rename Part.URL -> part.link 
- Previous migration needed some tweaking to get it to run... because.. why?
- It seems to pass when running manage.py migrate but fails when running manage.py test
- Stumped on this one
 2020-04-06 11:16:39 +10:00
Oliver Walters
bd407cd226 Rename "URL" to "link" for StockItem and StockItemTracking models 2020-04-06 10:43:06 +10:00
Oliver Walters
2530313e68 Add part_detail and location_detail to the StockItem detail class 2020-04-06 08:38:10 +10:00
Oliver Walters
791eb63f35 Same fix for Part API 2020-04-05 22:59:45 +10:00
Oliver Walters
94b9878c8d Bug fix for stock api 
- If a part had an empty image, the thumbnail was improperly encoded
 2020-04-05 22:57:42 +10:00
Oliver Walters
efaa532162 Merge remote-tracking branch 'inventree/master' 2020-04-05 22:07:57 +10:00
Oliver Walters
7ecd843ca4 More translations 2020-04-05 20:56:16 +10:00
Oliver Walters
d1a27d2f7e Search icon rather than text 2020-04-05 20:51:07 +10:00
Oliver Walters
84b1960c7b Moar icons plz 2020-04-05 20:49:05 +10:00
Oliver Walters
7b494c08ec Translations 2020-04-05 20:40:46 +10:00
Oliver Walters
c170d3f87a More icons 2020-04-05 20:40:41 +10:00
Oliver Walters
bb844ab94b New icons for home page 2020-04-05 20:04:21 +10:00
Oliver Walters
c427f173ed Nav link icon improvements 2020-04-05 20:04:12 +10:00
Oliver Walters
ca98cbee68 More navbar icons 2020-04-05 20:04:04 +10:00
Oliver Walters
7dd749f394 Add icons to the navbar 2020-04-05 20:00:34 +10:00
Oliver Walters
b0c1999922 Include font-awesome scripts 2020-04-05 19:42:34 +10:00
Oliver Walters
cfd32db570 Include fontawesome icons 2020-04-05 19:34:48 +10:00
Oliver Walters
9112196b8f Add fontawesome files 2020-04-05 19:30:57 +10:00
Oliver Walters
d739c2dea8 "URL" is renamed to "link" in the URL 2020-04-05 19:18:32 +10:00
Oliver Walters
511cdef323 Peppy fix 2020-04-05 15:59:48 +10:00
Oliver Walters
91b5911ff2 Add 'notes' field to Part detail API 2020-04-05 15:46:18 +10:00
Oliver Walters
1f172b3a57 Add 'bom_items' and 'used_in' to Part detail API 2020-04-05 15:39:55 +10:00
Oliver Walters
b4d66c6797 Add 'building' count to Part detail API 2020-04-05 15:29:31 +10:00
Oliver Walters
428b52693a Merge remote-tracking branch 'inventree/master' 2020-04-05 01:00:00 +11:00
Oliver
7c09c20725
Update version.py 
Bump version number
 2020-04-05 00:56:16 +11:00
Oliver Walters
2d3e7e35af Fix middleware due to failing tests 2020-04-05 00:46:15 +11:00
Oliver Walters
8b61acb048 PEP fixes 2020-04-05 00:38:25 +11:00
Oliver Walters
0cfb293ca9 List API now uses the thumbnail image 2020-04-05 00:19:37 +11:00
Oliver Walters
afa31b3415 Generate thumbnails for any part images existing in the database 2020-04-05 00:19:05 +11:00
Oliver Walters
d505e79be8 Allow token-based access to /media/ and /static/ 
- The InvenTree app needs to access the images, but currently token auth only works for the /api/ endpoint
- The app cannot use csrf tokens!
- So, borrow the tokens which are already created per-user in the DRF framework
- If a user is not authed, then check for a token!
- See InvenTree/middleware.py for further documentation
 2020-04-04 23:29:05 +11:00
Oliver Walters
aee0970e49 Part image field now uses django-stdimage 2020-04-04 15:47:05 +11:00
Oliver Walters
55e831f4b4 Merge remote-tracking branch 'inventree/master' 2020-04-03 14:24:35 +11:00
Oliver Walters
b25df586cd Fix API tets 2020-04-03 12:30:58 +11:00
Oliver Walters
92f5648656 Fix API endpoints for Stock app 2020-04-03 12:20:43 +11:00
Oliver Walters
ccb637773f Add item count to StockLocation serializer 2020-04-03 11:41:51 +11:00
Oliver Walters
d4da6211be StockItem: filtering improvements 
- Optional 'cacade' param
- Filter by null parent
 2020-04-03 11:40:37 +11:00
Oliver Walters
fb94949538 Allow StockLocation filtering of null parent 2020-04-03 11:34:42 +11:00
Oliver Walters
f5150f549a Part API changes 
- Allow filtering parts with null parent (top-level category parts)
- Option to include sub-category parts or not
 2020-04-03 09:37:03 +11:00
Oliver Walters
6e65a736e7 Add isNull function to query against null keys 2020-04-03 09:31:26 +11:00
Oliver Walters
d17056820b Allow PartCategory filtering by null parent 2020-04-03 09:25:58 +11:00
Oliver Walters
7e8664a4dd Include "parts" count in Category API 2020-04-03 09:15:09 +11:00
Oliver Walters
aada5f91cb Merge remote-tracking branch 'inventree/master' 2020-03-31 22:15:58 +11:00
Oliver Walters
67a73c1fbf auto-fill price break with default quantity 2020-03-31 22:11:16 +11:00
Oliver Walters
c31b72bde2 type checking 2020-03-31 21:40:23 +11:00
Oliver Walters
6919eaa1e1 Update translations 2020-03-31 21:33:50 +11:00
Oliver Walters
124967ed31 Remove trailing zeros in part order form 2020-03-31 21:30:34 +11:00
Oliver Walters
570010b99c Change POLineItem quantity to a rounding decimal field 2020-03-31 21:23:57 +11:00
Oliver Walters
4c96b34c7c Override prepare_value method of RoundingDecimalFormField 
- Remove trailing zeros in form field display
 2020-03-31 21:21:39 +11:00
Oliver Walters
f07f3b99cf Remove 'notes' field from PurchaseOrder edit / create form 2020-03-31 20:48:44 +11:00
Oliver Walters
b0edd0eb05 Merge remote-tracking branch 'inventree/master' 2020-03-30 19:06:30 +11:00
Oliver Walters
34c097c46a Display proper build status label 2020-03-30 16:48:14 +11:00
Oliver Walters
0dc6d9d37e Improved visual layout 2020-03-30 15:04:56 +11:00
Oliver Walters
5aec3df7c9 Add stock-info labels to Part info page 2020-03-30 13:37:34 +11:00
Oliver Walters
06f28898a0 separate display for "no stock" and "low stock" in list view 2020-03-30 13:31:14 +11:00
Oliver Walters
e8e0ab8416 Include 'minimum_stock' information in part list api 2020-03-30 13:21:33 +11:00
Oliver Walters
5b77ff4a4c Merge remote-tracking branch 'inventree/master' 2020-03-26 18:08:34 +11:00
Oliver Walters
c0650ba7f4 Add "buiding" icon in part list if no stock and none on order 2020-03-26 17:57:49 +11:00
Oliver Walters
713d7960a8 Fix on_order calculation 
- Take into account the number "received"
- Also fix unit tests
 2020-03-26 17:56:44 +11:00
Oliver Walters
6a78f6d451 Include quantity currently being build in Part API 2020-03-26 17:43:02 +11:00
Oliver Walters
41bbbdcd43 Improve query speed when calculating how many parts are on order 2020-03-26 17:31:59 +11:00
Oliver Walters
57123283f4 Better filtering of annotations for Part-list API 2020-03-26 17:08:01 +11:00
Oliver Walters
99efbd4c40 If a part has no stock but is on order, display an "on-order" badge 2020-03-26 14:46:40 +11:00
Oliver Walters
dae45875fb Add 'on_order' quantity to the part list API 2020-03-26 14:46:23 +11:00
maxbachmann
b162c97226
use rapidfuzz instead of fuzzywuzzy 2020-03-22 22:31:15 +01:00
Oliver Walters
ed6abcdf32 Merge remote-tracking branch 'inventree/master' 2020-03-22 20:20:22 +11:00
Oliver
c6f069028c
Update version.py 
bump version number
 2020-03-22 20:19:16 +11:00
Oliver Walters
25caec4c53 Fix unit testings 2020-03-22 20:13:38 +11:00
Oliver Walters
82be9db3df Make a fancy badge 2020-03-22 19:57:51 +11:00
Oliver Walters
90aa205057 Update translations 2020-03-22 19:57:37 +11:00
Oliver Walters
4a259dc146 Can now successfully edit or delete a purchase-order attachment 2020-03-22 19:55:46 +11:00
Oliver Walters
5af2fae120 Simplify URLs for purchase orders 2020-03-22 19:47:08 +11:00
Oliver Walters
834f80698b Create a new attachment against a PurchaseOrder 2020-03-22 18:41:41 +11:00
Oliver Walters
56a6943438 Add an 'attachment' page for the PurchaseOrder view 2020-03-22 18:13:34 +11:00
Oliver Walters
cc41752f9f Add PurchaseOrderAttachment model 
- File attachment against PurchaseOrder
 2020-03-22 18:02:53 +11:00
Oliver Walters
a661d7e1a6 Abstract the PartAttachment class 
Now "Attachments" are much easier to implement for different models
 2020-03-22 17:59:23 +11:00
Oliver Walters
02ec1d4fa2 Merge remote-tracking branch 'inventree/master' 2020-03-19 10:29:26 +11:00
Oliver Walters
01f1ac49e3 Improve SupplierPart detail page 2020-03-19 10:23:41 +11:00
Oliver Walters
5207b2ba21 Add build status label to part detail 2020-03-19 10:20:09 +11:00
Oliver Walters
6fd0380196 Display item overage in the allocation list 2020-03-19 10:16:58 +11:00
Oliver Walters
15bc457714 Improve calculation of BOM item overage 2020-03-19 10:15:43 +11:00
Oliver Walters
3fd0cf67b6 Fix summation of build allocation items 2020-03-19 09:01:22 +11:00
Oliver
daa8496157
Merge pull request #669 from SchrodingersGat/round-fix 
Implement auto-rounding decimal field
 2020-03-19 08:47:29 +11:00
Oliver Walters
d8f5255572 Merge remote-tracking branch 'inventree/master' 2020-03-18 22:24:52 +11:00
Oliver Walters
6731bc1b06 Implement auto-rounding decimal field 
Ref: https://stackoverflow.com/questions/37958130/automatically-round-djangos-decimalfield-according-to-the-max-digits-and-decima
 2020-03-18 22:22:40 +11:00
Oliver Walters
d51ac2f5c2 Save creation user when making a new part via the API 2020-03-18 22:00:32 +11:00
Oliver Walters
a147ce4284 Save the current user when creating a new part 2020-03-18 21:53:02 +11:00
Oliver Walters
8186e4bab0 Display creation information in part detail page 2020-03-18 21:50:38 +11:00
Oliver Walters
2b08b0f2b9 Add new fields for Part object 
- Creation date
- Creation user
- Responsible user
 2020-03-18 21:50:18 +11:00
Oliver Walters
7424cc1352 Merge remote-tracking branch 'inventree/master' 2020-03-18 21:33:09 +11:00
Oliver Walters
8eaaf62eda Limit choices for Part selection 
Based on is_template / virtual / active status
 2020-03-18 21:28:11 +11:00
Oliver Walters
41259f520f Merge remote-tracking branch 'inventree/master' 2020-03-18 21:12:49 +11:00
Oliver Walters
c04aa1bff7 Increase unit testing for BOM item model 2020-03-18 21:04:37 +11:00
Oliver Walters
3b9f57fc80 Bug fix - Multiplying float by decimal 
- Overage percentage now uses explicit decimal multiplication
 2020-03-18 20:44:45 +11:00
Oliver Walters
33ffa2f75f Add option to make stock-table read-only 
- Default table is not read-only
 2020-03-18 20:37:25 +11:00
Oliver Walters
388b26dad2 Merge remote-tracking branch 'inventree/master' 2020-02-25 12:42:49 +11:00
Oliver Walters
4a2fa36e30 Allow 'notes' field in Part object to be blank 2020-02-23 20:02:33 +11:00
Oliver Walters
ef83480f65 Merge remote-tracking branch 'inventree/master' 2020-02-19 00:03:32 +11:00
Oliver
6c415bc922
Merge pull request #653 from SchrodingersGat/stock-item-tree 
Stock item tree
 2020-02-19 00:02:59 +11:00
Oliver Walters
068c237c6e remove failing test 2020-02-18 23:59:37 +11:00
Oliver Walters
066d69215f Catch a ProgrammingError if table does not exist 2020-02-18 10:44:01 +11:00
Oliver Walters
49118d8083 Do not let a StockItem be deleted if child items exist 2020-02-18 10:41:06 +11:00
Oliver Walters
49d5573f8b Bug fix: Update child/parent relationship when a StockItem is deleted 
- Pass the child items up to the parent of the deleted item
- Fix unit tests
 2020-02-18 08:42:55 +11:00
Oliver Walters
9e456f5a11 Flake fix 2020-02-18 08:15:05 +11:00
Oliver Walters
0f4d60dceb StockItem LIST API can now be filtered by StocKItem status 2020-02-17 23:32:43 +11:00
Oliver Walters
23aebab6d0 Display list of build outputs in the Build tab 
- Allow StockList api to be filtered by Build id
 2020-02-17 23:31:23 +11:00
Oliver Walters
e483b42df6 Logic fix for StockItem splitting 
- The original is left in place
- The new item is moved
 2020-02-17 22:56:54 +11:00
Oliver Walters
3715c5d637 Set the parent relationship when serializing StockItem object 
- Keep track of which StockItem is came from
 2020-02-17 22:44:41 +11:00
Oliver Walters
ae4ebab957 Display table of StockItems which have been split from the current item 
- The StockItem list api now allows filtering by 'ancestor'
- Add 'children' tab for StockItem
- Needed to tweak the unit testing fixtures (yay thanks MPTT)
 2020-02-17 22:37:55 +11:00
Oliver Walters
4f266958e3 Add custom migration 
- Required to initialize the MPTT fields for the StockItem model
 2020-02-17 22:11:44 +11:00
Oliver Walters
750dfcda07 Add 'parent' field for StockItem 
- Allows StockItem to be tracked when it is split into multiple items
- Uses MPTT field
 2020-02-17 21:52:31 +11:00
Oliver Walters
0498fd633a Merge remote-tracking branch 'inventree/master' 2020-02-12 12:56:17 +11:00
Oliver Walters
7dcc94b106 Filter purchaseorder API by supplier part 2020-02-12 12:44:52 +11:00
Oliver Walters
33d21594da Create new stock item from supplierpart stock page 
- Allow stock-item-create form to have supplierpart passed as initial data
- Add some translations too
 2020-02-12 11:32:01 +11:00
Oliver Walters
6d80788618 Allow stock-filtering and export using SupplierPart ID 2020-02-12 11:16:00 +11:00
Oliver Walters
8dd8505a2c More tab updates 
- Add Stock tab
- Add Stock table for supplier part
- Allow stock API to be filtered by supplier-part ID
- Add Orders tab
 2020-02-12 11:09:37 +11:00
Oliver Walters
d9d21395d9 Add a 'pricing' tab for SupplierPart 2020-02-12 10:48:25 +11:00
Oliver Walters
63b70614b6 Create 'tabs' for SupplierPart view 2020-02-12 10:42:45 +11:00
Oliver Walters
50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters
28e9d842bf Small tweaks for BOM export 
- Steps towards preventing circular BOMs
- Improve formatting of exported BOM
 2020-02-12 10:18:20 +11:00
Oliver Walters
d04fb0d826 Use decimal2string instead of normalize 2020-02-12 10:08:35 +11:00
Oliver Walters
520b8d7b2b Fix for BOM pricing weirdness 2020-02-12 10:06:17 +11:00
Oliver Walters
c287a0a0b9 More rounding improvements 2020-02-12 08:22:55 +11:00
Oliver Walters
265ed5115a Float parsing on StockItem tracking page 2020-02-12 08:19:08 +11:00
Oliver Walters
53d1040875 Fix allocation count 2020-02-12 08:14:04 +11:00
Oliver Walters
5ae7ca71d7 Improve number rendering of build allocation page 2020-02-12 08:12:26 +11:00
Oliver Walters
564635c368 Add some translatable strings 2020-02-12 08:11:59 +11:00
Oliver Walters
3479528d5b Merge branch 'cascading-bom' 2020-02-11 22:48:33 +11:00
Oliver Walters
882bda46b4 Fix tests 2020-02-11 22:38:50 +11:00
Oliver Walters
f865573e48 Implement cascading export of BOM 2020-02-11 22:32:36 +11:00
Oliver Walters
434d084371 Provide form for user to select export options 2020-02-11 21:43:17 +11:00
Oliver Walters
bb4c25ba68 Merge remote-tracking branch 'inventree/master' 2020-02-11 20:36:13 +11:00
Oliver
eecc435c02
Merge pull request #639 from SchrodingersGat/use-same-img 
Use same thumbnail for multiple parts
 2020-02-11 20:30:08 +11:00
Oliver Walters
55aa63dab4 Override save() method for Part model 
- Delete old thumbnails if they are no longer being used
 2020-02-11 20:27:06 +11:00
Oliver Walters
77c950a729 Fixed unit tests 2020-02-11 00:39:02 +11:00
Oliver Walters
dee47bdea8 Prevent django_cleanup from deleting part thumbs that are used elsewhere 
- Will need to implement a method for automatically deleting part thumbs...
 2020-02-11 00:29:29 +11:00
Oliver Walters
8ea1086b03 Make thumb buttons only visible on mouseover 2020-02-11 00:28:46 +11:00
Oliver Walters
e0e996a6c3 Add buttons to select or upload part images 2020-02-11 00:00:03 +11:00
Oliver Walters
d4fe83170f Select existing image and upload successfully 2020-02-10 23:48:45 +11:00
Oliver Walters
534b60d4b8 Print out MEDIA_ROOT directory if in debug mode 2020-02-10 23:43:41 +11:00
Oliver Walters
725eb3c538 Do not duplicate images when copying a part 
- Simply reference the existing image
 2020-02-10 23:04:58 +11:00
Oliver Walters
17c10da10e Display existing images in a form 2020-02-10 22:57:36 +11:00
Oliver Walters
a82e219336 Add translatable strings for part views 2020-02-10 22:10:06 +11:00
Oliver Walters
1327c1d3b1 Add API endpoint for querying part images 2020-02-10 22:03:06 +11:00
Oliver Walters
66c1a2ef57 test fix 2020-02-10 21:36:57 +11:00
Oliver Walters
cb29ff14e0 Change auto_now field to auto_now_add 
- Build creation date should no longer get erroneously updated
 2020-02-10 21:34:41 +11:00
Oliver Walters
4bd4f2a0a3 Fix for bug b) 
- Don't attempt to save if there are duplicates
- Fix overwritten variable name
- Provide correct return data to the form
 2020-02-06 23:22:55 +11:00
Oliver Walters
2949289fab Fix for bug a) 
- Would not create new StockItem for trackable part if Serial Numbers not provided
 2020-02-06 23:11:47 +11:00
Oliver Walters
bb0c991965 Merge branch 'inventree-settings' 2020-02-03 21:34:08 +11:00
Oliver Walters
41336bd549 Fixes 2020-02-03 21:28:47 +11:00
Oliver Walters
d059aff4f8 Use the part_deep_copy setting to set the default deep_copy value when duplicating a part 2020-02-03 21:14:06 +11:00
Oliver Walters
9cef038d6a IPN must match regex validator (if one is provided) 2020-02-03 21:09:24 +11:00
Oliver Walters
356b6cf15b Load default settings on InvenTree launch 2020-02-03 20:51:53 +11:00
Oliver Walters
8412885e09 Merge remote-tracking branch 'inventree/master' 2020-02-02 22:26:18 +11:00
Oliver
4b8e44bc4a
Merge pull request #632 from SchrodingersGat/database-stats 
Database stats
 2020-02-02 22:18:32 +11:00
Oliver Walters
ef7fca5633 PEP fixes 2020-02-02 22:15:46 +11:00
Oliver Walters
244d364575 Display some basic stats 2020-02-02 22:13:10 +11:00
Oliver Walters
aa210efad6 Simple skelton for database stats view 2020-02-02 22:03:31 +11:00
Oliver Walters
91ca37c84b Add stats link to navbac 
- Also add translation layer for the navbar
 2020-02-02 21:51:23 +11:00
Oliver Walters
d0a7a24649 Add translatable strings 2020-02-02 21:43:10 +11:00
Oliver Walters
5264f816f1 Allow PartCategory and StocKLocation names to be non-unique 
- As long as they are unique in the current tree level
 2020-02-02 21:40:03 +11:00
Oliver Walters
22e3dc634b Merge remote-tracking branch 'inventree/master' 2020-02-02 21:11:52 +11:00
Christian Schlüter
e379b44606
Update German translation 2020-02-02 08:10:48 +01:00
Oliver Walters
40037d826d Merge remote-tracking branch 'inventree/master' 2020-02-02 12:48:04 +11:00
Oliver
a022b8223e
Update version.py 2020-02-02 12:46:42 +11:00
Oliver Walters
1a32e441b7 Add //TODO entry in stock tabs 2020-02-02 12:42:35 +11:00
Oliver Walters
20273f1541 Add commit date information to about window 2020-02-02 12:39:35 +11:00
Oliver Walters
f88f5a39f8 Visual fix for allocation tab 2020-02-02 12:16:31 +11:00
Oliver Walters
1bdcbd1974 Markdownify the 'notes' field for StockItem 
- New tab interface for the StockItem page
- Display / editing of notes field with markdown
 2020-02-02 12:11:18 +11:00
Oliver Walters
908e2ef8bc Add glyphicon for company notes 2020-02-02 11:54:09 +11:00
Oliver Walters
0f92468462 Add icon to signify if notes exist 2020-02-02 11:48:43 +11:00
Oliver Walters
7ec194a14a Markdownify the notes field for PurchaseOrder 
- Update model field
- Create tab view for PO page
- Add 'notes' tab
 2020-02-02 11:44:44 +11:00
Oliver Walters
a7846940c4 Markdownify the notes field for Build model 2020-02-02 00:00:19 +11:00
Oliver Walters
51fab36074 Display / editing for Company notes field 
- Also includes some translation updates
 2020-02-01 23:45:28 +11:00
Oliver Walters
ca9f9e047c Make company notes field markdownable 2020-02-01 23:31:45 +11:00
Oliver Walters
1f71a93d88 Fix page formatting 2020-02-01 23:26:54 +11:00
Oliver Walters
88ec40e454 Fix success_url for notes form 2020-02-01 22:25:35 +11:00
Oliver Walters
f0933f216c PEP fixes 2020-02-01 17:29:58 +11:00
Oliver Walters
919662054c Alter markdownify settings to properly render images, headings 2020-02-01 14:49:28 +11:00
Oliver Walters
b9dda51378 Side-by-side live editing for markdown 2020-02-01 14:40:11 +11:00
Oliver Walters
3c3ae43c18 Add special view for displaying / editing notes field for part 2020-02-01 13:36:09 +11:00
Oliver Walters
c546ed5dcd Update requirements 
- Use markdownify for rendering
- Use markdownx for editing
 2020-01-31 21:42:30 +11:00
Oliver Walters
da01177d23 Blank 'notes' page for Part model 2020-01-31 20:38:29 +11:00
Oliver Walters
aa2f63830e Translation template for part attachments page 2020-01-31 20:37:54 +11:00
Oliver Walters
596d06cf1a Add a markdown editor for the 'Notes" field of Part model 
https://github.com/timmyomahony/django-pagedown
 2020-01-31 20:28:54 +11:00
Oliver Walters
07f3cd5644 Merge remote-tracking branch 'inventree/master' 2020-01-07 21:31:28 +11:00
Oliver Walters
bd653f2c49 Some more unit tests 2020-01-07 21:16:01 +11:00
Oliver Walters
f217650cec Merge remote-tracking branch 'inventree/master' 2020-01-06 21:11:00 +11:00
Oliver Walters
a064ce13fc PEP fixes 2020-01-06 20:51:12 +11:00
Oliver Walters
e103bd8880 Write unit test for PurchaseOrder receive views 2020-01-06 20:50:16 +11:00
Oliver Walters
07de23f120 Merge remote-tracking branch 'inventree/master' 2020-01-06 10:11:18 +11:00
Oliver Walters
61897cb0fc Updated translation files 2020-01-06 09:24:29 +11:00
Oliver Walters
067d2be1f0 Bug fix - receiving lines against a PO caused issues due to integer/Decimal conversion 2020-01-06 09:23:13 +11:00
Oliver Walters
740d7678d7 Update translation files 2020-01-06 08:57:13 +11:00
Oliver Walters
b3ec748123 Display current stock item quantity in stock-adjust modal form 2020-01-06 08:52:28 +11:00
Oliver Walters
881931c6b1 Merge remote-tracking branch 'inventree/master' 2020-01-02 21:08:56 +11:00
Oliver
d2d5909701
Merge pull request #601 from SchrodingersGat/trailing-fix 
Trailing fix
 2020-01-02 20:32:16 +11:00
Oliver Walters
43d47686c5 Style fixes 2020-01-02 20:27:07 +11:00
Oliver Walters
dae74a19d3 Fix logic for decimal string helper 2020-01-02 20:25:59 +11:00
Leon Schnieber
720485709b Applied suggestions and corrected typos 2019-12-20 13:33:34 +01:00
Leon Schnieber
17c048e8dd added german translation 2019-12-19 17:51:42 +01:00
Leon Schnieber
a0534dafec added german translation 2019-12-19 17:47:15 +01:00
Oliver Walters
6bbe818e9c Merge remote-tracking branch 'inventree/master' 2019-12-09 22:27:06 +11:00
Oliver Walters
6cd3b3176c Regenerate translation files 
- Also fix documentation for making a virtual envirtonment
 2019-12-09 22:17:21 +11:00
Oliver Walters
fafd0397bc remove defunct file 2019-12-09 21:56:26 +11:00
Oliver Walters
71c1faf9ff Use the client-side PO table in more places 2019-12-09 21:55:00 +11:00
Oliver Walters
a257f94ac0 Use client-side rendering for list of purchase orders 2019-12-09 21:33:27 +11:00
Oliver Walters
25e5a64cee Improve filtering / ordering / sorting for purchase-order API 2019-12-09 21:19:35 +11:00
Oliver Walters
5e9b012031 Bug fix for static lookup of blank image 2019-12-09 20:40:04 +11:00
Oliver Walters
1a6f06cceb normalize decimal fields 2019-12-06 22:40:27 +11:00
Oliver Walters
0e57a4caec Merge remote-tracking branch 'inventree/master' 2019-12-05 16:36:23 +11:00
Oliver
9946fbda17
Merge pull request #585 from SchrodingersGat/tweaks 
Reload page after ordering parts
 2019-12-05 14:28:34 +11:00
Oliver Walters
98374ca466 Update to more recent libraries 
- Specify exact module versions
 2019-12-05 14:12:05 +11:00
Oliver Walters
2152cb14b4 Add translation files 2019-12-05 10:29:23 +11:00
Oliver Walters
7f2804dff3 Add button to mark a purchase order as complete, even if not all line items are received 2019-12-05 10:29:16 +11:00
Oliver Walters
3f172cb065 Add 'new location' button when receiving parts by individual line 2019-12-05 09:12:37 +11:00
Oliver Walters
cbdea9f18c Reload page after ordering parts 2019-11-29 20:37:34 +11:00
Oliver Walters
b29e1ded64 Merge branch 'decimal-quantity' 2019-11-19 21:47:22 +11:00
Oliver Walters
7e6c5fae62 Display units in part table 2019-11-19 10:39:40 +11:00
Oliver Walters
8b2f1b9313 Better rendering of aggregated stock count in stock table 
https://stackoverflow.com/questions/11832914/round-to-at-most-2-decimal-places-only-if-necessary#12830454
 2019-11-19 10:36:01 +11:00
Oliver Walters
64db28be67 Fix __str__ function to get unit tests to pass 2019-11-19 10:31:49 +11:00
Oliver Walters
381becef79 Convert some more fields to decimal 
- purchase order line item quantity
- purchase order line item received
 2019-11-19 10:30:04 +11:00
Oliver Walters
a1f33c4084 Change build allocation quantity to decimal field 2019-11-19 10:22:46 +11:00
Oliver Walters
dbdbe69f7f Bug fix for test cases 2019-11-19 10:19:52 +11:00
Oliver Walters
9da8189899 Allow non-integer stock movement 2019-11-19 10:17:20 +11:00
Oliver Walters
e4bfe43c04 More rendering improvements 2019-11-19 10:10:23 +11:00
Oliver Walters
003a2d9f3c Allow creation of stockitem with non-integer quantity 
-  Also provided more translation strings
 2019-11-19 10:00:08 +11:00
Oliver Walters
0ea8ade26c Better rendering for build allocation page 
- Added translations too
 2019-11-19 09:51:35 +11:00
Oliver Walters
75774771dc Changes to StockItem model 
- Stock adjustments need to accept decimal values
 2019-11-19 09:18:41 +11:00
Oliver Walters
20755a6dac Rendering of decimal value on stockitem page 2019-11-19 09:10:47 +11:00
Oliver Walters
4e1b9efe93 Fix javascript rendering of decimal quantity in BOM table 2019-11-19 09:08:17 +11:00
Oliver Walters
6e90ac367e Massaging unit tests 
- Decimal fields are useful but VERY ANNOYING to use
- Needed to fix some test cases
 2019-11-19 08:59:56 +11:00
Oliver Walters
400941c10f Change item quantity field from PositiveInteger to Decimal 
- Allow 'partial' quantity e.g. '0.45kg'
- Need to change some maths functions as Decimal type is pernickity
 2019-11-19 08:49:54 +11:00
Oliver Walters
81a226c760 Added translation strings for stock.models 2019-11-19 08:46:25 +11:00
Oliver Walters
5ffbfe8eb8 Add translation strings for part models 2019-11-19 08:42:10 +11:00
Oliver Walters
6e54c49142 Merge remote-tracking branch 'inventree/master' 2019-11-16 20:45:34 +11:00
Oliver Walters
16f3dfb678 Removed old migration file 2019-11-16 20:39:10 +11:00
Oliver Walters
b7473be8ef Update stock adjustment dialog 2019-11-16 20:29:05 +11:00
Oliver Walters
2261973331 Ability to delete multiple stock items 2019-11-16 20:19:10 +11:00
Oliver Walters
789515e39d Add translations for the StockItem detail page 2019-11-16 20:14:08 +11:00
Oliver Walters
0effb584b9 Remove 'active' field 
- Will work this change in at a later date
 2019-11-16 20:13:51 +11:00
Oliver Walters
339126b27a Add new field "active" to StockItem model 
- True by default
- Set to 'false' to mark a stockitem as 'deleted'
 2019-11-16 19:41:36 +11:00
Oliver Walters
56255a98d8 Add a menu item to delete multiple stock items 2019-11-16 19:28:47 +11:00
Oliver Walters
1887463f7f Properly display 'notes' field in grouped rows for stock table 2019-11-04 21:55:48 +11:00
Oliver Walters
f7a1fb0a9d Merge remote-tracking branch 'upstream/master' 2019-09-30 13:54:49 +10:00
Oliver Walters
d1c7877713 Add unit test for CompanyIndex 2019-09-30 13:44:19 +10:00
Oliver Walters
be96a2f7e3 Add some unit tests 2019-09-30 13:39:56 +10:00
Oliver Walters
871b853b9f Single form to delete single or multiple SupplierPart objects 2019-09-30 13:28:51 +10:00
Oliver Walters
cfe33deb8e Merge remote-tracking branch 'upstream/master' 2019-09-29 09:04:47 +10:00
Oliver Walters
ab25a199ce Bug fix - secondary modals not working correctly 2019-09-27 21:00:27 +10:00
Oliver Walters
e891f117f3 Merge remote-tracking branch 'inventree/master' 2019-09-27 10:25:11 +10:00
Oliver Walters
b870728125 Add translation hooks for part detail template 2019-09-27 10:12:46 +10:00
Oliver Walters
427f47310b Add detail pane to top-level part view 2019-09-27 10:04:20 +10:00
Oliver Walters
3e2a5263a5 Add stock information for top-level stock page 2019-09-27 09:59:14 +10:00
Oliver Walters
f2eb66d854 Update readme file and scripts 2019-09-26 10:37:39 +10:00
Oliver Walters
fcba00bc69 Check for altered translation files that have not been compiled 2019-09-26 10:32:44 +10:00
Oliver Walters
9be528a3fb Add (brief) documentation page regarding translations 2019-09-26 10:07:18 +10:00
Oliver Walters
40acf90efe Add some initial (empty) translation files 2019-09-26 09:59:50 +10:00
Oliver Walters
3cc79d6def Add default language option to config.yaml 2019-09-26 09:56:41 +10:00
Oliver Walters
0e0405f337 Update settings.py to enable translations 2019-09-26 09:55:45 +10:00
Oliver Walters
6d628a77fd Merge remote-tracking branch 'inventree/master' 2019-09-24 08:10:00 +10:00
Oliver
fb75617807
Update version.py 2019-09-24 08:08:42 +10:00
Oliver Walters
14217ff648 Merge remote-tracking branch 'inventree/master' 2019-09-24 08:06:11 +10:00
Oliver Walters
7c1615a2b6 Fix user recording when serializing stock 2019-09-24 07:59:59 +10:00
Oliver Walters
41c07fc423 Save user who created a stock item 
- Handled differently for batch or serialized parts
 2019-09-24 07:54:18 +10:00
Oliver Walters
52ec213a28 Save user information when creating a new purchase order 2019-09-24 07:43:14 +10:00
Oliver Walters
b1380687e6 PEP 2019-09-23 19:31:50 +10:00
Oliver Walters
8d92960f10 Ability to receive PO lines items individually 2019-09-23 19:31:18 +10:00
Oliver Walters
0d68dbcfa7 Display which lines have been received against a PO 2019-09-23 19:05:22 +10:00
Oliver Walters
21e369e6cc Update ReceivePurchaseOrder form 
- Location field is now a proper MPTT field
- Ability to create a new location
 2019-09-23 19:02:36 +10:00
Oliver Walters
d6749dfb24 Merge remote-tracking branch 'inventree/master' 2019-09-22 22:34:34 +10:00
Oliver Walters
ae2e2f36e4 Update a bunch more tables 2019-09-22 22:18:53 +10:00
Oliver Walters
2046c12600 Use a jQuerified function 2019-09-22 21:56:57 +10:00
Oliver Walters
df41fafefb Update page table 2019-09-22 21:42:51 +10:00
Oliver Walters
8eaff6a353 Add wrapper function around bootstrapTable 2019-09-22 21:37:20 +10:00
Oliver Walters
fcbf0e6e93 Create UI elements to cancel an order 
- View
- Form
- Template
- Button
- Javascript
 2019-09-20 11:52:38 +10:00
Oliver Walters
6f54091354 Improve display of stock location 2019-09-20 00:03:59 +10:00
Oliver Walters
5a9e5dea20 Add sub-category and part count 2019-09-20 00:00:34 +10:00
Oliver Walters
508a3fc35c Improve display of part category page 2019-09-19 23:59:01 +10:00
Oliver Walters
b3ea2bfb9a Update badges 2019-09-19 23:38:15 +10:00
Oliver Walters
3c98cd87a7 Use localStorage rather than sessionStorage for storing user prefs 
- Also create some helper functions
 2019-09-19 23:29:03 +10:00
Oliver Walters
cf2abb4130 Add option to display ALL results in a paginated table 
- Commonize the number of pages allowed
 2019-09-19 23:20:42 +10:00
Oliver Walters
41d91a8f9b Merge remote-tracking branch 'inventree/master' 2019-09-19 15:43:15 +10:00
Oliver Walters
8a995cc193 Ability to edit username 2019-09-19 14:36:14 +10:00
Oliver Walters
119cccc318 Merge remote-tracking branch 'inventree/master' 2019-09-17 20:32:30 +10:00
Oliver Walters
a77fd23fcf Add a reminder for future-self 2019-09-17 20:19:27 +10:00
Oliver Walters
cb77506111 Simplify 2019-09-17 20:19:05 +10:00
Oliver Walters
c5a82f4b6e Simplifty PartPriceInfo field 2019-09-17 20:17:25 +10:00
Oliver Walters
4a0be0dfb8 Simplify 2019-09-17 20:15:50 +10:00
Oliver Walters
0a7ea27e9f Merge remote-tracking branch 'inventree/master' 2019-09-17 14:22:04 +10:00
Oliver Walters
774872e6a6 Make function atomic 2019-09-17 14:17:49 +10:00
Oliver Walters
08f958dd72 Add form for setting part category 2019-09-17 14:06:11 +10:00
Oliver Walters
94cd28ecb9 Add ability so set category for multiple parts at once 2019-09-17 13:49:57 +10:00
Oliver Walters
b5b7dc0fbf Fix tests 2019-09-17 12:29:18 +10:00
Oliver Walters
f90aa1d2cf Make purchase-order table sortable 2019-09-17 11:44:50 +10:00
Oliver Walters
1cffd41c07 Fix broken price-break buttons 
- Did not work!
 2019-09-17 10:54:28 +10:00
Oliver Walters
d40fc59616 Reload page after ordering part 2019-09-17 10:34:41 +10:00
Oliver Walters
a9d1cadc12 Add link to documentation 2019-09-17 00:41:28 +10:00
Oliver Walters
55ebf48684 Add more export fields for SupplierPart and SupplierPriceBreak 2019-09-16 09:43:57 +10:00
Oliver Walters
628a58e8fc Show which parts are short in build view 2019-09-16 08:23:40 +10:00
Oliver Walters
fedbb834ee Add mouse-over text to build-cancel button 2019-09-16 08:17:39 +10:00
Oliver Walters
f64758eb03 Merge remote-tracking branch 'inventree/master' 2019-09-15 23:29:36 +10:00
Oliver Walters
4746a3ccff Bootstrapify the table 2019-09-15 23:11:06 +10:00
Oliver Walters
2c1a744c2d Display singleton settings in the settings tab 
- Only visible to 'staff' user
 2019-09-15 23:09:58 +10:00
Oliver Walters
098cd0ec44 Add description field 2019-09-15 23:07:45 +10:00
Oliver Walters
02e71bd2ce Template for displaying other settings 2019-09-15 22:50:47 +10:00
Oliver Walters
3e33326120 Add the InvenTreeSetting model 
- Storage of singleton settings in key:value pairs
 2019-09-15 22:46:24 +10:00
Oliver Walters
d0ad3f0e37 Merge remote-tracking branch 'inventree/master' 2019-09-15 22:28:55 +10:00
Oliver Walters
194ae49914 Export full_name for parts 2019-09-15 22:23:34 +10:00
Oliver Walters
7f5aba423a Export full_name for parts 2019-09-15 22:23:28 +10:00
Oliver Walters
db04f399c1 Simplify exporting of BOM for a part 2019-09-15 22:21:12 +10:00
Oliver Walters
ed20e9d4a1 Simplify code for exporting PurchaseOrder 
- New resource for managing import/export of POLineItem model
 2019-09-15 22:04:52 +10:00
Oliver Walters
204cd967aa Include status label text when exporting stocktake data 2019-09-15 20:14:27 +10:00
Oliver Walters
03043e67c7 Perform full validation when importing data 2019-09-15 19:58:05 +10:00
Oliver Walters
2d17f957f1 Remove code duplication for part data export 2019-09-15 19:52:28 +10:00
Oliver Walters
2bc97764c7 Allow more file formats for BOM import 2019-09-15 19:45:59 +10:00
Oliver Walters
9c84e9076f Consolidate stock export code 
- Now defined in stock.admin as StockItemResource
- Much more control over format of exported data
- Exported data can be re-imported!
 2019-09-15 19:29:18 +10:00
jmht
ce099f43f3 Fixes problem with 'New Purchase Order' button not working from Suppliers page. 2019-09-14 21:40:09 +01:00
Oliver Walters
5fde9777fb Merge remote-tracking branch 'inventree/master' 2019-09-14 00:19:17 +10:00
Oliver Walters
70e07470db Custom URL validators for more fields 2019-09-14 00:08:49 +10:00
Oliver Walters
4ac8353099 Create a custom URL field, which allows the user-specified validators 
- Ref: https://stackoverflow.com/questions/41756572/django-urlfield-with-custom-scheme
- Apply this to the URL field in the Part model
 2019-09-14 00:04:08 +10:00
Oliver Walters
ee17d5d3c3 Allow for custom url schemes to be specified in the config file 2019-09-14 00:03:13 +10:00
Oliver Walters
4b33b15dd2 Merge remote-tracking branch 'inventree/master' 2019-09-13 23:38:07 +10:00
Oliver
0846daf1f6
Merge pull request #524 from SchrodingersGat/import-export 
Customization of django-import-export plugin
 2019-09-13 23:35:57 +10:00
Oliver Walters
8578a3b8d1 Add searching to other admin views 2019-09-13 23:32:49 +10:00
Oliver Walters
9b1d0bee3b Add filtering and searching to Part admin 2019-09-13 23:27:22 +10:00
Oliver Walters
28d49bdd47 PEP 2019-09-13 23:19:12 +10:00
Oliver Walters
6a19e94feb Include some extra calculated fields for Part export (readonly) 2019-09-13 23:15:34 +10:00
Oliver Walters
52eeffc2c4 Change more models to use ImportExportModelAdmin 2019-09-13 23:05:16 +10:00
Oliver Walters
f707dd3430 Currency model admin now supports import / export 2019-09-13 23:02:54 +10:00
Oliver Walters
cb5db332d3 Manager for import/export of StockItem data 2019-09-13 23:00:21 +10:00
Oliver Walters
23b814569a Manager for importing StockLocation data 2019-09-13 22:44:50 +10:00
Oliver Walters
37ab3d214d Import/export management for the Company app 
- Company
- SupplierPart
- SupplierPriceBreak
 2019-09-13 22:39:15 +10:00
Oliver Walters
c579854e89 Export 'default_supplier' field 2019-09-13 22:29:11 +10:00
Oliver Walters
2bc34853e2 import/export manager for PartParameter 2019-09-13 22:27:32 +10:00
Oliver Walters
c469e48f26 Data manager for BomItem 2019-09-13 22:23:40 +10:00
Oliver Walters
bacd70687d Management class for PartCategory import / export 2019-09-13 22:20:08 +10:00
Oliver Walters
89acc778f5 Skip unchanged lines for matching ID values 2019-09-13 22:11:31 +10:00
Oliver Walters
ac36048230 Improve import/export of Part 
- Can now import part data
- Either UPDATE existing rows, or CREATE new ones
 2019-09-13 22:08:31 +10:00
Oliver Walters
8a68313e5e Customize admin export of Part object 2019-09-13 21:39:37 +10:00
Oliver
9e1f56cdb8
Merge pull request #522 from SchrodingersGat/order-improvements 
Order improvements
 2019-09-13 21:16:47 +10:00
Oliver Walters
7e9c095edb Ok, fixed now 2019-09-13 21:14:00 +10:00
Oliver Walters
588713467d Fixed unit tests 2019-09-13 21:07:32 +10:00
Oliver Walters
c8be9cb90c Display template badge in part table 2019-09-13 20:58:17 +10:00
Oliver Walters
36ec5e41b0 Cleanup 2019-09-13 20:53:04 +10:00
Oliver Walters
59f102af3c Database filtering beats list comprehension! 2019-09-13 20:15:34 +10:00
Oliver Walters
6854190ff9 Simple test for POLineItemedit view 2019-09-13 20:10:17 +10:00
Oliver Walters
d515e2d968 Tests for POLineItem creation form 2019-09-13 20:01:41 +10:00
Oliver Walters
7c6901f445 Tests for purchas order issue form 2019-09-13 18:15:05 +10:00
Oliver Walters
2be99be4de Merge remote-tracking branch 'inventree/master' 2019-09-13 16:41:34 +10:00
Oliver Walters
567826165c Improve BomItem editing form 
- Don't allow duplication of an item already in the BOM
- Remove the parent part from the BOM
 2019-09-13 16:26:44 +10:00
Oliver
8fcc1b8448
Update version.py 
Bumped to v0.0.6
 2019-09-13 15:54:12 +10:00
Oliver Walters
625ab33bc8 Merge remote-tracking branch 'inventree/master' 2019-09-13 15:38:41 +10:00
Oliver Walters
17e91493ea Bug fix for order-parts form 
- Check for parts already existing in PO must filter by the purchase order ID in addition to the part ID
 2019-09-13 15:32:52 +10:00
Oliver Walters
9681372a84 Merge remote-tracking branch 'inventree/master' 2019-09-13 11:20:39 +10:00
Oliver Walters
8716281f7e Add unit test for invalid characters 2019-09-13 11:15:54 +10:00
Oliver Walters
844f337d64 Fix ValidationError call for validate_tree_name function 2019-09-13 11:15:11 +10:00
Oliver Walters
0683911076 Merge remote-tracking branch 'inventree/master' 2019-09-12 22:55:58 +10:00
Oliver
afdea818f7
Merge pull request #510 from SchrodingersGat/delete-lead-time 
Remove lead-time field
 2019-09-12 22:45:58 +10:00
Oliver Walters
91453094aa Remove lead-time field 2019-09-12 22:37:09 +10:00
Oliver
7326146c19
Merge pull request #509 from SchrodingersGat/delete-supplier 
Hide dropdown-menu for functionality that does not yet exist
 2019-09-12 22:17:53 +10:00
Oliver Walters
61d2ce67ef Hide dropdown-menu for functionality that does not yet exist 2019-09-12 22:01:18 +10:00
Oliver Walters
31625aa4bb Fix buttons for edit/delete supplier price break 2019-09-12 21:53:29 +10:00
Oliver Walters
d703e48ecb Merge remote-tracking branch 'inventree/master' 2019-09-10 14:50:47 +10:00
Oliver Walters
4daf1ae8d4 Fixes for migrate target in makefile 2019-09-10 14:18:20 +10:00
Oliver Walters
015ed66967 Merge remote-tracking branch 'inventree/master' 2019-09-09 20:54:55 +10:00
Oliver Walters
4dc7da41b9 pepper 2019-09-09 20:02:52 +10:00
Oliver Walters
ddb041fe44 Filter by category too 2019-09-09 19:59:56 +10:00
Oliver Walters
776fc8b1e5 Add 'used_in' count to part export 2019-09-09 19:37:59 +10:00
Oliver Walters
8723a6c219 Add 'purchaseable' field to part export 2019-09-09 19:10:57 +10:00
Oliver Walters
a6e850e39f Merge remote-tracking branch 'inventree/master' 2019-09-09 15:03:57 +10:00
Oliver
e4dcbd2fda
Update version.py 
Bump version num
 2019-09-09 14:25:00 +10:00
Oliver Walters
53c5324df6 Fix uniqueness test for stock item 2019-09-09 08:49:27 +10:00
Oliver Walters
fb2c347fd4 Removed unused import 2019-09-09 08:30:24 +10:00
Oliver Walters
9c988310b6 Add tests for MPTT models 2019-09-09 08:29:36 +10:00
Oliver Walters
108382cc89 Prefecth related data for stock export 
- Example export reduced from 1,024 queries to 7
 2019-09-09 08:17:26 +10:00
Oliver Walters
abecb4856f Merge remote-tracking branch 'inventree/master' 2019-09-09 00:09:58 +10:00
Oliver Walters
11c946be4d Export human-readable status code 2019-09-09 00:02:08 +10:00
Oliver Walters
fff42e7dbb Export stock based on part 2019-09-08 23:58:40 +10:00
Oliver Walters
231a669fe5 Export stock based on supplier 2019-09-08 23:53:09 +10:00
Oliver Walters
3d5542181a Move "Export" button onto stock table 2019-09-08 23:40:51 +10:00
Oliver Walters
8817b4d692 Icer button rendering for PurchaseOrder page 2019-09-08 23:27:54 +10:00
Oliver Walters
fa8056f4b9 Fill out supplier_part details when receiving a line for a purchase order 2019-09-08 23:15:44 +10:00
Oliver Walters
9212d6047f Add supplier information to exported data 2019-09-08 23:10:13 +10:00
Oliver Walters
cc452bc270 Export stock data 2019-09-08 23:01:16 +10:00
Oliver Walters
faf8b9f2f0 Form / view for downloading stocktake info 2019-09-08 22:37:27 +10:00
Oliver Walters
f4e71d6055 Add a buttony-boy 
(cherry picked from commit 69ac5d870a2f1bc9589cd9b23212d3b51cf92c80)
 2019-09-08 20:55:19 +10:00
Oliver Walters
2c969ef1c6 View for exporting stocktake / stock list 
(cherry picked from commit bdad2d6178a14322ef225d08b13db86b6d7d0909)
 2019-09-08 20:55:06 +10:00
Oliver Walters
026108803e More links in the about page 2019-09-08 20:48:33 +10:00
Oliver Walters
e4fc44c135 More test 2019-09-08 20:36:51 +10:00
Oliver Walters
2a203be5cc Tests for part parameters 2019-09-08 20:18:21 +10:00
Oliver Walters
dac61eafa2 Fixed tests 
- Tree classes now need extra configuration in the fixture
- Check for null pk when cleaning a tree node
 2019-09-08 19:41:54 +10:00
Oliver Walters
a5189b8f3f Replace a recursive function 2019-09-08 19:28:40 +10:00
Oliver Walters
0d6a3d3b28 BOM table now refreshes the table rather than the page 2019-09-08 19:24:47 +10:00
Oliver Walters
b554af5f10 Fix display of location list 2019-09-08 19:21:40 +10:00
Oliver Walters
3eb3c43e5c Change foreign keys to TreeForeignKey 2019-09-08 19:19:39 +10:00
Oliver Walters
678157aac4 Update StockLocation and PartCategory models 
- Use the MPTT functionality once more
 2019-09-08 19:13:13 +10:00
Oliver Walters
4d7fba9f14 Replace tree functionality with MPTT goodness 2019-09-08 18:57:48 +10:00
Oliver Walters
2f11fccb73 Migrate InvenTreeTree to using MPTT model 2019-09-08 14:08:49 +10:00
Oliver Walters
b3a5dbb5db Add django-mptt as a requirement 
(cherry picked from commit 8c33a9fca11ad9af9c9f1c6ddf2a9dab8d71e2e4)
 2019-09-08 14:02:30 +10:00
Oliver Walters
dbf88f8485 Merge remote-tracking branch 'upstream/master' 2019-09-08 01:48:20 +10:00
Oliver Walters
baf096b3e7 Ensure token validation is working correctly 2019-09-08 00:28:12 +10:00
Oliver Walters
576226ad30 Tests for retrieving user auth tokens 2019-09-07 23:41:15 +10:00
Oliver Walters
32f606627d Special display case for base currecny 2019-09-07 22:43:39 +10:00
Oliver Walters
f24496c5a2 Enforce at least one base currency to be selected 2019-09-07 22:42:08 +10:00
Oliver Walters
83af318ad0 Merge remote-tracking branch 'inventree/master' 2019-09-07 21:23:50 +10:00
Oliver Walters
023c386f5e Display a warning message if delete_on_deplete is set 2019-09-07 21:18:32 +10:00
Oliver Walters
b4bbd43bae Fix 404 if a stock item is completely depleted 2019-09-07 21:15:14 +10:00
Oliver Walters
efc08f6824 Improve table sorting for company list 2019-09-07 20:47:02 +10:00
Oliver Walters
7be1edd896 Merge remote-tracking branch 'inventree/master' 2019-09-07 20:37:30 +10:00
Oliver
dd5ca32e8e
Merge pull request #481 from SchrodingersGat/settings 
Improve settings view
 2019-09-07 20:37:03 +10:00
Oliver
daa5a32440
Merge pull request #447 from rrakso/feature/add_method_to_delete_token 
Feature/add method to delete token
 2019-09-07 20:36:39 +10:00
Oliver Walters
446b342480 Add pagination to tables 2019-09-07 20:32:22 +10:00
Oliver Walters
c45fcb45cf Delete a part parameter template from the settings view 2019-09-07 20:30:51 +10:00
Oliver Walters
42ade0e0b7 Edit part parameter template from settings view 2019-09-07 20:28:38 +10:00
Oliver Walters
55669c79c2 Delete a currency from the currency settings view 2019-09-07 20:22:30 +10:00
Oliver Walters
3188b0ab18 Edit currency from settings view 2019-09-07 20:19:35 +10:00
Oliver Walters
31562826f4 Add modal form for creating a new currency 2019-09-07 20:06:04 +10:00
Oliver Walters
67ea0fa887 Create a new part parameter template 2019-09-07 19:53:47 +10:00
Oliver Walters
94ab7c5b0e Display list of part parameter templates in the part settings page 2019-09-07 19:45:36 +10:00
Oliver Walters
f415e2040e API endpoint for PartParameter and PartParameterTemplate 2019-09-07 19:44:10 +10:00
Oliver Walters
13270617b9 Ensure PartParameterTemplate name is unique 2019-09-07 19:43:41 +10:00
Oliver Walters
6752bdc1c6 Sort currency API 2019-09-07 19:28:20 +10:00
Oliver Walters
873faee040 Display currency list under currency settings page 2019-09-07 19:23:58 +10:00
Oliver Walters
9726ea4f99 Add serializer / API for currency objects 2019-09-07 19:18:18 +10:00
Oliver Walters
89c3ab5e99 Formatting 2019-09-07 18:58:37 +10:00
Oliver Walters
27878d2d8d Split settings into multiple pages 
- Tab style navigation
 2019-09-07 18:02:03 +10:00
Oliver Walters
1b8fb4db44 Start skeleton for better settings page 2019-09-07 15:04:18 +10:00
Oliver Walters
d6ca21273d Merge remote-tracking branch 'inventree/master' 2019-09-07 15:03:54 +10:00
Oliver
9a61ba4e1e
Merge pull request #479 from SchrodingersGat/hide-sellable 
Hide the 'sellable' tag for now
 2019-09-07 14:25:33 +10:00
Oliver Walters
9c864aa619 Hide the 'sellable' tag for now 
- Keep hidden until parts can actually be sold
 2019-09-07 10:51:39 +10:00
Oliver Walters
8703ee90c6 Improve grouping 2019-09-07 10:41:22 +10:00
Oliver Walters
910d9a15f6 Display batch information in stock table 2019-09-07 10:39:48 +10:00
Oliver Walters
dd934f0e34 Merge remote-tracking branch 'inventree/master' 2019-09-06 14:42:40 +10:00
Oliver Walters
dac1264878 Fixed unit tests 2019-09-06 12:48:31 +10:00
Oliver Walters
9bde8bde66 Tree items dispaly description in __str__ representation 2019-09-06 12:40:04 +10:00
Oliver Walters
eb378e5e5d Specify PNG image for QR code generation 2019-09-06 12:38:09 +10:00
Oliver Walters
612851fd48 Merge remote-tracking branch 'inventree/master' 2019-09-06 11:19:48 +10:00
Oliver Walters
38b88e44bd Bug fix 2019-09-05 20:22:47 +10:00
Oliver Walters
755962c6a2 Merge remote-tracking branch 'inventree/master' 2019-09-05 20:13:17 +10:00
Oliver
7642a1bb7b
Merge pull request #472 from SchrodingersGat/default-loc 
Add new option to move-stock form
 2019-09-05 20:09:47 +10:00
Oliver Walters
7fd4359007 Add new option to move-stock form 
- Set the destination as the default location for parts being moved
 2019-09-05 19:59:00 +10:00
Oliver Walters
7659f2de7b Click button to validate BOM item 2019-09-05 19:34:58 +10:00
Oliver Walters
37d9c59a0e Add API endpoint for validating a BOM item 2019-09-05 19:29:51 +10:00
Oliver Walters
81f5714cb1 BOM table now displays which lines have been marked as valid 2019-09-05 14:15:58 +10:00
Oliver Walters
1ea7bdf843 Add a note 2019-09-05 13:12:49 +10:00
Oliver Walters
0508c2dcaf Use the hash for each line item to calculate the total BOM hash 2019-09-05 13:10:26 +10:00
Oliver Walters
7671eb2b22 Add a checksum field to the bom line item 2019-09-05 12:58:11 +10:00
Oliver Walters
8f3a022b3c Merge remote-tracking branch 'inventree/master' 2019-09-04 08:57:24 +10:00
Oliver Walters
e903c1858f PEP 2019-09-03 22:45:45 +10:00
Oliver Walters
20b37a2d11 Test fixes 2019-09-03 22:45:11 +10:00
Oliver Walters
41806089e3 Select the default currency if one is not specifically selected 2019-09-03 22:33:50 +10:00
Oliver Walters
3682e9b5fb Display currency selection in part pricing dialog 2019-09-03 22:28:53 +10:00
Oliver Walters
7314f33d6d Add currency selection field for price calculation form 2019-09-03 22:00:43 +10:00
Oliver Walters
017bf187f9 Merge remote-tracking branch 'inventree/master' 2019-09-03 10:42:14 +10:00
Oliver Walters
0325f042b5 Bump version number 2019-09-03 09:59:14 +10:00
Oliver Walters
af8a96e080 Add option to edit currency 2019-09-03 09:55:15 +10:00
Oliver Walters
09cb82cdc0 Fix converted_cost 
- Incompatibility between float and decimal
 2019-09-03 09:46:32 +10:00
Oliver Walters
c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters
9f91797f42 Simple test case for currency 2019-09-03 09:19:37 +10:00
Oliver Walters
32d09d2d37 Add default value for currency 2019-09-03 09:10:36 +10:00
Oliver Walters
7824b8561d Create a currency model 2019-09-03 09:07:03 +10:00
Oliver Walters
aeb25e4c34 startapp common 2019-09-03 08:30:14 +10:00
Oliver Walters
273412b63d Add 'bug report' button 2019-09-02 22:14:50 +10:00
Oliver Walters
f3e161564d Fix for serialization of company images 2019-09-02 22:06:42 +10:00
Oliver Walters
b0c420858b Comments for settings.py 2019-09-02 16:44:01 +10:00
Oliver Walters
7b8d7c9fe0 Merge remote-tracking branch 'upstream/master' 2019-09-01 23:33:39 +10:00
Oliver Walters
906766cc0e Bug fix - ensure pk is set to None 2019-09-01 23:28:28 +10:00
Oliver Walters
7db938eda0 Show the build item on the stock-item page (if applicable) 2019-09-01 23:24:27 +10:00
Oliver Walters
c45c4e236e Point new stockitem to the correct build 2019-09-01 23:18:28 +10:00
Oliver Walters
3cef5c93ce Improve stock item splitting 2019-09-01 23:18:08 +10:00
Oliver Walters
90a342fad8 Add a reference to a build for a stock item 2019-09-01 23:09:40 +10:00
Oliver Walters
d9cc03c5ca Improve installation documentation 2019-09-01 22:16:58 +10:00
Oliver Walters
d319c79abb Merge remote-tracking branch 'upstream/master' 2019-08-30 02:59:01 +10:00
Oliver Walters
094e8cdc23 PEP 2019-08-30 00:15:16 +10:00
Oliver Walters
891f4f9f17 Another test 2019-08-30 00:14:54 +10:00
Oliver Walters
6f8c3454f3 Tests for stock serialization form 2019-08-30 00:06:46 +10:00
Oliver Walters
34bfdea4b5 Test another invalid serialization 2019-08-29 23:50:33 +10:00
Oliver Walters
ef94b41a77 Add test for api-doc view 2019-08-29 23:43:24 +10:00
Oliver Walters
e68a9c223d Fix broken api-doc page 
https://www.django-rest-framework.org/community/3.10-announcement/#continuing-to-use-coreapi
 2019-08-29 22:00:15 +10:00
Oliver Walters
1e62528d2a Merge remote-tracking branch 'upstream/master' 2019-08-29 21:37:03 +10:00
Oliver Walters
0fba236eef Stock locations are now persistent 2019-08-29 15:52:32 +10:00
Oliver Walters
ef674061de Part category collapse is persistent 2019-08-29 15:50:48 +10:00
Oliver Walters
7ae7c19a24 Merge remote-tracking branch 'inventree/master' 2019-08-29 08:21:21 +10:00
Oliver Walters
86b2b9cdb1 Allow unserialized build 2019-08-29 08:05:45 +10:00
Oliver Walters
937bcd41d6 Fix tests for stock serialization 2019-08-29 07:37:44 +10:00
Oliver Walters
4db345d0c2 Perfom serialization 2019-08-28 22:47:46 +10:00
Oliver Walters
76ec44d770 Form improvements 2019-08-28 22:04:04 +10:00
Oliver Walters
15b38000d5 Improved serial number extraction 
- Check data types
- Translation for error messages
 2019-08-28 22:03:40 +10:00
Oliver Walters
6c5b09efd4 Provide initial data 2019-08-28 21:50:44 +10:00
Oliver Walters
7575a39b7f Add form / view for serializing a stock item 
- Back end doesn't do anything yet
 2019-08-28 21:46:26 +10:00
Oliver Walters
3b8f5872ac Add button to serialize stock 2019-08-28 21:21:26 +10:00
Oliver Walters
43967e302b Add ablity to serialize an existing quantity of stock 
- Do not have to serialize all the stock
- Add tests
- Add function to copy entire stock transaction history
 2019-08-28 21:12:16 +10:00
Oskar Jaskolski
8949542baf fixed response text 2019-08-28 12:53:08 +02:00
Oskar Jaskolski
0a6abd21be fixed responde text 2019-08-28 12:47:56 +02:00
Oskar Jaskolski
3c70c3a29c clean 2019-08-28 12:41:46 +02:00
Oskar Jaskolski
981884f368 test 2019-08-28 12:40:06 +02:00
Oskar Jaskolski
5dcfc20d82 test 2019-08-28 12:39:25 +02:00
Oskar Jaskolski
381e58ab1c added import 2019-08-28 12:35:00 +02:00
Oskar Jaskolski
105b93a0e3 added method allowing to remove token 2019-08-28 12:30:31 +02:00
Oliver Walters
bc03ae53bd Changes for clean of StockItem 2019-08-28 20:01:38 +10:00
Oliver Walters
88b90281f5 Do not enforce serialization when creating a stock item 2019-08-28 19:56:35 +10:00
Oliver Walters
0dce5fab7b Merge remote-tracking branch 'inventree/master' 2019-08-28 19:48:46 +10:00
Oliver Walters
d5ad53c788 Add docstring 2019-08-28 19:44:46 +10:00
Oliver Walters
f94be40857 Style fixes 2019-08-28 19:44:02 +10:00
Oliver Walters
586a46175d Add modals for editing or deleting part parameters 2019-08-28 19:39:47 +10:00
Oliver Walters
51e4bdd821 URL / view for editing a PartParameter 2019-08-21 13:11:19 +10:00
Oliver Walters
e77aeec2ce Change to ImportExport model admin 2019-08-20 18:04:22 +10:00
Oliver Walters
9630c90924 Add buttons to edit/delete parameters 2019-08-20 18:01:20 +10:00
Oliver Walters
307a04da58 Add View/Form for creating a new PartParameterTemplate 2019-08-20 14:33:18 +10:00
Oliver Walters
15a42878db Improved view for creating a new part parameter 
- Hide the Part input
- Reduce options based on parameters that already exist!
 2019-08-20 14:28:15 +10:00
Oliver Walters
c68c79ea43 Create view / form / URL for PartParameter creation 2019-08-20 14:14:21 +10:00
Oliver Walters
db834802e3 Add uniqueness check for PartParameterTemplate name field 
- Case insensitive
 2019-08-20 13:08:06 +10:00
Oliver Walters
a228b38e5d Fix parameter lookup 2019-08-20 13:03:36 +10:00
Oliver Walters
e6819b5396 Change model - add PartParameterTemplate 2019-08-20 13:02:00 +10:00
Oliver Walters
6393ddad53 Add param tab to Part detail view 2019-08-20 12:44:00 +10:00
Oliver Walters
0955166fae Add admin interface for PartParameter 2019-08-20 12:43:23 +10:00
Oliver Walters
1cd0051316 Add page to display part parameters 2019-08-20 12:43:12 +10:00
Oliver Walters
2f6357b136 Add PartParameter table 2019-08-20 12:31:43 +10:00
Oliver Walters
d1dc0fae19 Merge remote-tracking branch 'inventree/master' 2019-08-15 22:02:45 +10:00
Oliver Walters
41bfdc1432 Enforce usage of sqlite3 for running tests 
- Simplifies tests by creating a database in memory
- Does not affect the user setup at all
 2019-08-15 21:57:34 +10:00
Oliver Walters
9f5325d61f PEP fixes 2019-08-15 21:50:42 +10:00
Oliver Walters
087492faf8 More build tests 2019-08-15 21:49:40 +10:00
Oliver Walters
cd05ed91aa More tests for Build API and views 2019-08-15 21:35:16 +10:00
Oliver Walters
62f007529e Bug fix in build views 
- Untested code path meant variable was not being set
 2019-08-15 21:19:59 +10:00
Oliver Walters
80771beee9 FIxtures for build testing 2019-08-15 21:16:12 +10:00
Oliver Walters
dd33209b1c Merge remote-tracking branch 'inventree/master' 2019-08-15 19:54:21 +10:00
Oliver Walters
5501fecbc4 PEP 2019-08-15 19:36:03 +10:00
Oliver Walters
b8d7cefa95 Add button to delete a build (only if it has been cancelled) 2019-08-15 19:35:12 +10:00
Oliver Walters
03b7e3a815 Add view / template to delete a build 2019-08-15 19:34:55 +10:00
Oliver Walters
d9e5bfd971 Use button row rather than drop-down for build display 2019-08-15 19:26:13 +10:00
Oliver Walters
c3fe101571 Merge remote-tracking branch 'inventree/master' 2019-08-15 13:41:50 +10:00
Oliver Walters
c81f8e6d87 Add 'new supplier part' button to stock item creation form 2019-08-15 13:17:33 +10:00
Oliver Walters
475c532514 Fix config template file 2019-08-14 16:56:54 +10:00
Oliver Walters
6106d33732 More span / button fixes 2019-08-14 16:40:14 +10:00
Oliver Walters
6c73649687 PEP fix 2019-08-14 16:35:26 +10:00
Oliver Walters
5963f7ed01 Deleted unused form 2019-08-14 13:54:16 +10:00
Oliver Walters
f90ffcd3db Fix buttons for BOM upload form 2019-08-14 13:35:48 +10:00
Oliver Walters
f9fa16a397 Fix remove-row button in stock-adjust form 2019-08-14 13:29:51 +10:00
Oliver Walters
335066aef6 Fix buttons for order form 2019-08-14 13:28:06 +10:00
Oliver Walters
b19472ad73 Bump version 2019-08-14 13:27:51 +10:00
Oliver Walters
2c1b20b5d5 Merge branch 'mysql-install' 2019-08-14 13:19:13 +10:00
Oliver Walters
0a97bc1b40 PEP fixes 2019-08-14 13:15:36 +10:00
Oliver Walters
ea669e7562 Print warnings to stderr not stdout 2019-08-14 12:13:31 +10:00
Oliver Walters
905c02d86f Copy config template to config file if it does not exist 2019-08-14 12:05:47 +10:00
Oliver Walters
b7391231aa Fixes for default config file 2019-08-14 11:43:48 +10:00
Oliver Walters
c1ab004c0c Merge remote-tracking branch 'inventree/master' 2019-08-09 20:37:46 +10:00
Oliver Walters
df470ca26d Tests for serial number extraction 2019-08-09 20:30:31 +10:00
Oliver Walters
a36d99b3e7 PEP fixes 2019-08-09 20:14:47 +10:00
Oliver Walters
bd61c89094 Tests for stock app views 2019-08-09 20:13:23 +10:00
Oliver Walters
e849f62a6a PEP 2019-08-08 23:50:11 +10:00
Oliver Walters
b924265c9a Some tests for views in order app 2019-08-08 23:49:35 +10:00
Oliver Walters
45d5667ccc PEP fixes 2019-08-08 23:36:32 +10:00
Oliver Walters
b872a12131 Test for making part variant 2019-08-08 23:34:32 +10:00
Oliver Walters
3a87cd866c Tests for part creation 
- Need more tests for POST action
 2019-08-08 23:32:34 +10:00
Oliver Walters
51e4a4c006 Tests for BomItem forms 2019-08-08 23:22:26 +10:00
Oliver Walters
d6f1fe74d1 Tests for PartCategory forms 2019-08-08 23:16:03 +10:00
Oliver Walters
ab3e66d578 Test for BOM download 2019-08-08 23:10:07 +10:00
Oliver Walters
f299248063 Improve testing for part export 2019-08-08 23:06:22 +10:00
Oliver Walters
21d2c434ff Test for part export view 
- Needs some more work (parts need supplier parts!)
 2019-08-08 23:04:58 +10:00
Oliver Walters
afcd411358 (partial) tests for attachment forms 2019-08-08 23:00:01 +10:00
Oliver Walters
3a9494ee69 Test for Part Editing form 2019-08-08 22:50:17 +10:00
Oliver Walters
7db97f2226 Test Part QR Code view 2019-08-08 22:45:10 +10:00
Oliver Walters
a70484caff Test PartDetail view 2019-08-08 22:45:02 +10:00
Oliver Walters
f26243af97 Tests for Part index / 2019-08-08 22:19:17 +10:00
Oliver Walters
348f2e1df8 Merge remote-tracking branch 'inventree/master' 2019-08-07 10:29:32 +10:00
Oliver Walters
adbc4db3d5 Remove 'set part category' button (doesn't do anything) 2019-08-07 10:11:00 +10:00
Oliver Walters
4fc2a22ba6 PEP fix 2019-08-07 10:07:30 +10:00
Oliver Walters
8904733ac0 Include part stock information 2019-08-07 10:05:12 +10:00
Oliver Walters
ab0da6aaae Include more part data in export 2019-08-07 09:55:18 +10:00
Oliver Walters
dda4569f76 Export selected parts 
- Select which parts to export in the table
- Export base information
- Include supplier part information
 2019-08-07 09:52:49 +10:00
Oliver Walters
3098c8c155 Merge branch 'bom-output' 2019-08-07 09:27:31 +10:00
Oliver Walters
3dca7ba353 Include supplier information in BOM 2019-08-07 09:12:53 +10:00
Oliver Walters
84ea95181d Merge remote-tracking branch 'inventree/master' 2019-08-02 22:37:26 +10:00
Oliver
ecff9b7209
Merge pull request #433 from SchrodingersGat/order-api 
Add API endpoint for purchase orders
 2019-08-02 22:37:02 +10:00
Oliver
73eada17bc
Merge pull request #432 from SchrodingersGat/tweaks 
Tweaks
 2019-08-02 21:55:02 +10:00
Oliver Walters
b5f2c9d311 Add API endpoint for purchase orders 
- List and create purchase orders
- List and create purchase order line items
 2019-08-02 21:46:26 +10:00
Oliver Walters
e66fd956f9 Fix available stock display 2019-08-02 15:13:47 +10:00
Oliver Walters
0a328687a5 BOM hash includes reference fields 2019-08-02 11:11:28 +10:00
Oliver Walters
5ee07eae7c Update installation routine and docs 
- Single call of "make install" does everything
- Add backup_dir option to yaml config file
 2019-08-01 20:07:06 +10:00
Oliver Walters
c8bf20ad41 Add part hover image 2019-07-25 11:08:22 +10:00
Oliver Walters
fe7392f152 Prevent stock adjustments for serialized stock items 2019-07-25 11:05:09 +10:00
Oliver Walters
94c0102742 Improve validation logic for StockItem 
- Allow tracked items to exist without a serial number (e.g. non-serialized tracked items)
 2019-07-25 11:04:45 +10:00
Oliver Walters
42e1370e92 Bug fix 2019-07-25 10:36:59 +10:00
Oliver Walters
3058b895dd Prevent auto-delete of stock items which have a serial number 2019-07-24 20:24:12 +10:00
Oliver Walters
33fe4d186d Include more fields when splitting stock 2019-07-24 19:48:37 +10:00
Oliver Walters
163f076565 Merge remote-tracking branch 'inventree/master' 2019-07-23 12:07:13 +10:00
Oliver Walters
077ad9482e Fix display of part trackable status info 2019-07-23 11:57:33 +10:00
Oliver Walters
a42371598c Fix part deletion template 
- Display list of stock items which will be thusly deleted
 2019-07-23 11:55:51 +10:00
Oliver Walters
b546b5e0cc Create separate entries for each unique serial number 2019-07-23 11:45:03 +10:00
Oliver Walters
d82d8f5cd1 Re-implement item saving for non-tracked parts 2019-07-23 11:31:29 +10:00