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
8,481 Commits 6 Branches 99 Tags 484 MiB
710e0e2c3b
Commit Graph

435 Commits

Author SHA1 Message Date
Oliver Walters
8b7789cdb3 Set the specified location of a build output 2020-11-05 15:46:42 +11:00
Oliver Walters
2e1a5a85a3 Bug fix for unit testing 2020-11-03 22:14:02 +11:00
Oliver Walters
5988e847ce Add serial number suggestions 2020-11-03 21:01:14 +11:00
Oliver Walters
8d0845d92b Mark a build as "production" whenever a build output is created 2020-11-03 20:43:49 +11:00
Oliver Walters
ac03dab8de Tweaks 2020-11-03 20:37:33 +11:00
Oliver Walters
2b91f69c7d Fix unit tests 2020-11-03 20:19:24 +11:00
Oliver Walters
b936f67d87 Various form fixes 
- Updating forms, a lot has changed!
 2020-11-03 16:21:40 +11:00
Oliver Walters
152801f06f Dramatic speed improvements for build completion 
- Might still need to be a background task at some point..
 2020-11-03 15:56:20 +11:00
Oliver Walters
3f03adba72 Bug fix for stock table 
- Grouped rows were not displaying the part name
 2020-11-03 15:05:13 +11:00
Oliver Walters
05613b9642 Further build tweaks / improvements 2020-11-02 23:47:36 +11:00
Oliver Walters
500da8099b Add forms / views for creating a new build output, and completing the build 
- Also some refactoring of how forms are handled and saved
 2020-11-02 22:56:26 +11:00
Oliver Walters
b02c87ea50 Lots of work towards multiple build output 2020-11-02 01:24:31 +11:00
Oliver Walters
3a702266e6 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/InvenTree/views.py
#	InvenTree/build/views.py
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/order/views.py
#	InvenTree/part/api.py
#	InvenTree/part/views.py
#	InvenTree/templates/js/bom.js
 2020-10-30 22:44:25 +11:00
Oliver Walters
e049ca1a85 More refactoring 2020-10-30 16:54:05 +11:00
Oliver Walters
c533f59405 Refactor how form errors are handled 
- Use form.add_error (as the django gods intended)
 2020-10-30 16:04:56 +11:00
Oliver Walters
05ce17f8df Tweaks 2020-10-29 09:45:42 +11:00
Oliver Walters
a263d2fdcd Fixes for "auto allocate" concept 2020-10-29 00:49:01 +11:00
Oliver Walters
544b63cac5 Merge remote-tracking branch 'inventree/master' into build-fixes 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-10-29 00:01:10 +11:00
Oliver Walters
4a7e9a2278 Update translations and PEP fixes 2020-10-28 23:59:18 +11:00
Oliver Walters
091a9d9803 Refactor how form errors are handled 
- When in doubt, refer to the django docs
- There was a *much* better way (thanks, form.add_error)!
- The anti-pattern was deleted, and lo, there was much rejoicing
- Some other refactoring too
 2020-10-28 23:33:33 +11:00
Oliver Walters
d8ada930c8 More template updates 
- Add icons to more action buttons
 2020-10-28 22:37:58 +11:00
Oliver Walters
3ec2396ec1 Updated allocation card view 2020-10-27 23:33:51 +11:00
Oliver Walters
22a5f921b8 Auto-generate build outputs when a build is created 2020-10-27 23:09:17 +11:00
Oliver Walters
54d5d2899e Update javascript callbacks 2020-10-27 21:47:24 +11:00
Oliver Walters
b38fde85f2 Added some more buttons, etc 2020-10-26 22:34:40 +11:00
Oliver Walters
5e0d1fe25a Allocate "non tracked" parts separately from tracked ones 2020-10-26 18:21:45 +11:00
Oliver Walters
7525bc2ead Attachment functionality for BuildOrder 2020-10-26 17:00:31 +11:00
Oliver Walters
664dd0000c Add database table for storing file attachments against a BuildOrder 2020-10-26 15:21:03 +11:00
Oliver Walters
ffe15763a7 Update validation "rules" for BuildItem 
- A BuildItem which points to a trackable part must also point to a build output
- A BuildItem which points to a non-trackable part cannot point to a build output
 2020-10-26 08:34:17 +11:00
Oliver Walters
a3265ef9fd Unallocate stock against a particular line item 2020-10-24 13:15:13 +11:00
Oliver Walters
b45a11aa3d Refactor: Add "makeIconBadge" javascript function 2020-10-24 00:33:30 +11:00
Oliver Walters
ea7b1b65d6 Delete a build output entirely 
TODO: Needs to describe in the confirmation dialog what is going to happen!
 2020-10-24 00:14:27 +11:00
Oliver Walters
a71a51b848 Build can be "unallocated" against a single build output 2020-10-23 23:52:59 +11:00
Oliver Walters
fb7d9a7edf Move "getAvailableStockItems" to the build model 2020-10-23 23:33:27 +11:00
Oliver Walters
0752df26dc Bug fixes for BuildItemCreate view: 
- Add option to calculate required quantity against a particular build output, not just the build
 2020-10-23 23:09:22 +11:00
Oliver Walters
076d5c4f7f Cleanup get_required_parts function 2020-10-23 22:49:46 +11:00
Oliver Walters
33c454ed5a Add action buttons to each build output 2020-10-23 00:51:01 +11:00
Oliver Walters
6245d65ebc Tweaks 2020-10-23 00:08:40 +11:00
Oliver Walters
d37cdd8e50 Improved filtering for stockitems going into a buildallocation 2020-10-22 23:49:23 +11:00
Oliver Walters
fae516b38e Add build output selection to builditem creation form 2020-10-22 23:28:15 +11:00
Oliver Walters
1ca08f8bff Filter builditem API by 'output' stock item 2020-10-22 21:43:53 +11:00
Oliver Walters
96277edcf1 Improvements to progress bar function 2020-10-21 00:49:17 +11:00
Oliver Walters
8ae16a125e Build - Add functions to access build outputs 2020-10-21 00:24:55 +11:00
Oliver Walters
e02536071d Add a "completed" field to the Build model 
- Keeps track of how many outputs have been produced
- Will not be directly editable by the user
 2020-10-20 23:59:37 +11:00
Oliver Walters
3bb247a135 Create an initial stockitem output when a new build is created 2020-10-20 23:27:43 +11:00
Oliver Walters
2e4613e702 Updates to build forms / etc 2020-10-20 22:37:21 +11:00
Oliver Walters
2df0f03a9a Change "ALLOCATED" to "PRODUCTION" 2020-10-20 21:10:36 +11:00
Oliver Walters
ac79e131bc Add "destination" field to BuildOrder 2020-10-20 21:01:51 +11:00
Oliver Walters
28460b3023 Validate that the BuildItem quantity is an integer 2020-10-20 20:42:29 +11:00
Oliver Walters
fdcef7b699 Add "install_into" field for BuildItem 
- Points to which output stock item it will be going into
 2020-10-20 20:37:57 +11:00
Oliver Walters
406d7bcf80 Load build order prefix setting 2020-10-20 08:41:08 +11:00
Oliver Walters
98d20bceeb Change "Build Title" to "Description" 2020-10-20 00:26:26 +11:00
Oliver Walters
a5639c380f Add regex validator to build order reference field 2020-10-20 00:13:43 +11:00
Oliver Walters
c13cee2407 Fixes for unit testing 2020-10-19 23:31:52 +11:00
Oliver Walters
9b7a9a3ee0 Update formatting of order pages 2020-10-19 23:23:16 +11:00
Oliver Walters
b5d15aab08 Add function to "predict" next build order reference value 2020-10-19 23:22:09 +11:00
Oliver Walters
5405ad566e Add 'reference' to API serializer 2020-10-19 22:53:40 +11:00
Oliver Walters
0b7cf9e7f3 Add "reference" to build order forms 2020-10-19 22:49:28 +11:00
Oliver Walters
a8d47c54f9 Upate admin interface 2020-10-19 22:40:19 +11:00
Oliver Walters
934078a42c Add "Reference" field to Build model 2020-10-19 22:36:14 +11:00
Oliver Walters
b80e4302ba Update permissions for build app 2020-10-06 20:29:16 +11:00
Oliver Walters
ab454e5ba4 More template changes: perms -> roles 2020-10-06 16:46:13 +11:00
Oliver Walters
16d720b62c Update permission requirements for API 
- Automatically use model permissions by default!
-
 2020-10-06 00:36:55 +11:00
Oliver Walters
27656633df Update admin links to require specific permissions 2020-09-30 23:57:23 +10:00
Oliver Walters
d1cce7df94 Add direct admin links if the user is staff 2020-09-30 00:02:10 +10:00
Oliver Walters
0e5f10c020 Add some more search terms to the admin interface 2020-09-29 23:41:50 +10:00
Oliver Walters
f253bf1843 Add ability for stock API to be filtered by installed status 2020-09-28 20:07:25 +10:00
Oliver Walters
5d6e20d897 Build display improvements 
- Reload AJAX table instead of entire page
- Clean up auto-allocate page
- Add extra message
 2020-09-21 08:05:31 +10:00
Oliver
7dbb6c7c8e
Merge pull request #988 from SchrodingersGat/sell-price 
Sell price
 2020-09-19 23:52:25 +10:00
Oliver Walters
b8509f7533 Add ability to filter builds by "active" status 2020-09-19 20:42:20 +10:00
eeintech
6540fb968e Merge branch 'master' of git://github.com/inventree/InvenTree into new_homepage_layout 2020-09-18 11:52:26 -05:00
eeintech
3d597cc3c3 Added 'Pending' builds report to homepage, includes builds with 'Allocated' status 2020-09-17 14:36:05 -05:00
Oliver Walters
95c5c4b575 Fix issues with circular imports 2020-09-17 22:44:17 +10:00
alex
d10ba5edc3 handle case where stock item does not have a location set; also show header 2020-09-17 00:55:54 -07:00
alex
6ed604bbb8 fix erroring html 2020-09-17 00:49:17 -07:00
Oliver Walters
bb9e8fa97b Merge remote-tracking branch 'inventree/master' into multi-db-unit-test 
# Conflicts:
#	InvenTree/build/test_build.py
 2020-09-02 20:02:22 +10:00
Oliver Walters
911727f7b7 Update test fixtures 
- Can't assume that pk values will be assigned sensibly!
- Need to hard-code them in
 2020-09-02 19:47:07 +10:00
Oliver Walters
74f25ee7f9 Part: Extend logic for "latest" serial number 
- Return value if it is a string
- Remove 'getNextSerialNumber' function
- Improve functionality of function which returns serial number placeholder string
 2020-09-01 20:16:46 +10:00
Ben Charlton
c31b30bf83 Fix simple tests 2020-08-21 18:53:51 +01:00
Oliver Walters
861a2982db Removed "SHIPPED" stock status code 2020-08-08 09:16:53 +10:00
Oliver Walters
459cc03aae Remove "ASSIGNED_TO_BUILD" status code 2020-08-08 09:08:15 +10:00
Oliver Walters
126e42a022 Add "IPN" column to stock list table 2020-06-06 08:47:06 +10:00
Oliver Walters
82fe497787 Add buttons to edit / delete a Test result 
- Don't do nuthin yet!
 2020-05-17 00:04:45 +10:00
Oliver Walters
8a99062704 PEP fixes 2020-05-16 17:52:25 +10:00
Oliver Walters
a6ad263ee7 Fix clean functions so unit tests pass 2020-05-16 17:43:32 +10:00
Oliver Walters
40735d66a1 Translation tweaks 2020-05-16 17:32:20 +10:00
Oliver Walters
7190a8ef69 Serial number placeholder text for BuildComplete form 2020-05-16 17:29:41 +10:00
Oliver Walters
3d0bea15ae Refactor function naming 2020-05-16 12:03:18 +10:00
Oliver Walters
ee906fc6e6 Unit test fixes 2020-04-28 10:46:02 +10:00
Oliver Walters
9add3d4409 Much better rendering and calculation of part allocations 2020-04-28 10:43:46 +10:00
Oliver Walters
fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters
6bdf371490 Moar UI and translation string fixes 2020-04-28 09:41:47 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters
5727e27ae6 Filter by 'in stock' items when auto-allocating to build 2020-04-28 08:44:10 +10:00
Oliver Walters
db9970e5df Add some further unit tests for the Build model 2020-04-27 21:44:59 +10:00
Oliver Walters
cb3fe0fc35 Add some more unit testing for the builds 2020-04-27 21:28:44 +10:00
Oliver Walters
35f48ed899 Delete BuildItem objects once a Build has been completed 
- Much more complicated template for build allocation page!
- This will require some refactoring at some point ...
 2020-04-27 20:46:34 +10:00
Oliver Walters
2b99cf353a Fix for build complete form 2020-04-27 20:16:41 +10:00
Oliver Walters
646dd65d27 Re-enable auto-allocation for build 2020-04-27 20:05:02 +10:00
Oliver Walters
5e309a62f7 Display "Fulfilled" items 
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
 2020-04-27 10:31:38 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters
3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +10:00
Oliver Walters
e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
Oliver Walters
0892b160c6 "Fixes" for completing a build 
- This will require a lot of unit testing to get right
 2020-04-26 00:32:09 +10:00
Oliver Walters
72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters
50dbebdf59 Improve rendering of BuildComplete template 2020-04-25 23:44:03 +10:00
Oliver Walters
81f789d857 Add link to parent build 2020-04-25 23:26:56 +10:00
Oliver Walters
4f0efec39f PEP and unit testing fixes 2020-04-25 23:24:00 +10:00
Oliver Walters
77361bd0a2 Update templates 2020-04-25 23:20:55 +10:00
Oliver Walters
01a68270ea Add verbose names for multiple Build model fields 
- Improve methods for different models
 2020-04-25 23:17:07 +10:00
Oliver Walters
181d1d6b91 Factor out function to calculate total allocations 2020-04-25 21:31:58 +10:00
Oliver Walters
912a3c4b99 Update progress bar based on sum of allocated quantities 2020-04-25 21:21:52 +10:00
Oliver Walters
b0891c921c Working towards better build allocation: 
- Improve data serialization in API
- Javascript bug fixes
- Load the build allocation table using jQuery
 2020-04-25 21:13:38 +10:00
Oliver Walters
c11b433d94 Make Build object into a MPTT tree model 
- Builds can have child builds
 2020-04-25 15:25:17 +10:00
Oliver Walters
2f0bbecc3d Refactored status code label generation 
- Larger style available
 2020-04-25 15:13:55 +10:00
Oliver Walters
d5f3498238 Add a "sales_order" reference to the Build model 
- If a build order is made to fulfil a sales order
- Add sales_order filtering to the Build API
- Pass initial information through to the BuildCreate view
 2020-04-25 13:15:45 +10:00
Oliver Walters
77471cb89c Form for shipping a SalesOrder 
- Returns "False" for now
 2020-04-24 10:20:56 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates 
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
 2020-04-24 09:27:42 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00
Oliver Walters
426aa9258c URL cleanup 2020-04-23 17:37:53 +10:00
Oliver Walters
1373425c29 Update definition for StockItemAllocation model 
- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering
 2020-04-22 13:11:19 +10:00
Oliver Walters
12daf15406 Update build page 2020-04-22 09:53:11 +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
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
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
44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters
789712acbe Rename Build.URL -> Build.link 2020-04-06 11:28:35 +10:00
Oliver Walters
6fd0380196 Display item overage in the allocation list 2020-03-19 10:16:58 +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
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
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
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
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
0f92468462 Add icon to signify if notes exist 2020-02-02 11:48:43 +11:00
Oliver Walters
a7846940c4 Markdownify the notes field for Build model 2020-02-02 00:00:19 +11:00
Oliver Walters
a1f33c4084 Change build allocation quantity to decimal field 2019-11-19 10:22:46 +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
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
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
70e07470db Custom URL validators for more fields 2019-09-14 00:08:49 +10:00
Oliver Walters
c45c4e236e Point new stockitem to the correct build 2019-09-01 23:18:28 +10:00