diff --git a/theo/web/menus.py b/theo/web/menus.py index b60d1ce..47c07b1 100644 --- a/theo/web/menus.py +++ b/theo/web/menus.py @@ -119,11 +119,6 @@ def simple_menus(request): 'url': url('brands'), 'perm': 'brands.list', }, - { - 'title': "Vendors", - 'url': url('vendors'), - 'perm': 'vendors.list', - }, { 'title': "Taxes", 'url': url('taxes'), @@ -137,6 +132,40 @@ def simple_menus(request): ], } + vendors_menu = { + 'title': "Vendors", + 'type': 'menu', + 'items': [ + { + 'title': "Vendors", + 'url': url('vendors'), + 'perm': 'vendors.list', + }, + {'type': 'sep'}, + { + 'title': "Ordering", + 'url': url('ordering'), + 'perm': 'ordering.list', + }, + { + 'title': "Receiving", + 'url': url('receiving'), + 'perm': 'receiving.list', + }, + {'type': 'sep'}, + { + 'title': "Purchases", + 'url': url('purchases'), + 'perm': 'purchases.list', + }, + { + 'title': "Credits", + 'url': url('purchases.credits'), + 'perm': 'purchases.credits.list', + }, + ], + } + if include_catapult: from tailbone_onager.menus import make_catapult_menu catapult_menu = make_catapult_menu(request) @@ -217,6 +246,7 @@ def simple_menus(request): orders_menu, people_menu, products_menu, + vendors_menu, ] if include_catapult: diff --git a/theo/web/views/__init__.py b/theo/web/views/__init__.py index 253236e..3a3e987 100644 --- a/theo/web/views/__init__.py +++ b/theo/web/views/__init__.py @@ -39,7 +39,6 @@ def includeme(config): # main table views config.include('tailbone.views.customergroups') - config.include('tailbone.views.custorders') config.include('tailbone.views.datasync') config.include('tailbone.views.email') config.include('tailbone.views.messages') @@ -49,6 +48,13 @@ def includeme(config): config.include('tailbone.views.users') config.include('tailbone.views.uoms') + # customer orders + config.include('tailbone.views.custorders') + + # purchasing / receiving + config.include('tailbone.views.purchases') + config.include('tailbone.views.purchasing') + # do we integrate w/ Catapult? if integrate_catapult(rattail_config): config.include('tailbone_onager.views.stores') @@ -66,7 +72,7 @@ def includeme(config): # do we integrate w/ CORE-POS? elif integrate_corepos(rattail_config): - config.include('tailbone.views.stores') + config.include('tailbone_corepos.views.stores') config.include('tailbone_corepos.views.customers') config.include('tailbone_corepos.views.members') config.include('tailbone.views.employees')