diff --git a/brewman/static/base.html b/brewman/static/index.html similarity index 98% rename from brewman/static/base.html rename to brewman/static/index.html index 259ec203..382b4e35 100644 --- a/brewman/static/base.html +++ b/brewman/static/index.html @@ -37,8 +37,6 @@ }); - - @@ -168,7 +166,7 @@
diff --git a/brewman/views/Management/settings.py b/brewman/views/Management/settings.py index 1c05e8cd..167bc296 100644 --- a/brewman/views/Management/settings.py +++ b/brewman/views/Management/settings.py @@ -11,7 +11,7 @@ from brewman.models.master import DbSetting @view_config(route_name='settings', permission='Authenticated') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/__init__.py b/brewman/views/__init__.py index 990010f2..f89ce388 100644 --- a/brewman/views/__init__.py +++ b/brewman/views/__init__.py @@ -16,7 +16,7 @@ from brewman.models.voucher import DbImage @view_config(route_name='home') @view_config(request_method='GET', route_name='login') def home(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/account.py b/brewman/views/account.py index f3aab6cf..7b4dab8d 100644 --- a/brewman/views/account.py +++ b/brewman/views/account.py @@ -17,7 +17,7 @@ from brewman.models.voucher import Voucher, Journal, VoucherType @view_config(request_method='GET', route_name='account_id', permission='Accounts') @view_config(request_method='GET', route_name='account', permission='Accounts') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/attendance.py b/brewman/views/attendance.py index ea6b6461..4596b151 100644 --- a/brewman/views/attendance.py +++ b/brewman/views/attendance.py @@ -19,7 +19,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='employee_attendance_id', permission='Attendance') @view_config(request_method='GET', route_name='employee_attendance', permission='Attendance') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/auth/client.py b/brewman/views/auth/client.py index 8781c1ec..dc890e95 100644 --- a/brewman/views/auth/client.py +++ b/brewman/views/auth/client.py @@ -12,7 +12,7 @@ from brewman.models.auth import Client, LoginHistory @view_config(request_method='GET', route_name='client_list', permission='Clients') @view_config(request_method='GET', route_name='client_id', permission='Clients') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/auth/group.py b/brewman/views/auth/group.py index e3ff48a8..b7bb61c7 100644 --- a/brewman/views/auth/group.py +++ b/brewman/views/auth/group.py @@ -11,7 +11,7 @@ from brewman.models.auth import Group, Role @view_config(request_method='GET', route_name='group_id', permission='Users') @view_config(request_method='GET', route_name='group', permission='Users') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/auth/user.py b/brewman/views/auth/user.py index 3ca52e27..64fff637 100644 --- a/brewman/views/auth/user.py +++ b/brewman/views/auth/user.py @@ -22,7 +22,7 @@ class UserView(object): @view_config(request_method='GET', route_name='user_id', permission='Authenticated') @view_config(request_method='GET', route_name='user', permission='Users') def html(self): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=self.request) diff --git a/brewman/views/cost_centre.py b/brewman/views/cost_centre.py index c710ec4e..ea860535 100644 --- a/brewman/views/cost_centre.py +++ b/brewman/views/cost_centre.py @@ -13,7 +13,7 @@ from brewman.models.validation_exception import ValidationError @view_config(request_method='GET', route_name='cost_centre_id', permission='Cost Centres') @view_config(request_method='GET', route_name='cost_centre', permission='Cost Centres') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/employee.py b/brewman/views/employee.py index 2e75484f..4ef93398 100644 --- a/brewman/views/employee.py +++ b/brewman/views/employee.py @@ -20,7 +20,7 @@ from brewman.views import to_uuid @view_config(request_method='GET', route_name='employee', permission='Employees') @view_config(request_method='GET', route_name='employee_functions', permission='Employees') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/product.py b/brewman/views/product.py index f81d77a5..4703aa77 100644 --- a/brewman/views/product.py +++ b/brewman/views/product.py @@ -17,7 +17,7 @@ from brewman.models.voucher import Voucher, Batch, Inventory, VoucherType @view_config(request_method='GET', route_name='product_id', permission='Products') @view_config(request_method='GET', route_name='product', permission='Products') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/product_group.py b/brewman/views/product_group.py index 925450de..9956bcf2 100644 --- a/brewman/views/product_group.py +++ b/brewman/views/product_group.py @@ -13,7 +13,7 @@ from brewman.models.validation_exception import ValidationError @view_config(request_method='GET', route_name='product_group_id', permission='Product Groups') @view_config(request_method='GET', route_name='product_group', permission='Product Groups') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/recipe.py b/brewman/views/recipe.py index 12e39d8b..91f5034c 100644 --- a/brewman/views/recipe.py +++ b/brewman/views/recipe.py @@ -20,7 +20,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='recipe_id', permission='Recipes') @view_config(request_method='GET', route_name='recipe', permission='Recipes') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/balance_sheet.py b/brewman/views/reports/balance_sheet.py index e059d32c..f70d3ce1 100644 --- a/brewman/views/reports/balance_sheet.py +++ b/brewman/views/reports/balance_sheet.py @@ -16,7 +16,7 @@ from brewman.views.services.session import session_period_finish @view_config(request_method='GET', route_name='balance_sheet', permission='Balance Sheet') @view_config(request_method='GET', route_name='balance_sheet_date', permission='Balance Sheet') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/cash_flow.py b/brewman/views/reports/cash_flow.py index c0034488..1330b6e8 100644 --- a/brewman/views/reports/cash_flow.py +++ b/brewman/views/reports/cash_flow.py @@ -14,7 +14,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='cash_flow', permission='Cash Flow') @view_config(request_method='GET', route_name='cash_flow_id', permission='Cash Flow') def get_html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/closing_stock.py b/brewman/views/reports/closing_stock.py index b264f8e5..07e43e42 100644 --- a/brewman/views/reports/closing_stock.py +++ b/brewman/views/reports/closing_stock.py @@ -14,7 +14,7 @@ from brewman.views.services.session import session_period_finish @view_config(request_method='GET', route_name='closing_stock', permission='Closing Stock') @view_config(request_method='GET', route_name='closing_stock_date', permission='Closing Stock') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/daybook.py b/brewman/views/reports/daybook.py index 33417457..883bf26b 100644 --- a/brewman/views/reports/daybook.py +++ b/brewman/views/reports/daybook.py @@ -12,7 +12,7 @@ from brewman.views.services.voucher import get_edit_url @view_config(request_method='GET', route_name='daybook', permission='Daybook') def daybook_get(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/ledger.py b/brewman/views/reports/ledger.py index 12d7d1c6..7364294f 100644 --- a/brewman/views/reports/ledger.py +++ b/brewman/views/reports/ledger.py @@ -16,7 +16,7 @@ from brewman.views.services.voucher import get_edit_url @view_config(request_method='GET', route_name='ledger_id', permission='Ledger') @view_config(request_method='GET', route_name='ledger', permission='Ledger') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/net_transactions.py b/brewman/views/reports/net_transactions.py index 6c5ac8d9..4060eb34 100644 --- a/brewman/views/reports/net_transactions.py +++ b/brewman/views/reports/net_transactions.py @@ -13,7 +13,7 @@ from brewman.views.services.session import session_period_finish, session_period @view_config(request_method='GET', route_name='net_transactions', permission='Net Transactions') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/product_ledger.py b/brewman/views/reports/product_ledger.py index 68177b74..bc049cb1 100644 --- a/brewman/views/reports/product_ledger.py +++ b/brewman/views/reports/product_ledger.py @@ -18,7 +18,7 @@ from brewman.views.services.voucher import get_edit_url @view_config(request_method='GET', route_name='product_ledger_id', permission='Product Ledger') @view_config(request_method='GET', route_name='product_ledger', permission='Product Ledger') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/profit_loss.py b/brewman/views/reports/profit_loss.py index 22b1fded..6421b924 100644 --- a/brewman/views/reports/profit_loss.py +++ b/brewman/views/reports/profit_loss.py @@ -14,7 +14,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='profit_loss', permission='Profit & Loss') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/purchase_entries.py b/brewman/views/reports/purchase_entries.py index 5ac35255..a6220b78 100644 --- a/brewman/views/reports/purchase_entries.py +++ b/brewman/views/reports/purchase_entries.py @@ -11,7 +11,7 @@ from brewman.views.services.voucher import get_edit_url @view_config(request_method='GET', route_name='purchase_entries', permission='Purchase Entries') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/purchases.py b/brewman/views/reports/purchases.py index cb671ad1..cbc75650 100644 --- a/brewman/views/reports/purchases.py +++ b/brewman/views/reports/purchases.py @@ -13,7 +13,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='purchases', permission='Purchases') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/raw_material_cost.py b/brewman/views/reports/raw_material_cost.py index e5ccad73..98a75d28 100644 --- a/brewman/views/reports/raw_material_cost.py +++ b/brewman/views/reports/raw_material_cost.py @@ -15,7 +15,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='raw_material_cost', permission='Raw Material Cost') @view_config(request_method='GET', route_name='raw_material_cost_id', permission='Raw Material Cost') def get_html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/reconcile.py b/brewman/views/reports/reconcile.py index 04045ad3..9ba03c1f 100644 --- a/brewman/views/reports/reconcile.py +++ b/brewman/views/reports/reconcile.py @@ -18,7 +18,7 @@ from brewman.views.services.voucher import get_edit_url @view_config(request_method='GET', route_name='reconcile_id', permission='Reconcile') @view_config(request_method='GET', route_name='reconcile', permission='Reconcile') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/stock_movement.py b/brewman/views/reports/stock_movement.py index 745f1929..4b366d9b 100644 --- a/brewman/views/reports/stock_movement.py +++ b/brewman/views/reports/stock_movement.py @@ -13,7 +13,7 @@ from brewman.views.services.session import session_period_start, session_period_ @view_config(request_method='GET', route_name='stock_movement', permission='Stock Movement') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/trial_balance.py b/brewman/views/reports/trial_balance.py index 6e1453b6..0fbd94fa 100644 --- a/brewman/views/reports/trial_balance.py +++ b/brewman/views/reports/trial_balance.py @@ -14,7 +14,7 @@ from brewman.views.services.session import session_period_finish @view_config(request_method='GET', route_name='trial_balance', permission='Trial Balance') @view_config(request_method='GET', route_name='trial_balance_date', permission='Trial Balance') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/reports/unposted.py b/brewman/views/reports/unposted.py index fe231772..202ba103 100644 --- a/brewman/views/reports/unposted.py +++ b/brewman/views/reports/unposted.py @@ -10,7 +10,7 @@ from brewman.views.services.voucher import get_edit_url @view_config(request_method='GET', route_name='unposted', permission='Post Vouchers') def html(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/brewman/views/services/voucher/__init__.py b/brewman/views/services/voucher/__init__.py index e09d5643..211b3f30 100644 --- a/brewman/views/services/voucher/__init__.py +++ b/brewman/views/services/voucher/__init__.py @@ -37,7 +37,7 @@ from ..session import get_first_day @view_config(request_method='GET', route_name='service_charge_id', permission='Service Charge') @view_config(request_method='GET', route_name='service_charge', permission='Service Charge') def journal_get(request): - package, resource = 'brewman:static/base.html'.split(':', 1) + package, resource = 'brewman:static/index.html'.split(':', 1) file = pkg_resources.resource_filename(package, resource) return FileResponse(file, request=request) diff --git a/setup.py b/setup.py index de38fa35..7103b476 100644 --- a/setup.py +++ b/setup.py @@ -15,11 +15,11 @@ requires = [ 'transaction', 'zope.sqlalchemy', 'SQLAlchemy', - 'psycopg2', + 'psycopg2-binary', ] setup(name='brewman', - version='4.0', + version='5.0', description='brewman', long_description=README + '\n\n' + CHANGES, classifiers=[