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
568 Commits 6 Branches 99 Tags 484 MiB
ec98f7829e
Commit Graph

442 Commits

Author SHA1 Message Date
Oliver
4f63d12837 Consolidated 'Part' app views 
- Improved templating
- Part tree open/close status stored to session
 2018-05-04 18:55:55 +10:00
Oliver
389908c67a Moved sidenav into block 2018-05-04 17:51:55 +10:00
Oliver
a1eeeab64c Build table now bootstrap-table'd 2018-05-04 01:39:20 +10:00
Oliver
3511ce29ee Added StockLocation API 2018-05-04 01:33:21 +10:00
Oliver
395bf23d6c Cleanup / formatting 2018-05-04 01:33:13 +10:00
Oliver
347a324589 Fix 2018-05-04 01:04:12 +10:00
Oliver
9ad20e85e3 Improve CSS for modal forms 2018-05-04 00:56:29 +10:00
Oliver
52cc7360b3 More betterer buttons for stock locationdetail 2018-05-04 00:48:36 +10:00
Oliver
1c5972e326 Cleaned up action buttons for StockLocation 
- Merged edit/create/delete into a single drop-down button
 2018-05-04 00:32:06 +10:00
Oliver
99fb466a6c Placeholder for ajax form 'complete' callback 2018-05-04 00:02:52 +10:00
Oliver
17e6147c47 Click on company image to edit it 2018-05-03 23:57:00 +10:00
Oliver
e9be3e9e06 Install django-cleanup 
- Automatically removes orphaned ImageFIeld and FileField files
 2018-05-03 23:56:39 +10:00
Oliver
bc716e25f7 Fixed bugs in Inventree/views.py 
- Need to pass request.FILES to the form! (duh!) 
 - Prevent form data from being saved twice
 2018-05-03 23:40:27 +10:00
Oliver
68cf6919a7 Updated part views 
- Allocation table now uses bootstrap-table
- Added checkbox column to supplier table (no function yet)
 2018-05-03 23:39:08 +10:00
Oliver
de176ecac9 Updated modal form code 
- Modal form template now uses multipart-data (to allow file uploads)
- Cleaned modal_form.js code (split into separate functions)
 2018-05-03 23:38:32 +10:00
Oliver
9311164825 Using jquery-forms plugin 
- Allows AJAX file uploads
- Works!
- Provides upload progress (not yet tested)
 2018-05-03 23:37:19 +10:00
Oliver
f995f54390 More API / JSON stuff 
- SupplierPart JSON API
- Part supplier list
- Company part list
 2018-05-03 00:47:03 +10:00
Oliver
49287c0c61 Part 'used-in' view now uses API 
- Ajax calls to JSON API
- BootstrapTable
 2018-05-03 00:25:01 +10:00
Oliver
0f3150c705 Part stock table now uses API / BootstrapTable 2018-05-02 23:54:28 +10:00
Oliver
1d63147380 Reload BOM table without refreshing enitre page 2018-05-02 23:46:08 +10:00
Oliver
7d21c4ef1c BOM now uses DRF / ajax 2018-05-02 23:42:57 +10:00
Oliver
be0797c6e6 Bootstrap table to company list 2018-05-02 23:17:24 +10:00
Oliver
1899d8f3e9 Stock location part list now uses bootstrap table 
- Serializers within serializers!
 2018-05-02 23:08:45 +10:00
Oliver
211edb23bb Removed footable 
- Now using bootstrap-table
 2018-05-02 22:22:43 +10:00
Oliver
024fe04e0e Implemented bootstrap-table for parts list 2018-05-02 22:18:58 +10:00
Oliver
fb9142c3fd Add static bootstrap-table files 2018-05-02 22:08:10 +10:00
Oliver
45510b1adc Add category info to part serializer 2018-05-02 20:57:04 +10:00
8cfbf2657e Removed unused maths tag 2018-05-01 10:03:20 +10:00
Oliver
f337291db8 Stock tables now searchable 2018-05-01 09:04:52 +10:00
Oliver
7c3b1f9bb4 Function to test if enough parts for a build 2018-05-01 09:00:09 +10:00
Oliver
dad594dc7a Tweaked build detail page 2018-05-01 08:55:51 +10:00
Oliver
a2ff1d16f3 Introspection of build allocation 
Yay for dicts
 2018-04-30 22:45:11 +10:00
Oliver
b24ddac0b8 Part stuff 2018-04-30 22:30:15 +10:00
Oliver
4a2b6a5674 Formatting fixes 2018-04-30 21:56:46 +10:00
Oliver
b2bb1ea1fe Pressing enter on a modal form now does the right thing 2018-04-30 21:56:36 +10:00
Oliver
37b109b8fc First pass of automated tracking data 
- When stock item is moved
- When stocktake is performed
- Yes it is  bad - needs improvement!
 2018-04-30 21:36:50 +10:00
Oliver
f9138f4997 Item stocktake form 2018-04-30 21:03:25 +10:00
Oliver
feff4f0ddd Add 'Contact' model to Company app 2018-04-30 17:20:01 +10:00
Oliver
f988c9af87 Tweaks for part page(s) 2018-04-30 01:16:57 +10:00
Oliver
d68b51e007 Add ability to move a stock item 2018-04-30 01:00:18 +10:00
Oliver
bee760d184 Deleted extraneous form code 2018-04-30 00:59:36 +10:00
Oliver
39530831d8 CSS fixes for .notification-area and .alert 
Missed from previous commit
 2018-04-30 00:30:04 +10:00
Oliver
5c902397e3 CSS fixes for .notificaiton-area and .alert 2018-04-30 00:29:39 +10:00
Oliver
5185173639 Updates for build app 
- Added 'allocate' page (empty thus far)
- Added 'cancel' button and view
 2018-04-30 00:23:44 +10:00
Oliver
a9c20f5d95 Added modal form success messages 
- More to be done, just a start
- Create / edit / delete
 2018-04-30 00:23:02 +10:00
Oliver
a2c1eda5c0 Added a form that only contains csrf tags 
- e.g. blank form only required to validate POST data
 2018-04-30 00:21:13 +10:00
Oliver
2d35116c79 Updated AjaxView 
- Aded "AjaxMixin"
- Base mixin does NOT require a form (allowing more generic json views)
- Add in any other context data with get_data() function
 2018-04-30 00:20:33 +10:00
Oliver
a6fdda1c1a Improved modal forms 
- JSON POST response can include feedback messages
- Either displayed immediately or after page is reloaded
 2018-04-30 00:01:20 +10:00
Oliver
e62bf92bd6 Notifications work through page-reload / page-redirect 
- Uses session storage
 2018-04-29 23:47:16 +10:00
Oliver
b6665ec2a7 Added dismissable notifications 
- Bootstrap alert
- Can close manually
- Also set to disappear after configurable time
 2018-04-29 23:29:38 +10:00
Oliver
46dea22cd4 Simplified part stock display 2018-04-29 22:07:58 +10:00
Oliver
f74e176579 JSON api for stock items 2018-04-29 21:02:40 +10:00
Oliver
9cc0780367 Sidenav toggles 2018-04-29 20:30:34 +10:00
Oliver
3403af18c8 Trackable items must have serial number set 2018-04-29 17:06:22 +10:00
Oliver
feb45513f7 Prevent serial number for stock item with quantity > 1 2018-04-29 13:20:02 +10:00
Oliver
9ea3d7bf71 Build tab shows active builds 2018-04-29 13:11:31 +10:00
Oliver
aca0d236ee Javascript consolidation 2018-04-29 12:25:07 +10:00
Oliver
55310be393 Display part stock in build detail window 2018-04-28 23:32:03 +10:00
Oliver
8d0789c37c Implemented tree view 
Using library bootstrap-treeview
- part category tree
- stock location tree
- Currenly is functional but looks terrible
 2018-04-28 23:22:12 +10:00
Oliver
095492203f Simplified javascript templating 
- Load js modules in block js_load
- Write $(document).ready script in block js_ready
- Write any other js in block_js
 2018-04-28 12:45:12 +10:00
Oliver
7ebb723d15 Revert "Set initial value fields to disabled for some forms" 
This reverts commit c1271367bd.
 2018-04-28 12:19:50 +10:00
Oliver
c1271367bd Set initial value fields to disabled for some forms 
- Prevent user from changing certain fields
- Only when a form is launched from a particular view
 2018-04-28 12:14:18 +10:00
Oliver
2e7253ebc4 Tweak javascript for category detail pages 2018-04-28 11:43:26 +10:00
Oliver
bc597d7c21 Style fixes 2018-04-28 01:16:47 +10:00
Oliver
0dcdce82f8 Modals dialogs for 'Build' 2018-04-28 01:06:42 +10:00
Oliver
1df42b2397 Sanity checking for StockItem 
- If a SupplierPart is selected, it must point to the same Part type as the Part field!
 2018-04-28 00:06:39 +10:00
Oliver
f49474ace5 Prevent recursive BOMs 
- If A has B in its BOM, A cannot be added to the BOM of B
 2018-04-27 23:42:23 +10:00
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
28e6d50f08 Check for null StockItem location 2018-04-27 09:33:05 +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
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
James Newlands
cd903112cc Merge branch 'master' of https://github.com/inventree/InvenTree 
# Conflicts:
#	InvenTree/customer/templates/customer/order_index.html
 2018-04-18 00:39:15 +10:00
James Newlands
5bb08053e0 Added table of orders and details for each order showing table of lines 2018-04-18 00:38:06 +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
James Newlands
6535126069 Fixed weird line break in string 2018-04-17 23:32:50 +10:00
James Newlands
e8f9b31f44 Merge branch 'customer_orders' 2018-04-17 23:28:34 +10:00
James Newlands
65ed493283 Admin readability 2018-04-17 23:27:06 +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
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
James Newlands
6434bfc24a Split table of customer orders into separate template from customer orders index page 2018-04-17 23:12:35 +10:00
James Newlands
121315f15e Add link to table of orders to nav bar 2018-04-17 23:10:06 +10:00
James Newlands
f2dc7380c2 Merge in some migrations from master 2018-04-17 23:07:55 +10:00
James Newlands
45a14b4350 Merge branch 'master' into customer_orders 2018-04-17 23:06:41 +10:00
James Newlands
bc04ca3727 First rough pass at adding customer orders model and some views/templates/admin stuff for same 2018-04-17 23:05:22 +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