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
8,382 Commits 6 Branches 99 Tags 484 MiB
9ed842b8d7
Commit Graph

8382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
728896be6c Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 23:05:59 +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
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
James Newlands
960f697d02 Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 18:03:44 +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
James Newlands
0a2c48eda6 Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 00:03:09 +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