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
377 Commits 9 Branches 164 Tags
06f9c67b11e7969ce868e907f3b4a3ee27b3721f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver 06f9c67b11 Prevent part from adding itself as a BOM item 2018-04-27 23:23:44 +10:00
Oliver 1b5dbfbe26 Reload page when adding BOM item to part 2018-04-27 23:14:25 +10:00
Oliver 4d6e2aca2c Modal forms for stock app 2018-04-27 22:59:08 +10:00
Oliver b705f3c62a Merge remote-tracking branch 'origin/master' 2018-04-27 22:51:17 +10:00
Oliver 3de80fe059 Modalized 'new-supplier-part' from supplier page 2018-04-27 22:14:25 +10:00
Oliver 4794714a09 Modal form for company-delete 2018-04-27 22:07:11 +10:00
Oliver 36cf946a78 Modal for company create 
- Ajax modals now return the URL of the item they are operating on
- passing {follow: true} to the modal caller will go to that URL on success
- footable'd company list
 2018-04-27 21:58:22 +10:00
Oliver c4e305bde6 Loaded both modals into single include 2018-04-27 21:35:36 +10:00
Oliver e1e3cc71e6 More modal forms 
- supplier-part-edit
- supplier-part-delete
 2018-04-27 21:32:48 +10:00
Oliver bc3dca3aba Modal for edit and delete part category 2018-04-27 20:42:12 +10:00
Oliver 5162c1d11f Inline deletion for BOM items 2018-04-27 00:54:01 +10:00
Oliver 507e3de05b Generecised launchModalForm 
- Add 'options' e.g. redirect / data
 2018-04-27 00:16:54 +10:00
Oliver 784b0dec02 Added AjaxDeleteView 
- AjaxDeleteView handles ajaxified delete GET and POST events
- Added modal deletion window
- Added launchDeleteForm jQuery function
 2018-04-27 00:06:44 +10:00
Oliver 9fd275ed3e Part Edit view now ajaxified 2018-04-26 23:28:27 +10:00
Oliver c0902626f4 footable working with BOM items 
- Event delegation to capture 'edit' button
 2018-04-26 23:05:35 +10:00
Oliver 8aa6dbdb04 Improved display of checkbox in forms 
Still not quite right, but a lot better
 2018-04-26 22:43:25 +10:00
Oliver b4ff8f79f0 Fixed position header + footer for modals 
- Fun with CSS!
- Header title provided by AJAX data
- Footer static
- Submit button text can be customized via JSON dat
 2018-04-26 22:38:48 +10:00
Oliver 8c9442193b Enable escape-key dismiss for modal 2018-04-26 18:27:28 +10:00
Oliver 280f2c36cb Modal form for part creation 2018-04-26 18:22:41 +10:00
Oliver d02b6f3583 Added scroll-bar to long modals 
Required to fix a bug in select2 where select boxes are drawn incorrecly in a long scrolling modal. 
Enforcing a scrollbar for overflow prevents this (magic)?

Ref: https://github.com/select2/select2/issues/3897
 2018-04-26 18:22:14 +10:00
Oliver 59ea4a3a24 Auto-scroll modal to top when opened 2018-04-26 18:19:41 +10:00
Oliver 5f19b37c6e Added 'select2' to modal foms 
- Drop down lists are now text filterable
- Yay for libraries
 2018-04-26 17:37:23 +10:00
Oliver 3c17777114 Merge branch 'modal-forms' 2018-04-26 09:26:52 +10:00
Oliver e395d89a7f Fix issues for AjaxUdpateView 
- Works properly now!
- Can edit BOM item inline
- Can add BOM item inline too
 2018-04-26 09:26:43 +10:00
Oliver 55e7f365df Added AjaxUpdateView class 
Also cleaned up the modal form javascript
 2018-04-26 08:18:53 +10:00
Oliver 99743c6bd0 Modal form now working on multiple pages 
- Part index
- Part category detail page(s)
 2018-04-25 15:34:12 +10:00
Oliver e3b2bd7129 Abstracted jquery code to load a modal form 
- static/scripts/modal_form.js
- bindModalForm function takes care of the mechanics
 2018-04-25 15:28:57 +10:00
Oliver ab05c6ce1e Updated AjaxCreateView 
- Return PK of newly-created object
- Populate fields with initial values as necessary
 2018-04-25 15:27:23 +10:00
Oliver d88da28871 Generic AjaxCreateView 
- Allows for same form to be posted
 2018-04-25 14:10:56 +10:00
Oliver 8bc4050d05 Modal form is working for 'create new category' 
- Had to set form.helper.form_tag to False (so we could control form tags manually)
- Created a 'json' model view
 2018-04-25 12:46:58 +10:00
Oliver 9004086632 Add button to launch modal form 2018-04-25 00:09:25 +10:00
Oliver db49e98f37 Load bootstrap.min.js 2018-04-24 23:41:01 +10:00
Oliver 50fcf5363c Download bootstrap and jquery to static dir 
- Allow to run offline
 2018-04-24 22:50:56 +10:00
Oliver 1df1bf2c07 Added 'URL' field to company 2018-04-24 18:01:15 +10:00
Oliver b114001678 Fixed display of part allocation count 2018-04-24 17:59:20 +10:00
Oliver f46c09e3a7 Added part category path string to serializer 2018-04-24 17:54:08 +10:00
Oliver 25fcd3e9f1 Simple search filtering for part list 
- Needs to be 'generecised'
- Working well for now
 2018-04-24 09:06:30 +10:00
Oliver 08ed128bea PEP style fixes 2018-04-23 21:18:35 +10:00
Oliver 86a9b36c99 Add part-list API 
- Deleted some old serializers
- Simply list of parts
- Search by name / description
- Orderable by name
 2018-04-23 21:10:13 +10:00
Oliver f1a5b3c1ca Add AJAX filtering of company list 
- Search across NAME and DESCRIPTION fields
- TODO - Implement pagination (how?)
 2018-04-23 20:37:36 +10:00
Oliver 6c1784b5b9 Implement (basic) JSON API for company model 
- Pagination
- Search company name and description
- Filter by is_customer and is_supplier
 2018-04-23 19:46:40 +10:00
Oliver 97f05f85de Added TODO entry 2018-04-22 23:16:12 +10:00
Oliver ac3de4ce3d Add part detail page for company / supplier 2018-04-22 23:07:23 +10:00
Oliver 4ebd8cd6b1 Added company details tab 2018-04-22 22:44:49 +10:00
Oliver d44a4e174b Added 'tabs' to company view 2018-04-22 22:38:35 +10:00
Oliver ee2f262e19 Company index / detail / edit pages working 2018-04-22 22:21:50 +10:00
Oliver 4bedf0ed4c Finally got migrations working together 2018-04-22 21:54:12 +10:00
Oliver cef3c664f9 Moving 'supplier' to 'company' 2018-04-19 09:01:25 +10:00
Oliver 3bb434ae98 Migration fix 2018-04-19 09:01:20 +10:00
Oliver 433f670e1c Removed 'customer' app 2018-04-19 09:01:17 +10:00
Oliver f1357cfb7c Adde 'system' Field to StockItemTracking 2018-04-18 08:44:08 +10:00
Oliver a4621295a6 Fixed spash page for customer index 
Added 'notes' field to Part object
 2018-04-18 01:44:55 +10:00
Oliver f66a751608 Add 'recevied' field to SupplierOrderLineItem 2018-04-18 01:23:08 +10:00
Oliver 1400128f9f SupplierOrderLineItem gets reference to internal part 
- For keeping track of how many of an internal part is on order!
 2018-04-18 01:21:18 +10:00
Oliver 12a97204b1 Merged migration files 2018-04-18 01:18:15 +10:00
Oliver 24f4c95060 Merge branch 'PO' 2018-04-18 01:17:07 +10:00
Oliver d8d3509b5e Changes 'notes' fields to be textfield - not charfield 2018-04-18 01:16:30 +10:00
Oliver d00f9f74e4 Added details page for SupplierOrder 2018-04-18 01:13:42 +10:00
Oliver f4aa09a354 Added 'status' and 'delivery_date' fields to SupplierOrder 2018-04-18 00:50:05 +10:00
Oliver 7045443d7b Add tab view for supplier page 
- "Parts" tab
- "Orders" tab
 2018-04-18 00:42:44 +10:00
Oliver 5769befb04 Add model for supplier order (PO) 
- Added create page
- Added detail page
 2018-04-18 00:22:25 +10:00
Oliver 192f823b1a PEP fixes (not all yet) 2018-04-18 00:03:42 +10:00
Oliver 3f33a921ae Renamed URLs for /customer/ 2018-04-17 23:56:25 +10:00
Oliver 8b1dbd4500 Merge remote-tracking branch 'origin/master' 2018-04-17 23:42:30 +10:00
Oliver 34d240c6e8 Moved top-level templates to a top-level dir 
It just seems fitting is all
 2018-04-17 23:42:25 +10:00
Oliver 8856d7f793 Renamed 'customer-order' app to 'customer' 
- This app should manage more than just orders
- Moved the 'Customer' model into this app
 2018-04-17 23:39:53 +10:00
Oliver 53d7fd2c46 Removed Customer model from supplier app 2018-04-17 23:25:14 +10:00
Oliver 05cb2fe167 Moved "Customer" to CustomerOrders models 2018-04-17 23:24:19 +10:00
Oliver b547f6b309 CustomerOrderLine quantity must be positive 2018-04-17 23:20:54 +10:00
Oliver 81afd3a47d Merge remote-tracking branch 'origin/customer_orders' 2018-04-17 23:18:08 +10:00
Oliver 503c3ec464 Merge remote-tracking branch 'origin/master' 2018-04-17 23:15:05 +10:00
Oliver 291992ab7f Added views and pages for Build model 
- Edit / create
- View details
- View build index at /build/
 2018-04-17 23:13:41 +10:00
Oliver 11b9fb10d8 Parts now know how many builds they are allocated to 
- allocated_builds returns lists of active builds this part is allocated to
- allocated_build_count returns the total number of this part allocated to builds
- allocation_count returns total number of allocated parts (in the future this will also include those parts allocated to customer orders)
 2018-04-17 22:26:57 +10:00
Oliver 0b40197cd2 Update 'Build' 
- Part model now has active_builds and inactive_builds properties
-
 2018-04-17 20:25:43 +10:00
Oliver 256f8eb924 Add 'batch' field to BuildOutput object 
This 'batch' output will be copied to any parts produced as part of this build
 2018-04-17 19:10:38 +10:00
Oliver 982803a0a7 Updated Part model 
- Added 'default_location'
- Added 'default_supplier'
 2018-04-17 18:23:39 +10:00
Oliver 45c5edee4d Added 'salable' field to Part model 2018-04-17 18:11:34 +10:00
Oliver 9dc41ba122 Fix requirements 
>= rather than ==
 2018-04-17 16:58:37 +10:00
Oliver fa23767150 Added skeleton for 'build' app 2018-04-17 00:32:02 +10:00
Oliver 86b3092b5e Change action on deleting top-level stock location 2018-04-16 23:29:11 +10:00
Oliver 937470750b Added helper functions, improved UI 2018-04-16 23:26:02 +10:00
Oliver a67d5b58db UI improvements 2018-04-16 23:09:45 +10:00
Oliver b6b4189c49 UI tweaks 2018-04-16 22:23:29 +10:00
Oliver 118d045e50 Improved part logic 
- Added field 'buildable' - can this part be made from other parts?
- Added @propery 'supplier_count'
- Improved part detail page with new features
 2018-04-16 22:13:31 +10:00
Oliver e43439ef5b Function to calculate how many parts can be made with current stock 2018-04-16 21:49:38 +10:00
Oliver 202a8e65b9 Added URL field to stock item 2018-04-16 21:07:57 +10:00
OliverandGitHub 835144c87f Merge pull request #53 from inventree/stock-track 
Stock track
 2018-04-16 20:46:52 +10:00
Oliver 9191d1ae21 PEP fixes 2018-04-16 20:46:21 +10:00
Oliver 09b357976d Admin for part tracking 
- Added 'has_tracking_info' function for StockItem
 2018-04-16 20:17:58 +10:00
Oliver 76ee150ca4 Moved tracking information to StockItem 2018-04-16 20:08:04 +10:00
Oliver f7eff8ae98 Added URL field to UniquePart 
- e.g. link to external part tracking info page
 2018-04-16 01:25:13 +10:00
Oliver eb5413b4fa Added requirement for pillow module 2018-04-16 01:17:14 +10:00
Oliver a80cf0aace Added some missing data on supplier pages 2018-04-16 01:14:19 +10:00
Oliver a91ff58d84 Flakey 
Fixing python style errors
 2018-04-16 01:02:17 +10:00
Oliver 1027e812bc Use django_import_export 
- Allows import / export to multiple file formats
- Provides admin interface
- Work to be done to perform data tweaking
- It would be really cool if the data fields could be associated 'intelligently'
 (i.e. not just based on PK, but name-lookup too).
 2018-04-16 00:44:32 +10:00
Oliver 8e6de1b832 Add pages for part tracking 
- Edit / Delete / Create tracking info
- Improvements to many pages
 2018-04-16 00:30:57 +10:00
Oliver 55b533d3ef Added edit views for stock 
- StockItem
- StockLocation
 2018-04-15 23:27:56 +10:00
Oliver 3c844fc77f Redirect some links 2018-04-15 21:47:20 +10:00
Oliver 5861296974 Add view for BomItem model 
- Create BOM item (auto-add to a parent part)
- Edit / delete
- View details
 2018-04-15 21:29:24 +10:00
Oliver 0632609a80 Remove weird line in Inventree/urls.py 2018-04-15 20:14:53 +10:00