inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-20 21:53:05 +00:00
Code Activity
2,034 Commits 9 Branches 164 Tags
40acf90efec7a3e4b44dea0446805f9916015342
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OliverandGitHub fb75617807 Update version.py 2019-09-24 08:08:42 +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
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
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
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
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
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
OliverandGitHub b46d1c2286 Merge pull request #534 from SchrodingersGat/ci-migrations 
Script to check for unstaged migrations
 2019-09-16 00:07:38 +10:00
Oliver Walters 5107cf5694 Restore model file 2019-09-16 00:03:19 +10:00
Oliver Walters 9af9158c10 Remove migration file 2019-09-15 23:56:12 +10:00
Oliver Walters 19522dfb92 Commit the migation file 2019-09-15 23:50:47 +10:00
Oliver Walters b9155bbde9 Fix model file so that CI can run 2019-09-15 23:45:55 +10:00
Oliver Walters 2986e995d1 Make migrations before running script 2019-09-15 23:43:39 +10:00
Oliver Walters e781202daa Add script 2019-09-15 23:42:36 +10:00
Oliver Walters 56dda5eff4 Script to check for unstaged migrations 2019-09-15 23:41:32 +10:00
OliverandGitHub 180df8f110 Merge pull request #533 from SchrodingersGat/key-value-settings 
Key value settings
 2019-09-15 23:28:37 +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
OliverandGitHub 8d4e2ce498 Update CONTRIBUTING.md 
Include notes about migration files
 2019-09-15 22:34:22 +10:00
OliverandGitHub ee6c922fad Merge pull request #530 from SchrodingersGat/export-consolidation 
Export consolidation
 2019-09-15 22:27:57 +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
OliverandGitHub 66e439a836 Merge pull request #526 from linucks/purchase-order-btn-fix 
Fixes problem with 'New Purchase Order' button from Suppliers page.
 2019-09-15 19:20:33 +10:00
OliverandGitHub fa789036e0 Merge pull request #525 from SchrodingersGat/url-validation 
Extra URL validation
 2019-09-14 00:14:45 +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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 03a42fa360 Merge pull request #523 from SchrodingersGat/template-badge 
Display template badge in part table
 2019-09-13 21:04:19 +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