inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-21 14:13:06 +00:00
Code Activity
2,244 Commits 10 Branches 164 Tags
b29e1ded6468fd3dbb1ee14b3940a7fa6e95ba54
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OliverandGitHub 39f9aa6141 Merge pull request #579 from SchrodingersGat/multi-stock-delete 
Multi stock delete
 2019-11-16 20:44:45 +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
OliverandGitHub d66c20ca94 Merge pull request #576 from SchrodingersGat/req-fix 
Lock specific version of coverage
 2019-11-05 20:56:26 +11:00
Oliver Walters ce6f54aeaa Lock specific version of coverage 2019-11-05 20:23:15 +11:00
OliverandGitHub b92b7dc825 Merge pull request #575 from SchrodingersGat/stock-table-notes-fix 
Properly display 'notes' field in grouped rows for stock table
 2019-11-05 11:13:17 +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
OliverandGitHub 54855da522 Merge pull request #565 from SchrodingersGat/supplier-part-delete 
Single form to delete single or multiple SupplierPart objects
 2019-09-30 13:48:10 +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
OliverandGitHub f49130862e Merge pull request #564 from SchrodingersGat/secondary-fix 
Bug fix - secondary modals not working correctly
 2019-09-27 21:07:32 +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
OliverandGitHub bed2cec5e7 Merge pull request #562 from SchrodingersGat/stock-top-detail 
Stock top detail
 2019-09-27 10:18:50 +10:00
Oliver Walters b870728125 Add translation hooks for part detail template 2019-09-27 10:12:46 +10:00
Oliver Walters 225ad0ffa6 Add note in contribution file regarding translations 2019-09-27 10:07:34 +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
OliverandGitHub b876d31d09 Merge pull request #561 from SchrodingersGat/translation 
Translation
 2019-09-26 11:03:05 +10:00
Oliver Walters 30de734dfa Remove test as it is not currently working 2019-09-26 10:55:23 +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 b56a1ade24 Make translation compilation a separate step 
- Must be run after a translation file is updated
 2019-09-26 10:21:14 +10:00
Oliver Walters fcb47fce09 Make gettext a prerequisite rather than polluting the make file with apt commands that require sudo 2019-09-26 10:16:45 +10:00
Oliver Walters eaf910d263 Try enforcing sudo 2019-09-26 10:12:10 +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 0ae2fd9246 Update migration script to re-compile translation strings 2019-09-26 09:58:50 +10:00
Oliver Walters 37e9bd8d9b Add install requirement for gettext (required package for creating translation files) 2019-09-26 09:57:09 +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
OliverandGitHub 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
OliverandGitHub d247ea7589 Merge pull request #557 from SchrodingersGat/save-user-data 
Save user data
 2019-09-24 08:04:24 +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
OliverandGitHub cc1e580538 Merge pull request #555 from SchrodingersGat/new-loc 
PO Features
 2019-09-23 19:52:44 +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
OliverandGitHub 2a31820abe Merge pull request #550 from SchrodingersGat/table-improvements 
Table improvements
 2019-09-22 22:28:37 +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
OliverandGitHub 45a321694b Merge pull request #549 from SchrodingersGat/edit-username 
Ability to edit username
 2019-09-19 14:40:20 +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
OliverandGitHub 600eac7f1d Merge pull request #542 from SchrodingersGat/fixes 
Fixes
 2019-09-17 20:31:53 +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
OliverandGitHub 7c328969c9 Merge pull request #539 from SchrodingersGat/ui-tweaks 
Ui tweaks
 2019-09-17 14:21:46 +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