inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 04:33:48 +00:00
Code Activity
102 Commits 9 Branches 164 Tags
2a8bbdf3c659d2bc72d44c65d43e52b862e25256
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 2a8bbdf3c6 Merge remote-tracking branch 'upstream/master' 2017-04-01 13:28:08 +11:00
OliverandGitHub aa7ba9ddf3 Update README.md 2017-04-01 13:19:37 +11:00
OliverandGitHub 0df5093440 Added docstring for pep checker 2017-04-01 13:17:17 +11:00
Oliver Walters 51b6e53d13 Merge remote-tracking branch 'upstream/master' 2017-03-30 19:10:48 +11:00
OliverandGitHub bb99e45676 Merge pull request #17 from SchrodingersGat/master 
betterment
 2017-03-30 08:53:43 +11:00
Oliver Walters 0151eb18da Improvements for unique part 2017-03-30 08:52:54 +11:00
Oliver Walters 1a8944519a Added extra fields to supplierpart 2017-03-30 08:48:52 +11:00
OliverandGitHub ef54870f7c Merge pull request #16 from SchrodingersGat/master 
Added gitattributes file
 2017-03-30 08:38:24 +11:00
OliverandGitHub 1d57e4c5bb Rename LICENSE2 to LICENSE 2017-03-29 23:53:52 +11:00
OliverandGitHub 79da239883 Rename LICENSE to LICENSE2 2017-03-29 23:51:12 +11:00
Oliver Walters 4046c6f0bf Added gitattributes file 2017-03-29 23:45:27 +11:00
OliverandGitHub 574e0d4f62 Merge pull request #15 from SchrodingersGat/master 
updates
 2017-03-29 23:39:04 +11:00
Oliver Walters 6e0a02a885 Added extra fields to stock item 2017-03-29 23:36:06 +11:00
Oliver Walters 9db1f99e26 updated supplier model 2017-03-29 23:32:21 +11:00
Oliver Walters d0489d692a PEP fixes 2017-03-29 23:21:54 +11:00
Oliver Walters 8ba4ea344e updates 2017-03-29 23:19:53 +11:00
Oliver Walters b2eca2aa48 Added ETA for part stock 2017-03-29 22:55:36 +11:00
Oliver Walters 2355adb044 Added lead-time for supplier part 2017-03-29 22:55:16 +11:00
Oliver Walters 591ae5dc5c Single price field for supplier part 2017-03-29 22:47:17 +11:00
Oliver Walters aafa8781d7 Added "ProjectRun" model 2017-03-29 22:44:59 +11:00
OliverandGitHub c779476650 Merge pull request #14 from SchrodingersGat/master 
Added function to get all parents for a tree item
 2017-03-29 20:23:51 +11:00
Oliver Walters 2b998a1931 Added function to get all parents for a tree item 2017-03-29 20:23:21 +11:00
OliverandGitHub fa82494667 Merge pull request #13 from SchrodingersGat/master 
Updates
 2017-03-29 19:39:17 +11:00
OliverandGitHub fd30d11eee Merge pull request #12 from SchrodingersGat/master 
Updated part parameter
 2017-03-29 15:46:19 +11:00
Oliver Walters 4fafe93d9c Updated part parameter 2017-03-29 15:45:50 +11:00
OliverandGitHub 38988927b6 Merge pull request #11 from SchrodingersGat/master 
Fixed PEP issues
 2017-03-29 15:12:43 +11:00
Oliver Walters 4dc0179484 Fixed PEP issues 2017-03-29 15:12:14 +11:00
OliverandGitHub 7effa93458 Merge pull request #10 from SchrodingersGat/master 
Added Part Templates
 2017-03-29 15:05:13 +11:00
Oliver Walters 11b790c3ec Added Part Templates 2017-03-29 15:02:59 +11:00
Oliver Walters 774bd75e49 Updated installer script 2017-03-29 14:34:41 +11:00
OliverandGitHub 9b0b5d9be1 Added installation directions 2017-03-29 11:58:34 +11:00
OliverandGitHub ba10803117 Merge pull request #9 from SchrodingersGat/master 
Added installer script
 2017-03-29 11:03:47 +11:00
Oliver Walters 0a37291861 Added installer script 2017-03-29 11:03:17 +11:00
Oliver Walters 68ae1110ad Updates 
- Improved some models
- Added PEP check script
 2017-03-29 08:37:41 +11:00
OliverandGitHub 74272d373a Merge pull request #8 from SchrodingersGat/master 
oops
 2017-03-29 00:30:15 +11:00
Oliver Walters 8b9002fa68 oops 2017-03-29 00:28:39 +11:00
OliverandGitHub 8b508b6aea Merge pull request #7 from SchrodingersGat/master 
Added 'manufacturer' model
 2017-03-29 00:24:30 +11:00
Oliver Walters ecab28de2c Added 'manufacturer' model 2017-03-29 00:23:51 +11:00
OliverandGitHub e28461dee8 Merge pull request #6 from SchrodingersGat/master 
travis update
 2017-03-29 00:17:07 +11:00
Oliver Walters 277b4360e3 pip intall restframework 2017-03-29 00:14:27 +11:00
Oliver Walters ff2f2d2326 Requires python 3.4 2017-03-29 00:11:08 +11:00
Oliver Walters b232649b63 Added 'check' command 2017-03-29 00:07:08 +11:00
Oliver Walters beddb94683 fixed path to manage.db 2017-03-29 00:01:58 +11:00
Oliver Walters f14ae18080 - moved database 
- added django db test
 2017-03-28 23:59:57 +11:00
Oliver Walters 8e77410074 no message 2017-03-28 23:55:31 +11:00
Oliver Walters 5947d17e28 travis update 2017-03-28 23:52:44 +11:00
OliverandGitHub f6b3dde1bb Merge pull request #5 from SchrodingersGat/master 
PEP test
 2017-03-28 23:47:50 +11:00
Oliver Walters 4912d5507b peppercord 2017-03-28 23:46:17 +11:00
Oliver Walters 1a875811b7 not a pep 2017-03-28 23:44:32 +11:00
OliverandGitHub 79b7c7d754 Update README.md 2017-03-28 23:42:40 +11:00
OliverandGitHub 187de59e3b Added build-status picture 2017-03-28 23:42:31 +11:00
Oliver Walters 433dc7b3e3 Pep goes the weasel 2017-03-28 23:41:05 +11:00
Oliver Walters 7ce5a9a7e5 Papa Pep 2017-03-28 23:38:12 +11:00
Oliver Walters b5dc22f33a peppa pig 2017-03-28 23:31:41 +11:00
Oliver Walters 14f60e1292 Pepsi 2017-03-28 23:29:00 +11:00
Oliver Walters c111aaf9b2 peps 2017-03-28 23:25:38 +11:00
Oliver Walters a5009147c3 pepe is a racist meme 2017-03-28 23:21:26 +11:00
Oliver Walters 9aebdab1c2 pepper 2017-03-28 23:17:56 +11:00
Oliver Walters 18c39e7680 added newline 2017-03-28 23:16:47 +11:00
Oliver Walters a793b344e8 PEP test 2017-03-28 23:14:36 +11:00
OliverandGitHub 2d9206478e Merge pull request #4 from SchrodingersGat/master 
Added more models
 2017-03-28 23:14:25 +11:00
Oliver Walters 9f34f9353e Ignore blank whitespace line 2017-03-28 23:12:36 +11:00
Oliver Walters 8781b572c0 bug fix for part serializer 2017-03-28 23:10:43 +11:00
Oliver Walters 09cb067627 PEP fixes 2017-03-28 23:09:51 +11:00
Oliver Walters f4ef9d938e fixed python version 2017-03-28 23:05:09 +11:00
Oliver Walters b108c71eef limited to one python version 2017-03-28 23:03:06 +11:00
Oliver Walters f3fbd8dc14 Renamed Company 2017-03-28 23:00:40 +11:00
Oliver Walters 7eb00e8d47 More model updates 2017-03-28 22:45:43 +11:00
Oliver Walters deda73a50f Added stock status field 2017-03-28 22:27:46 +11:00
OliverandGitHub 3400739eb4 Merge pull request #3 from SchrodingersGat/master 
Added REST framework
 2017-03-28 22:12:45 +11:00
Oliver Walters 7bcea2f3ac Added REST framework 
- /part/ URL is now a JSON api
 2017-03-28 22:12:02 +11:00
OliverandGitHub 457d72a3e4 Merge pull request #2 from SchrodingersGat/part-quantity 
Started work on cross-referencing
 2017-03-28 21:24:35 +11:00
Oliver Walters 5c8cc035a4 Started work on cross-referencing 
- part admin now shows total quantity in stock
- part model can return a list of projects it is associated with
 2017-03-28 21:24:00 +11:00
OliverandGitHub b288ac0a45 Merge pull request #1 from SchrodingersGat/master 
Improving model admin views
 2017-03-28 18:23:45 +11:00
Oliver Walters be030991a5 Added PartRevision model 
- Added 'trackable' field to Part
 2017-03-28 18:17:32 +11:00
Oliver Walters 6aa9f14b46 Fixed part display bug 2017-03-28 18:03:55 +11:00
Oliver Walters 155151e98b More admin updates 2017-03-28 17:59:28 +11:00
Oliver Walters a082eb2c81 Improved project admin 2017-03-28 17:53:54 +11:00
Oliver Walters 492c651324 Improved admin view for part 2017-03-28 17:49:01 +11:00
Oliver Walters 5420f83114 Added Project category 2017-03-27 23:33:13 +11:00
Oliver Walters 8229f02db6 BugFix and docs for InvenTreeTree 2017-03-27 23:08:03 +11:00
Oliver Walters f17e9de37b Added 'track' app 
- Keeping track of UniquePart objects
 2017-03-27 22:32:34 +11:00
Oliver Walters af679a1ac6 Added some docstrings 2017-03-27 22:21:19 +11:00
Oliver Walters abe0bbf2e4 Simple supplier template 2017-03-27 22:05:35 +11:00
Oliver Walters ffcd56d5ba Removed debug output 2017-03-27 21:55:34 +11:00
Oliver Walters 8e3672f3a1 Supplier app 
- Supplier
- SupplierPart
- SupplierPartBreak
 2017-03-27 21:54:21 +11:00
Oliver Walters 726e8dce48 Changed admin title 2017-03-27 21:14:35 +11:00
Oliver Walters e98c20048b Added stock page 2017-03-27 21:05:19 +11:00
Oliver Walters cc7593b44f Tree parent filtering 
- Prevents recursion
 2017-03-27 21:03:46 +11:00
Oliver Walters 514bd7a6bc Fixed recursion issues 
Added InvenTreeTree base class
 2017-03-27 09:05:54 +11:00
Oliver Walters b919418fb5 Added a categorylist page 
Displays list of all top-level part categories
 2017-03-26 10:45:38 +11:00
Oliver Walters 3f81046a26 Added links to child categories 2017-03-26 10:23:22 +11:00
Oliver Walters ef8cfa794f Added category link for part view 2017-03-26 10:14:38 +11:00
Oliver Walters ddd927c436 Added views for part and part category 
- Worked out simple linking
- Category path displaying correctly
- Category page lists parts in category
 2017-03-26 10:06:00 +11:00
Oliver Walters ffb9132de2 Added "Part" 
- Has IPN (internal part number)
- Linked to a PartCategory
 2017-03-25 23:19:49 +11:00
Oliver Walters bb4fc9820f Added PartCategory 
- Parent can be null (top-level category)
- Parent can be other PartCategory
 2017-03-25 23:07:43 +11:00
Oliver Walters 2863ea1b70 Initial app commit 2017-03-25 22:51:13 +11:00
OliverandGitHub 25fa7bf6ee Delete Untitled Diagram.xml 2017-03-24 11:43:16 +11:00
Oliver 2c6befb08c db_schema.xml 2017-03-24 11:40:55 +11:00
OliverandGitHub f077ac8533 Added link to documentation 2017-03-24 10:55:24 +11:00