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
2,807 Commits 6 Branches 99 Tags 484 MiB
05856a72cf
Commit Graph

2807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
7fff0a7427 Catch an error if git cannot be found 2020-05-01 17:02:11 +10:00
Oliver
68bbb372dc
Merge pull request #769 from SchrodingersGat/migration-ixes 
Bug fix for custom migration
 2020-05-01 16:23:53 +10:00
Oliver Walters
af00d88555 Bug fix for custom migration 
Ref: https://stackoverflow.com/questions/13410982/attributeerror-long-object-has-no-attribute-fetchall#13411358
 2020-05-01 15:57:10 +10:00
Oliver
86c00f54b7
Merge pull request #767 from SchrodingersGat/fix 
Fix for BOM table display
 2020-04-28 23:31:52 +10:00
Oliver Walters
a345e0e8da Removed unused serializer field 2020-04-28 23:26:27 +10:00
Oliver Walters
753fab2498 Fix url links in BOM table 2020-04-28 23:23:59 +10:00
Oliver Walters
3b42b5e27e Typo fix for part api 2020-04-28 23:17:59 +10:00
Oliver Walters
087001f29d Fix BOM table rendering 
- Price was not being sent in the PartBriefSerializer!
 2020-04-28 23:17:15 +10:00
Oliver Walters
df218a5193 Fix rendering of "used in" page 2020-04-28 22:57:18 +10:00
Oliver
24ad4f5332
Merge pull request #765 from SchrodingersGat/markdowner 
DO NOT DRINK BLEACH
 2020-04-28 12:34:21 +10:00
Oliver Walters
f84636fc20 DO NOT DRINK BLEACH 2020-04-28 12:29:28 +10:00
Oliver
2be8aad29c
Merge pull request #763 from SchrodingersGat/fixes 
Update buttons for part BOM view
 2020-04-28 10:51:11 +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
bbecc8c900 Reverse URL bug fix 2020-04-28 09:35:24 +10:00
Oliver Walters
b913971008 Add more translatable strings 2020-04-28 09:32:33 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters
abbd0bb16a Bug fix in supplier-part table rendering 2020-04-28 09:05:06 +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
4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +10:00
Oliver
c621780a2a
Merge pull request #748 from SchrodingersGat/sales-order 
Sales order [WIP]
 2020-04-27 22:14:45 +10:00
Oliver Walters
394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2020-04-27 22:04:05 +10:00
Oliver Walters
79836c77ef Bumped version thing 2020-04-27 22:03:15 +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
489dfa1823 Bug fix for a code path which resulted in a form failing validation but not showing any errors! 
This one has been here for a while!
 2020-04-27 20:45:01 +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
3685ca4b95 Add some unit testing for the SalesOrder model 2020-04-27 11:32:20 +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
9b882f4d17 Update to latest version of django-qr-code 2020-04-27 09:17:17 +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
48c51151c8
Merge pull request #756 from SchrodingersGat/moar-migration-fixes-plz 
Remove the problematic migration entirely
 2020-04-26 09:00:23 +10:00
Oliver Walters
ae4717401f Add "sudo" to makefile 2020-04-26 08:56:36 +10:00
Oliver Walters
1f4bd95d75 Remove the problematic migration entirely 
- The thumbnail check code is run every time the server is started anyway!
 2020-04-26 08:50:37 +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