Commit Graph
16 Commits
Author SHA1 Message Date
James Newlands 01da57f0cf If part has no category, page rendered an extra curly brace in JS that caused syntax error. 2018-05-05 21:22:47 +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
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
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
James Newlands 960f697d02 Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 18:03:44 +10:00
James Newlands 0a2c48eda6 Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-17 00:03:09 +10:00
James Newlands 24f3e8579c Merge branch 'master' of https://github.com/inventree/InvenTree 2018-04-15 20:24:55 +10:00
James Newlands eaf1076009 Ignore PyCharm project files 2018-04-15 20:24:18 +10:00