| {{deduction.Journal.Ledger.Name}} |
{{deduction.Journal.Ledger.Designation}} |
- {{deduction.Journal.Ledger.CostCenter.Name}} |
+ {{deduction.Journal.Ledger.CostCentre.Name}} |
{{deduction.GrossSalary}} |
{{deduction.DaysWorked}} |
{{deduction.EsiEmployee}} |
diff --git a/brewman/static/scripts/account.js b/brewman/static/scripts/account.js
index 98534cd9..8bdfd1aa 100644
--- a/brewman/static/scripts/account.js
+++ b/brewman/static/scripts/account.js
@@ -18,7 +18,7 @@ var AccountListController = ['$scope', '$location', '$routeParams', 'Tokenizer',
't': {'Col': 'Type', 'Comparator': 'text'},
'a': {'Col': 'IsActive', 'Comparator': 'boolean'},
'r': {'Col': 'IsReconcilable', 'Comparator': 'boolean'},
- 'c': {'Col': 'CostCenter', 'Comparator': 'text'}
+ 'c': {'Col': 'CostCentre', 'Comparator': 'text'}
},
def: 'n',
sorter: {
@@ -26,7 +26,7 @@ var AccountListController = ['$scope', '$location', '$routeParams', 'Tokenizer',
't': 'Type',
'a': 'IsActive',
'r': 'IsReconcilable',
- 'c': 'CostCenter'
+ 'c': 'CostCentre'
}
};
$scope.filterAccounts = _.debounce(function (q) {
@@ -76,11 +76,11 @@ AccountListController.resolve = {
}]
};
-var AccountController = ['$scope', '$location', '$modal', 'account', 'accountTypes', 'costCenters', function ($scope, $location, $modal, account, accountTypes, costCenters) {
+var AccountController = ['$scope', '$location', '$modal', 'account', 'accountTypes', 'costCentres', function ($scope, $location, $modal, account, accountTypes, costCentres) {
$scope.account = account;
$scope.accountTypes = accountTypes;
- $scope.costCenters = costCenters;
+ $scope.costCentres = costCentres;
$scope.save = function () {
$scope.account.$save(function () {
@@ -131,7 +131,7 @@ AccountController.resolve = {
accountTypes: ['AccountType', function (AccountType) {
return AccountType.query({}).$promise;
}],
- costCenters: ['CostCenter', function (CostCenter) {
- return CostCenter.query({}).$promise;
+ costCentres: ['CostCentre', function (CostCentre) {
+ return CostCentre.query({}).$promise;
}]
};
diff --git a/brewman/static/scripts/angular_service.js b/brewman/static/scripts/angular_service.js
index 2c97e99d..318c93ff 100644
--- a/brewman/static/scripts/angular_service.js
+++ b/brewman/static/scripts/angular_service.js
@@ -85,9 +85,9 @@ overlordService.factory('ProductLedger', ['$resource', function ($resource) {
return $resource('/api/ProductLedger/:id');
}]);
-overlordService.factory('CostCenter', ['$resource', function ($resource) {
- return $resource('/api/CostCenter/:id',
- {id: '@CostCenterID'}, {
+overlordService.factory('CostCentre', ['$resource', function ($resource) {
+ return $resource('/api/CostCentre/:id',
+ {id: '@CostCentreID'}, {
query: {method: 'GET', params: {list: true}, isArray: true}
});
}]);
@@ -139,9 +139,9 @@ overlordService.factory('ProductGroup', ['$resource', function ($resource) {
});
}]);
-overlordService.factory('CostCenter', ['$resource', function ($resource) {
- return $resource('/api/CostCenter/:id',
- {id: '@CostCenterID'}, {
+overlordService.factory('CostCentre', ['$resource', function ($resource) {
+ return $resource('/api/CostCentre/:id',
+ {id: '@CostCentreID'}, {
query: {method: 'GET', params: {list: true}, isArray: true}
});
}]);
@@ -270,6 +270,29 @@ overlordService.factory('Tokenizer', ['$filter', function ($filter) {
return obj.toLowerCase().indexOf(text) > -1;
}
},
+ 'date': function (obj, text) {
+ var reGoodDate = /^((0?[1-9]|[12][0-9]|3[01])[- /.](0?[1-9]|1[012]|Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[- /.](19|20)?[0-9]{2})*$/i,
+ asDateObject = function (input) {
+ if (angular.isDate(input)) {
+ return input;
+ }
+
+ },
+ op = opLength(text),
+ ob = op ? asDateObject(obj) : '',
+ tex = op ? asDateObject(text.substr(op).trim()) : '';
+ if (op) {
+ return operators[text.substr(0, op)](ob, tex);
+ } else {
+ return obj.toString().indexOf(text) > -1;
+ }
+
+ if (text.indexOf('!') === 0) {
+ return obj.toLowerCase().indexOf(text.substr(1)) <= -1;
+ } else {
+ return obj.toLowerCase().indexOf(text) > -1;
+ }
+ },
'boolean': function (obj, text) {
return obj === isTrue(text);
},
diff --git a/brewman/static/scripts/cost-center.js b/brewman/static/scripts/cost-center.js
deleted file mode 100644
index 90e4f6ec..00000000
--- a/brewman/static/scripts/cost-center.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-
-var CostCenterListController = ['$scope', 'costCenters', function ($scope, costCenters) {
- $scope.info = costCenters;
-}];
-
-CostCenterListController.resolve = {
- costCenters: ['CostCenter', function (CostCenter) {
- return CostCenter.query({}).$promise;
- }]
-};
-
-var CostCenterController = ['$scope', '$routeParams', '$location', 'costCenter', function ($scope, $routeParams, $location, costCenter) {
- $scope.costCenter = costCenter;
-
- $scope.save = function () {
- $scope.costCenter.$save(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/CostCenters')
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
-
- $scope.delete = function () {
- $scope.costCenter.$delete(function (u, putResponseHeaders) {
- $scope.toasts.push({Type: 'Success', Message: ''});
- $location.path('/CostCenters')
- }, function (data, status) {
- $scope.toasts.push({Type: 'Danger', Message: data.data});
- });
- };
- $scope.foName = true;
-}];
-
-CostCenterController.resolve = {
- costCenter: ['$route', 'CostCenter', function ($route, CostCenter) {
- var id = $route.current.params.id;
- return CostCenter.get({id: id}).$promise;
- }]
-};
diff --git a/brewman/static/scripts/cost-centre.js b/brewman/static/scripts/cost-centre.js
new file mode 100644
index 00000000..594e6b72
--- /dev/null
+++ b/brewman/static/scripts/cost-centre.js
@@ -0,0 +1,41 @@
+'use strict';
+
+var CostCentreListController = ['$scope', 'costCentres', function ($scope, costCentres) {
+ $scope.info = costCentres;
+}];
+
+CostCentreListController.resolve = {
+ costCentres: ['CostCentre', function (CostCentre) {
+ return CostCentre.query({}).$promise;
+ }]
+};
+
+var CostCentreController = ['$scope', '$routeParams', '$location', 'costCentre', function ($scope, $routeParams, $location, costCentre) {
+ $scope.costCentre = costCentre;
+
+ $scope.save = function () {
+ $scope.costCentre.$save(function (u, putResponseHeaders) {
+ $scope.toasts.push({Type: 'Success', Message: ''});
+ $location.path('/CostCentres')
+ }, function (data, status) {
+ $scope.toasts.push({Type: 'Danger', Message: data.data});
+ });
+ };
+
+ $scope.delete = function () {
+ $scope.costCentre.$delete(function (u, putResponseHeaders) {
+ $scope.toasts.push({Type: 'Success', Message: ''});
+ $location.path('/CostCentres')
+ }, function (data, status) {
+ $scope.toasts.push({Type: 'Danger', Message: data.data});
+ });
+ };
+ $scope.foName = true;
+}];
+
+CostCentreController.resolve = {
+ costCentre: ['$route', 'CostCentre', function ($route, CostCentre) {
+ var id = $route.current.params.id;
+ return CostCentre.get({id: id}).$promise;
+ }]
+};
diff --git a/brewman/static/scripts/employee-functions.js b/brewman/static/scripts/employee-functions.js
index ef5e9e40..3163568d 100644
--- a/brewman/static/scripts/employee-functions.js
+++ b/brewman/static/scripts/employee-functions.js
@@ -17,25 +17,6 @@ var EmployeeFunctionsController = ['$scope', '$http', 'asDateFilter', function (
});
};
- $scope.creditServiceCharge = function () {
- if (!angular.isDate($scope.sc.Month)) {
- return;
- }
- var ServiceChargeMonth = asDate($scope.sc.Month);
- if (!angular.isDate($scope.sc.CreditDate)) {
- return;
- }
- var CreditDate = asDate($scope.sc.CreditDate);
- return $http.
- post('/api/CreditServiceCharge', {Month: ServiceChargeMonth, CreditDate: CreditDate}).
- success(function (data) {
- $scope.toasts.push({Type: 'Success', Message: data.message});
- }).
- error(function (errorMessage) {
- $scope.toasts.push({Type: 'Danger', Message: errorMessage});
- });
- };
-
$scope.attendanceRecordUrl = function () {
if (!$scope.record.StartDate || !$scope.record.FinishDate) {
return;
diff --git a/brewman/static/scripts/employee.js b/brewman/static/scripts/employee.js
index 3d4d7d94..35aea139 100644
--- a/brewman/static/scripts/employee.js
+++ b/brewman/static/scripts/employee.js
@@ -19,7 +19,7 @@ var EmployeeListController = ['$scope', '$location', '$routeParams', 'Tokenizer'
's': {'Col': 'Salary', 'Comparator': 'numeric'},
'a': {'Col': 'IsActive', 'Comparator': 'boolean'},
'des': {'Col': 'Designation', 'Comparator': 'text'},
- 'dep': {'Col': 'CostCenter', 'Comparator': 'text'}
+ 'dep': {'Col': 'CostCentre', 'Comparator': 'text'}
},
def: 'n',
sorter: {
@@ -28,7 +28,7 @@ var EmployeeListController = ['$scope', '$location', '$routeParams', 'Tokenizer'
's': 'Salary',
'a': 'IsActive',
'des': 'Designation',
- 'dep': 'CostCenter'
+ 'dep': 'CostCentre'
}
};
$scope.filterEmployees = _.debounce(function (q) {
@@ -79,10 +79,10 @@ EmployeeListController.resolve = {
}]
};
-var EmployeeController = ['$scope', '$routeParams', '$location', 'asDateFilter', '$modal', 'employee', 'costCenters', function ($scope, $routeParams, $location, asDate, $modal, employee, costCenters) {
+var EmployeeController = ['$scope', '$routeParams', '$location', 'asDateFilter', '$modal', 'employee', 'costCentres', function ($scope, $routeParams, $location, asDate, $modal, employee, costCentres) {
$scope.employee = employee;
- $scope.costCenters = costCenters;
+ $scope.costCentres = costCentres;
$scope.save = function () {
$scope.employee.JoiningDate = asDate($scope.employee.JoiningDate);
@@ -132,7 +132,7 @@ EmployeeController.resolve = {
var id = $route.current.params.id;
return Employee.get({id: id}).$promise;
}],
- costCenters: ['CostCenter', function (CostCenter) {
- return CostCenter.query({}).$promise;
+ costCentres: ['CostCentre', function (CostCentre) {
+ return CostCentre.query({}).$promise;
}]
};
diff --git a/brewman/static/scripts/issue.js b/brewman/static/scripts/issue.js
index 81be1272..0ade6f39 100644
--- a/brewman/static/scripts/issue.js
+++ b/brewman/static/scripts/issue.js
@@ -1,8 +1,8 @@
'use strict';
-var IssueController = ['$scope', '$routeParams', '$location', 'asDateFilter', 'voucher', 'costCenters', 'smallGrid', 'IssueGrid', 'Voucher', '$modal', 'Batch', function ($scope, $routeParams, $location, asDate, voucher, costCenters, smallGrid, IssueGrid, Voucher, $modal, Batch) {
+var IssueController = ['$scope', '$routeParams', '$location', 'asDateFilter', 'voucher', 'costCentres', 'smallGrid', 'IssueGrid', 'Voucher', '$modal', 'Batch', function ($scope, $routeParams, $location, asDate, voucher, costCentres, smallGrid, IssueGrid, Voucher, $modal, Batch) {
$scope.voucher = voucher;
- $scope.costCenters = costCenters;
+ $scope.costCentres = costCentres;
$scope.smallGrid = smallGrid;
if (angular.isUndefined($routeParams.Source) && angular.isUndefined($routeParams.Destination) && angular.isUndefined($routeParams.id)) {
@@ -81,7 +81,7 @@ var IssueController = ['$scope', '$routeParams', '$location', 'asDateFilter', 'v
function getDebitCredit(journals, type) {
for (var i = 0, l = journals.length; i < l; i++) {
if (journals[i].Debit === type) {
- return journals[i].CostCenter.CostCenterID;
+ return journals[i].CostCentre.CostCentreID;
}
}
}
@@ -279,8 +279,8 @@ IssueController.resolve = {
return [];
}
}],
- costCenters: ['CostCenter', function (CostCenter) {
- return CostCenter.query({}).$promise;
+ costCentres: ['CostCentre', function (CostCentre) {
+ return CostCentre.query({}).$promise;
}]
};
diff --git a/brewman/static/scripts/overlord.js b/brewman/static/scripts/overlord.js
index 853f4a02..9f4316cb 100644
--- a/brewman/static/scripts/overlord.js
+++ b/brewman/static/scripts/overlord.js
@@ -28,6 +28,9 @@ var overlord = angular.module('overlord', ['overlord.directive', 'overlord.filte
when('/SalaryDeduction', {templateUrl: '/partial/salary-deduction.html', controller: SalaryDeductionController, resolve: SalaryDeductionController.resolve}).
when('/SalaryDeduction/:id', {templateUrl: '/partial/salary-deduction.html', controller: SalaryDeductionController, resolve: SalaryDeductionController.resolve}).
+ when('/ServiceCharge', {templateUrl: '/partial/employee-service-charge.html', controller: ServiceChargeController, resolve: ServiceChargeController.resolve}).
+ when('/ServiceCharge/:id', {templateUrl: '/partial/employee-service-charge.html', controller: ServiceChargeController, resolve: ServiceChargeController.resolve}).
+
when('/Ledger', {templateUrl: '/partial/ledger.html', controller: LedgerController, resolve: LedgerController.resolve}).
when('/Ledger/:id', {templateUrl: '/partial/ledger.html', controller: LedgerController, resolve: LedgerController.resolve}).
@@ -75,9 +78,9 @@ var overlord = angular.module('overlord', ['overlord.directive', 'overlord.filte
when('/Employee', {templateUrl: '/partial/employee-detail.html', controller: EmployeeController, resolve: EmployeeController.resolve}).
when('/Employee/:id', {templateUrl: '/partial/employee-detail.html', controller: EmployeeController, resolve: EmployeeController.resolve}).
- when('/CostCenters', {templateUrl: '/partial/cost-center-list.html', controller: CostCenterListController, resolve: CostCenterListController.resolve}).
- when('/CostCenter', {templateUrl: '/partial/cost-center-detail.html', controller: CostCenterController, resolve: CostCenterController.resolve}).
- when('/CostCenter/:id', {templateUrl: '/partial/cost-center-detail.html', controller: CostCenterController, resolve: CostCenterController.resolve}).
+ when('/CostCentres', {templateUrl: '/partial/cost-centre-list.html', controller: CostCentreListController, resolve: CostCentreListController.resolve}).
+ when('/CostCentre', {templateUrl: '/partial/cost-centre-detail.html', controller: CostCentreController, resolve: CostCentreController.resolve}).
+ when('/CostCentre/:id', {templateUrl: '/partial/cost-centre-detail.html', controller: CostCentreController, resolve: CostCentreController.resolve}).
when('/Products', {templateUrl: '/partial/product-list.html', controller: ProductListController, resolve: ProductListController.resolve, reloadOnSearch:false}).
when('/Product', {templateUrl: '/partial/product-detail.html', controller: ProductController, resolve: ProductController.resolve}).
diff --git a/brewman/static/scripts/service-charge.js b/brewman/static/scripts/service-charge.js
new file mode 100644
index 00000000..9002b13f
--- /dev/null
+++ b/brewman/static/scripts/service-charge.js
@@ -0,0 +1,114 @@
+'use strict';
+
+var ServiceChargeController = ['$scope', '$location', '$routeParams', 'numberFilter', 'asDateFilter', '$modal', 'voucher', function ($scope, $location, $routeParams, numberFilter, asDate, $modal, voucher) {
+ $scope.voucher = voucher;
+
+ $scope.TotalPoints = function (){
+ return _($scope.voucher.ServiceCharges).map(function (item) {
+ return item.DaysWorked * Number(item.Points);
+ }).reduce(function (sum, item) {
+ return sum + item;
+ });
+ };
+ $scope.PointValue = function () {
+ return Math.round($scope.voucher.ServiceCharge * 100 / $scope.TotalPoints()) / 100;
+ };
+ $scope.less = function (employee) {
+ if (employee.Points >= 1) {
+ employee.Points -= 1;
+ }
+ };
+ $scope.more = function (employee) {
+ employee.Points += 1;
+ };
+
+ $scope.$watch('voucher.Date', function (newDate, oldDate) {
+ var nDate = asDate(newDate),
+ oDate = asDate(oldDate);
+
+
+ if (nDate !== oDate && !angular.isUndefined(nDate)) {
+ if (angular.isUndefined($routeParams.id)) {
+ return voucher.$get({type: 'Service Charge', Date: nDate}).$promise;
+ }
+ }
+ }, true);
+
+ $scope.employeeAmount = function (employee) {
+ return Number(employee.Points) * employee.DaysWorked * $scope.PointValue();
+ }
+ $scope.preventAlteration = function (voucher) {
+ if (angular.isUndefined($scope.perms)) {
+ return false;
+ } else if (angular.isUndefined(voucher.VoucherID)) {
+ return !$scope.perms['Service Charge'];
+ } else if (voucher.Posted && !$scope.perms['Edit Posted Vouchers']) {
+ return true;
+ } else if (voucher.User.UserID !== $scope.auth.UserID && !$scope.perms["Edit Other User's Vouchers"]) {
+ return true;
+ } else {
+ return false;
+ }
+ };
+
+ $scope.save = function () {
+ $scope.voucher.Date = asDate($scope.voucher.Date);
+ $scope.voucher.$save({type: 'Service Charge'}, function (u) {
+ $scope.toasts.push({Type: 'Success', Message: ''});
+ $location.path('/ServiceCharge/' + u.VoucherID);
+ }, function (data) {
+ $scope.toasts.push({Type: 'Danger', Message: data.data});
+ });
+ };
+
+ $scope.delete = function () {
+ $scope.voucher.$delete(function () {
+ $scope.toasts.push({Type: 'Success', Message: ''});
+ $location.path('/ServiceCharge').replace();
+ }, function (data) {
+ $scope.toasts.push({Type: 'Danger', Message: data.data});
+ });
+ };
+
+ $scope.post = function () {
+ $scope.voucher.$post(function (u, putResponseHeaders) {
+ $scope.toasts.push({Type: 'Success', Message: ''});
+ }, function (data, status) {
+ $scope.toasts.push({Type: 'Danger', Message: data.data});
+ });
+ };
+
+ $scope.confirm = function () {
+ var modalInstance = $modal.open({
+ backdrop: true,
+ templateUrl: '/template/modal/confirm.html',
+ controller: ['$scope', '$modalInstance', function ($scope, $modalInstance) {
+ $scope.title = "Delete Voucher";
+ $scope.body = "Are you sure? This cannot be undone.";
+ $scope.isDelete = true;
+ $scope.ok = function () {
+ $modalInstance.close();
+ };
+ $scope.cancel = function () {
+ $modalInstance.dismiss('cancel');
+ };
+ }]
+ });
+ modalInstance.result.then(function () {
+ $scope.delete();
+ });
+ };
+}];
+
+
+ServiceChargeController.resolve = {
+ voucher: ['$route', 'Voucher', function ($route, Voucher) {
+ var id = $route.current.params.id;
+
+ if (angular.isUndefined(id)) {
+ return Voucher.get({type: 'Service Charge'}).$promise;
+ } else {
+ return Voucher.get({id: id}).$promise;
+ }
+ }]
+};
diff --git a/brewman/views/Management/rebase.py b/brewman/views/Management/rebase.py
index d4353d06..2af5b65d 100644
--- a/brewman/views/Management/rebase.py
+++ b/brewman/views/Management/rebase.py
@@ -2,14 +2,13 @@ import datetime
from decimal import Decimal
import uuid
-from pyramid.security import authenticated_userid
from pyramid.view import view_config
from sqlalchemy import func, and_, distinct
from sqlalchemy.orm import aliased
import transaction
from brewman.models import DBSession
-from brewman.models.master import LedgerBase, CostCenter, Ledger, Employee
+from brewman.models.master import LedgerBase, CostCentre, Ledger, Employee
from brewman.models.validation_exception import TryCatchFunction
from brewman.models.voucher import Journal, Voucher, VoucherType, Batch, Inventory, SalaryDeduction, Fingerprint, \
Attendance, DbImage
@@ -21,10 +20,10 @@ __author__ = 'tanshu'
@view_config(request_method='POST', route_name='api_rebase', renderer='json', permission='Rebase')
@TryCatchFunction
def rebase(request):
- DBSession.execute('SET statement_timeout TO 300000;')
+ # DBSession.execute('SET statement_timeout TO 300000;') # 5 minutes
date = request.matchdict.get('date', None)
date = datetime.datetime.strptime(date, '%d-%b-%Y')
- user_id = uuid.UUID(authenticated_userid(request))
+ user_id = uuid.UUID(request.authenticated_userid)
voucher_l, accounts = opening_ledgers(date, user_id)
voucher_b, batches = opening_batches(date, user_id)
delete_data(date)
@@ -37,7 +36,7 @@ def rebase(request):
for i in voucher_b.inventories:
DBSession.add(i)
cleanup_lint(date, accounts, batches)
- DBSession.execute('RESET statement_timeout;')
+ # DBSession.execute('RESET statement_timeout;')
transaction.commit()
return {}
@@ -60,12 +59,12 @@ def opening_ledgers(date, user_id):
if ledger.type_object.balance_sheet and ledger.id != LedgerBase.suspense() and amount != 0:
running_total += amount
journal = Journal(amount=abs(amount), debit=-1 if amount < 0 else 1, ledger_id=ledger.id,
- cost_center_id=ledger.costcenter_id)
+ cost_centre_id=ledger.cost_centre_id)
voucher.journals.append(journal)
accounts.append(ledger.id)
if running_total != 0:
journal = Journal(amount=abs(amount), debit=-1 if amount * -1 < 0 else 1, ledger_id=LedgerBase.suspense(),
- cost_center_id=CostCenter.cost_center_overall())
+ cost_centre_id=CostCentre.cost_centre_overall())
voucher.journals.append(journal)
return voucher, accounts
@@ -77,7 +76,7 @@ def opening_batches(date, user_id):
query = DBSession.query(Batch, sum_func) \
.join(Journal, Voucher.journals).join(Inventory, Voucher.inventories).join(Batch, Inventory.batch) \
.filter(Voucher.date < date) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.having(sum_func != 0) \
.group_by(Batch).all()
@@ -93,9 +92,9 @@ def opening_batches(date, user_id):
voucher.inventories.append(inventory)
batches.append(batch.id)
voucher.journals.append(Journal(amount=abs(total), debit=-1, ledger_id=LedgerBase.all_purchases(),
- cost_center_id=CostCenter.cost_center_overall()))
+ cost_centre_id=CostCentre.cost_centre_overall()))
voucher.journals.append(Journal(amount=abs(total), debit=1, ledger_id=LedgerBase.all_purchases(),
- cost_center_id=CostCenter.cost_center_purchase()))
+ cost_centre_id=CostCentre.cost_centre_purchase()))
return voucher, batches
diff --git a/brewman/views/Management/stock.py b/brewman/views/Management/stock.py
index 27475e7e..38d9ad38 100644
--- a/brewman/views/Management/stock.py
+++ b/brewman/views/Management/stock.py
@@ -1,22 +1,24 @@
import datetime
from decimal import Decimal
import uuid
-from pyramid.security import authenticated_userid
+
from pyramid.view import view_config
from sqlalchemy import func
import transaction
+
from brewman.models import DBSession
-from brewman.models.master import LedgerBase, CostCenter, Product
+from brewman.models.master import LedgerBase, CostCentre, Product
from brewman.models.validation_exception import TryCatchFunction, ValidationError
from brewman.models.voucher import Journal, Voucher, VoucherType, Batch, Inventory
+
__author__ = 'tanshu'
@view_config(request_method='POST', route_name='api_reset_stock', renderer='json', permission='Reset Stock')
@TryCatchFunction
def rebase(request):
- user_id = uuid.UUID(authenticated_userid(request))
+ user_id = uuid.UUID(request.authenticated_userid)
product = Product.by_id(uuid.UUID(request.matchdict['id']))
quantity = round(Decimal(request.GET['Quantity']), 2)
@@ -47,7 +49,7 @@ def get_closing_stock(product, finish_date=None):
.filter(Voucher.id == Inventory.voucher_id) \
.filter(Voucher.id == Journal.voucher_id) \
.filter(Inventory.product_id == product.id) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase())
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase())
if finish_date is not None:
query = query.filter(Voucher.date <= finish_date)
query = query.one()
@@ -74,11 +76,11 @@ def create_voucher(batch, quantity, date, user_id):
DBSession.add(voucher)
if quantity > 0:
- source = CostCenter.cost_center_overall()
- destination = CostCenter.cost_center_purchase()
+ source = CostCentre.cost_centre_overall()
+ destination = CostCentre.cost_centre_purchase()
else:
- destination = CostCenter.cost_center_overall()
- source = CostCenter.cost_center_purchase()
+ destination = CostCentre.cost_centre_overall()
+ source = CostCentre.cost_centre_purchase()
inventory = Inventory(product_id=batch.product.id, quantity=abs(quantity), rate=batch.rate, tax=batch.tax,
discount=batch.discount, batch=batch)
@@ -86,9 +88,9 @@ def create_voucher(batch, quantity, date, user_id):
DBSession.add(inventory)
amount = round(inventory.amount, 2)
- source = Journal(debit=-1, ledger_id=LedgerBase.all_purchases(), amount=amount, cost_center_id=source)
+ source = Journal(debit=-1, ledger_id=LedgerBase.all_purchases(), amount=amount, cost_centre_id=source)
voucher.journals.append(source)
DBSession.add(source)
- destination = Journal(debit=1, ledger_id=LedgerBase.all_purchases(), amount=amount, cost_center_id=destination)
+ destination = Journal(debit=1, ledger_id=LedgerBase.all_purchases(), amount=amount, cost_centre_id=destination)
voucher.journals.append(destination)
DBSession.add(destination)
diff --git a/brewman/views/account.py b/brewman/views/account.py
index 23e12904..9c26b914 100644
--- a/brewman/views/account.py
+++ b/brewman/views/account.py
@@ -1,15 +1,14 @@
import uuid
+
import pkg_resources
from pyramid.response import Response, FileResponse
-from pyramid.security import authenticated_userid
-
from pyramid.view import view_config
from sqlalchemy.orm import joinedload_all
import transaction
+
from brewman import groupfinder
from brewman.models import DBSession
-
-from brewman.models.master import CostCenter, Ledger, LedgerType, LedgerBase
+from brewman.models.master import CostCentre, Ledger, LedgerType, LedgerBase
from brewman.models.validation_exception import ValidationError, TryCatchFunction
from brewman.models.voucher import Voucher, Journal, VoucherType
@@ -28,7 +27,7 @@ def html(request):
def save(request):
item = Ledger(code=0, name=request.json_body['Name'], type=int(request.json_body['Type']),
is_active=request.json_body['IsActive'], is_reconcilable=request.json_body['IsReconcilable'],
- costcenter_id=uuid.UUID(request.json_body['CostCenter']['CostCenterID'])).create()
+ cost_centre_id=uuid.UUID(request.json_body['CostCentre']['CostCentreID'])).create()
transaction.commit()
return account_info(item.id)
@@ -46,7 +45,7 @@ def update(request):
item.name = request.json_body['Name']
item.is_active = request.json_body['IsActive']
item.is_reconcilable = request.json_body['IsReconcilable']
- item.costcenter_id = uuid.UUID(request.json_body['CostCenter']['CostCenterID'])
+ item.cost_centre_id = uuid.UUID(request.json_body['CostCentre']['CostCentreID'])
transaction.commit()
return account_info(item.id)
@@ -54,7 +53,7 @@ def update(request):
@view_config(request_method='DELETE', route_name='api_account_id', renderer='json', permission='Accounts')
def delete(request):
account = Ledger.by_id(uuid.UUID(request.matchdict['id']))
- can_delete, reason = account.can_delete('Advanced Delete' in groupfinder(authenticated_userid(request), request))
+ can_delete, reason = account.can_delete('Advanced Delete' in groupfinder(request.authenticated_userid, request))
if can_delete:
delete_with_data(account)
transaction.commit()
@@ -83,7 +82,7 @@ def show_list(request):
ledgers = []
for item in list:
ledgers.append({'Name': item.name, 'Type': item.type_object.name, 'IsActive': 'Yes' if item.is_active else 'No',
- 'IsReconcilable': 'Yes' if item.is_reconcilable else '', 'CostCenter': item.costcenter.name,
+ 'IsReconcilable': 'Yes' if item.is_reconcilable else '', 'CostCentre': item.cost_centre.name,
'IsFixture': item.is_fixture, 'Url': request.route_url('account_id', id=item.id)})
return ledgers
@@ -121,13 +120,13 @@ def account_type_list(request):
def account_info(id):
if id is None:
account = {'Code': '(Auto)', 'Type': LedgerType.by_name('Creditors').id, 'IsActive': True,
- 'IsReconcilable': False, 'CostCenter': CostCenter.overall()}
+ 'IsReconcilable': False, 'CostCentre': CostCentre.overall()}
else:
account = Ledger.by_id(id)
account = {'LedgerID': account.id, 'Code': account.code, 'Name': account.name, 'Type': account.type,
'IsActive': account.is_active, 'IsReconcilable': account.is_reconcilable,
'IsFixture': account.is_fixture,
- 'CostCenter': {'CostCenterID': account.costcenter_id, 'Name': account.costcenter.name}}
+ 'CostCentre': {'CostCentreID': account.cost_centre_id, 'Name': account.cost_centre.name}}
return account
@@ -161,7 +160,7 @@ def delete_with_data(account):
sus_jnl.amount = abs(amount)
sus_jnl.debit = -1 if amount < 0 else 1
voucher.narration += '\nDeleted \u20B9{0:,.2f} of {1}'.format(acc_jnl.amount * acc_jnl.debit,
- account.name)
+ account.name)
if voucher.type in (VoucherType.by_name('Payment').id, VoucherType.by_name('Receipt').id):
voucher.type = VoucherType.by_name('Journal')
DBSession.delete(account)
diff --git a/brewman/views/attendance.py b/brewman/views/attendance.py
index 511ac46d..bd495ea8 100644
--- a/brewman/views/attendance.py
+++ b/brewman/views/attendance.py
@@ -1,11 +1,12 @@
import datetime
import uuid
+
import pkg_resources
from pyramid.response import FileResponse
-from pyramid.security import authenticated_userid
from pyramid.view import view_config
from sqlalchemy import or_
import transaction
+
from brewman.models import DBSession
from brewman.models.master import AttendanceType, Employee
from brewman.models.validation_exception import ValidationError, TryCatchFunction
@@ -13,8 +14,10 @@ from brewman.models.voucher import Attendance
from brewman.views.fingerprint import get_prints
from brewman.views.services.session import session_period_start, session_period_finish, session_current_date
+
__author__ = 'tanshu'
+
@view_config(request_method='GET', route_name='attendance_date', permission='Attendance')
@view_config(request_method='GET', route_name='attendance', permission='Attendance')
@view_config(request_method='GET', route_name='employee_attendance_id', permission='Attendance')
@@ -48,10 +51,10 @@ def attendance_date(request):
def attendance_date_report(date):
report = {'Date': date, 'Body': []}
date = datetime.datetime.strptime(date, '%d-%b-%Y')
- employees = DBSession().query(Employee)\
- .filter(Employee.joining_date <= date)\
- .filter(or_(Employee.is_active, Employee.leaving_date >= date))\
- .order_by(Employee.costcenter_id).order_by(Employee.designation).order_by(Employee.name).all()
+ employees = DBSession().query(Employee) \
+ .filter(Employee.joining_date <= date) \
+ .filter(or_(Employee.is_active, Employee.leaving_date >= date)) \
+ .order_by(Employee.cost_centre_id).order_by(Employee.designation).order_by(Employee.name).all()
for item in employees:
att = DBSession().query(Attendance).filter(Attendance.employee_id == item.id).filter(
Attendance.date == date).filter(Attendance.is_valid == True).first()
@@ -59,7 +62,7 @@ def attendance_date_report(date):
prints, hours, worked = get_prints(item.id, date)
report['Body'].append({'id': item.id, 'Code': item.code, 'Name': item.name, 'Designation': item.designation,
- 'Department': item.costcenter.name, 'AttendanceTypeID': att, 'Prints': prints,
+ 'Department': item.cost_centre.name, 'AttendanceTypeID': att, 'Prints': prints,
'Hours': hours, 'Worked': worked})
return report
@@ -67,7 +70,7 @@ def attendance_date_report(date):
@view_config(request_method='POST', route_name='api_attendance_date', renderer='json', permission='Attendance')
@TryCatchFunction
def save(request):
- user_id = uuid.UUID(authenticated_userid(request))
+ user_id = uuid.UUID(request.authenticated_userid)
date = request.matchdict.get('date', None)
date_object = datetime.datetime.strptime(date, '%d-%b-%Y')
@@ -76,7 +79,7 @@ def save(request):
attendance_type = item['AttendanceTypeID']
if attendance_type != 0:
attendance = Attendance(employee_id=employee_id, date=date_object, attendance_type=attendance_type,
- user_id=user_id)
+ user_id=user_id)
attendance.create()
transaction.commit()
return attendance_date_report(date)
@@ -112,11 +115,11 @@ def employee_attendance(employee, start_date, finish_date):
finish_date = datetime.datetime.strptime(finish_date, '%d-%b-%Y')
list = []
for item in daterange(start_date, finish_date, inclusive=True):
- att = DBSession.query(Attendance)\
- .filter(Attendance.employee_id == employee.id)\
- .filter(Attendance.date == item)\
- .filter(Attendance.is_valid == True)\
- .first()
+ att = DBSession.query(Attendance) \
+ .filter(Attendance.employee_id == employee.id) \
+ .filter(Attendance.date == item) \
+ .filter(Attendance.is_valid == True) \
+ .first()
att = 0 if att is None else att.attendance_type
prints, hours, worked = get_prints(employee.id, item)
list.append({'Date': item.strftime('%d-%b-%Y'), 'AttendanceTypeID': att, 'Prints': prints, 'Hours': hours,
@@ -129,7 +132,7 @@ def employee_attendance(employee, start_date, finish_date):
def save_employee_attendance(request):
start_date = None
finish_date = None
- user_id = uuid.UUID(authenticated_userid(request))
+ user_id = uuid.UUID(request.authenticated_userid)
employee = Employee.by_id(uuid.UUID(request.matchdict['id']))
for item in request.json_body['Body']:
if start_date is None:
@@ -140,7 +143,7 @@ def save_employee_attendance(request):
if attendance_type != 0:
date = datetime.datetime.strptime(item['Date'], '%d-%b-%Y')
attendance = Attendance(employee_id=employee.id, date=date, attendance_type=attendance_type,
- user_id=user_id)
+ user_id=user_id)
attendance.create()
transaction.commit()
return {'StartDate': start_date, 'FinishDate': finish_date,
diff --git a/brewman/views/attendance_report.py b/brewman/views/attendance_report.py
index 181dd66e..f4876b83 100644
--- a/brewman/views/attendance_report.py
+++ b/brewman/views/attendance_report.py
@@ -29,9 +29,9 @@ def attendance_record(start_date, finish_date):
employees = DBSession().query(Employee)\
.filter(Employee.joining_date <= finish_date)\
.filter(or_(Employee.is_active, Employee.leaving_date >= start_date))\
- .order_by(Employee.costcenter_id).order_by(Employee.designation).order_by(Employee.name).all()
+ .order_by(Employee.cost_centre_id).order_by(Employee.designation).order_by(Employee.name).all()
for employee in employees:
- row_display = [employee.code, employee.name, employee.designation, employee.costcenter.name, employee.salary,
+ row_display = [employee.code, employee.name, employee.designation, employee.cost_centre.name, employee.salary,
employee.service_points]
row_value = ['', '', '', '', employee.salary, employee.service_points]
for date in daterange(start_date, finish_date, inclusive=True):
diff --git a/brewman/views/auth/user.py b/brewman/views/auth/user.py
index fabf5881..5aae7271 100644
--- a/brewman/views/auth/user.py
+++ b/brewman/views/auth/user.py
@@ -1,22 +1,21 @@
import re
import uuid
+
import pkg_resources
from pyramid.response import Response, FileResponse
-from pyramid.security import authenticated_userid
-
from pyramid.view import view_config
import transaction
+
from brewman import groupfinder
from brewman.models import DBSession
from brewman.models.auth import User, Group
-
from brewman.models.validation_exception import TryCatchFunction, ValidationError
class UserView(object):
def __init__(self, request):
self.request = request
- self.user = authenticated_userid(request)
+ self.user = request.authenticated_userid
self.permissions = None
self.has_permission = False
if self.user is not None:
@@ -117,8 +116,6 @@ class UserView(object):
def show_name(self):
list = User.query().filter(User.locked_out == False).order_by(User.name).all()
users = [{'Name': item.name} for item in list]
- # for item in list:
- # users.append({'Name': item.name})
return users
diff --git a/brewman/views/cost_center.py b/brewman/views/cost_center.py
deleted file mode 100644
index 4cc8ffb6..00000000
--- a/brewman/views/cost_center.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import uuid
-import pkg_resources
-from pyramid.response import Response, FileResponse
-
-from pyramid.view import view_config
-import transaction
-from brewman.models import DBSession
-
-from brewman.models.master import CostCenter
-from brewman.models.validation_exception import ValidationError, TryCatchFunction
-
-
-@view_config(route_name='cost_center_list', permission='Authenticated')
-@view_config(request_method='GET', route_name='cost_center_id', permission='Cost Centers')
-@view_config(request_method='GET', route_name='cost_center', permission='Cost Centers')
-def html(request):
- package, resource = 'brewman:static/base.html'.split(':', 1)
- file = pkg_resources.resource_filename(package, resource)
- return FileResponse(file, request=request)
-
-
-@view_config(request_method='POST', route_name='api_cost_center', renderer='json', permission='Cost Centers')
-@TryCatchFunction
-def save(request):
- item = CostCenter(request.json_body['Name'])
- DBSession.add(item)
- transaction.commit()
- return cost_center_info(item.id)
-
-
-@view_config(request_method='POST', route_name='api_cost_center_id', renderer='json', permission='Cost Centers')
-@TryCatchFunction
-def update(request):
- item = CostCenter.by_id(uuid.UUID(request.matchdict['id']))
- if item.is_fixture:
- raise ValidationError("{0} is a fixture and cannot be edited or deleted.".format(item.name))
- item.name = request.json_body['Name']
- transaction.commit()
- return cost_center_info(item.id)
-
-
-@view_config(request_method='DELETE', route_name='api_cost_center_id', renderer='json', permission='Cost Centers')
-def delete(request):
- item = request.matchdict.get('id', None)
- item = None if item is None else CostCenter.by_id(uuid.UUID(item))
-
- if item is None:
- response = Response("Cost Center not found")
- response.status_int = 500
- return response
- elif item.is_fixture:
- raise ValidationError("{0} is a fixture and cannot be edited or deleted.".format(item.name))
- else:
- response = Response("Cost Center deletion not implemented")
- response.status_int = 500
- return response
-
-
-@view_config(request_method='GET', route_name='api_cost_center_id', renderer='json', permission='Cost Centers')
-def show_id(request):
- return cost_center_info(uuid.UUID(request.matchdict.get('id', None)))
-
-
-@view_config(request_method='GET', route_name='api_cost_center', renderer='json', permission='Cost Centers')
-def show_blank(request):
- return cost_center_info(None)
-
-
-@view_config(request_method='GET', route_name='api_cost_center', request_param='list', renderer='json',
- permission='Authenticated')
-def show_list(request):
- list = CostCenter.list()
- cost_centers = []
- for item in list:
- cost_centers.append({'CostCenterID': item.id, 'Name': item.name, 'IsFixture': item.is_fixture,
- 'Url': request.route_url('cost_center_id', id=item.id)})
- return cost_centers
-
-
-def cost_center_info(id):
- if id is None:
- return {}
- else:
- cost_center = CostCenter.by_id(id)
- return {'CostCenterID': cost_center.id, 'Name': cost_center.name, 'IsFixture': cost_center.is_fixture}
-
-
diff --git a/brewman/views/cost_centre.py b/brewman/views/cost_centre.py
new file mode 100644
index 00000000..453b8715
--- /dev/null
+++ b/brewman/views/cost_centre.py
@@ -0,0 +1,87 @@
+import uuid
+import pkg_resources
+from pyramid.response import Response, FileResponse
+
+from pyramid.view import view_config
+import transaction
+from brewman.models import DBSession
+
+from brewman.models.master import CostCentre
+from brewman.models.validation_exception import ValidationError, TryCatchFunction
+
+
+@view_config(route_name='cost_centre_list', permission='Authenticated')
+@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)
+ file = pkg_resources.resource_filename(package, resource)
+ return FileResponse(file, request=request)
+
+
+@view_config(request_method='POST', route_name='api_cost_centre', renderer='json', permission='Cost Centres')
+@TryCatchFunction
+def save(request):
+ item = CostCentre(request.json_body['Name'])
+ DBSession.add(item)
+ transaction.commit()
+ return cost_centre_info(item.id)
+
+
+@view_config(request_method='POST', route_name='api_cost_centre_id', renderer='json', permission='Cost Centres')
+@TryCatchFunction
+def update(request):
+ item = CostCentre.by_id(uuid.UUID(request.matchdict['id']))
+ if item.is_fixture:
+ raise ValidationError("{0} is a fixture and cannot be edited or deleted.".format(item.name))
+ item.name = request.json_body['Name']
+ transaction.commit()
+ return cost_centre_info(item.id)
+
+
+@view_config(request_method='DELETE', route_name='api_cost_centre_id', renderer='json', permission='Cost Centres')
+def delete(request):
+ item = request.matchdict.get('id', None)
+ item = None if item is None else CostCentre.by_id(uuid.UUID(item))
+
+ if item is None:
+ response = Response("Cost Centre not found")
+ response.status_int = 500
+ return response
+ elif item.is_fixture:
+ raise ValidationError("{0} is a fixture and cannot be edited or deleted.".format(item.name))
+ else:
+ response = Response("Cost Centre deletion not implemented")
+ response.status_int = 500
+ return response
+
+
+@view_config(request_method='GET', route_name='api_cost_centre_id', renderer='json', permission='Cost Centres')
+def show_id(request):
+ return cost_centre_info(uuid.UUID(request.matchdict.get('id', None)))
+
+
+@view_config(request_method='GET', route_name='api_cost_centre', renderer='json', permission='Cost Centres')
+def show_blank(request):
+ return cost_centre_info(None)
+
+
+@view_config(request_method='GET', route_name='api_cost_centre', request_param='list', renderer='json',
+ permission='Authenticated')
+def show_list(request):
+ list = CostCentre.list()
+ cost_centres = []
+ for item in list:
+ cost_centres.append({'CostCentreID': item.id, 'Name': item.name, 'IsFixture': item.is_fixture,
+ 'Url': request.route_url('cost_centre_id', id=item.id)})
+ return cost_centres
+
+
+def cost_centre_info(id):
+ if id is None:
+ return {}
+ else:
+ cost_centre = CostCentre.by_id(id)
+ return {'CostCentreID': cost_centre.id, 'Name': cost_centre.name, 'IsFixture': cost_centre.is_fixture}
+
+
diff --git a/brewman/views/dashboard.py b/brewman/views/dashboard.py
index 9c2ccc92..0f284999 100644
--- a/brewman/views/dashboard.py
+++ b/brewman/views/dashboard.py
@@ -1,15 +1,14 @@
import pkg_resources
from pyramid.response import FileResponse
-from pyramid.security import authenticated_userid
from pyramid.view import view_config
from sqlalchemy import func
+
from brewman import groupfinder
from brewman.models import DBSession
-
from brewman.models.master import LedgerBase
from brewman.models.validation_exception import TryCatchFunction
from brewman.models.voucher import Voucher, Journal, VoucherType
-from brewman.views.services.session import session_period_finish, session_period_start, session_current_date
+from brewman.views.services.session import session_period_finish, session_period_start
@view_config(route_name='dashboard', permission='Authenticated')
@@ -22,7 +21,7 @@ def html(request):
@view_config(route_name='api_dashboard', renderer='json')
@TryCatchFunction
def dashboard(request):
- user = authenticated_userid(request)
+ user = request.authenticated_userid
if user is None or 'Dashboard' not in groupfinder(user, request):
return {'Enabled': False}
start_date = request.GET.get('s', session_period_start(request))
diff --git a/brewman/views/employee.py b/brewman/views/employee.py
index 477f6cad..7ca8c616 100644
--- a/brewman/views/employee.py
+++ b/brewman/views/employee.py
@@ -1,17 +1,16 @@
import datetime
import uuid
from decimal import Decimal
+
import pkg_resources
from pyramid.response import Response, FileResponse
-from pyramid.security import authenticated_userid
-
from pyramid.view import view_config
from sqlalchemy.orm import joinedload_all
import transaction
+
from brewman import groupfinder
from brewman.models import DBSession
-
-from brewman.models.master import CostCenter, Employee, LedgerBase, Ledger
+from brewman.models.master import CostCentre, Employee, LedgerBase, Ledger
from brewman.models.validation_exception import ValidationError, TryCatchFunction
from brewman.models.voucher import Voucher, Journal, VoucherType
from brewman.views import to_uuid
@@ -34,7 +33,7 @@ def save(request):
if name == '':
raise ValidationError('Name cannot be blank')
- cost_center_id = uuid.UUID(request.json_body['CostCenter']['CostCenterID'])
+ cost_centre_id = uuid.UUID(request.json_body['CostCentre']['CostCentreID'])
designation = request.json_body.get('Designation', '').strip()
try:
@@ -67,7 +66,7 @@ def save(request):
except (ValueError, KeyError, TypeError):
raise ValidationError("Leaving Date is not a valid date")
- item = Employee(0, name, is_active, cost_center_id, designation, salary, service_points, joining_date,
+ item = Employee(0, name, is_active, cost_centre_id, designation, salary, service_points, joining_date,
leaving_date).create()
transaction.commit()
return employee_info(item.id)
@@ -84,7 +83,7 @@ def update(request):
if item.name == '':
raise ValidationError('Name cannot be blank')
- item.costcenter_id = uuid.UUID(request.json_body['CostCenter']['CostCenterID'])
+ item.cost_centre_id = uuid.UUID(request.json_body['CostCentre']['CostCentreID'])
item.designation = request.json_body.get('Designation', '').strip()
try:
@@ -125,7 +124,7 @@ def update(request):
@TryCatchFunction
def delete(request):
employee = Employee.by_id(uuid.UUID(request.matchdict['id']))
- can_delete, reason = employee.can_delete('Advanced Delete' in groupfinder(authenticated_userid(request), request))
+ can_delete, reason = employee.can_delete('Advanced Delete' in groupfinder(request.authenticated_userid, request))
if can_delete:
delete_with_data(employee)
transaction.commit()
@@ -160,7 +159,7 @@ def show_list(request):
ledgers.append(
{'Code': item.code, 'Name': item.name, 'Designation': item.designation, 'Salary': item.salary,
'ServicePoints': item.service_points, 'IsActive': item.is_active,
- 'CostCenter': item.costcenter.name, 'Url': request.route_url('employee_id', id=item.id),
+ 'CostCentre': item.cost_centre.name, 'Url': request.route_url('employee_id', id=item.id),
'JoiningDate': item.joining_date.strftime('%d-%b-%Y'),
'LeavingDate': '' if item.is_active else item.leaving_date.strftime('%d-%b-%Y')})
return ledgers
@@ -177,7 +176,7 @@ def show_term(request):
list = []
for index, item in enumerate(LedgerBase.list(10, filter)):
list.append({'LedgerID': item.id, 'Name': item.name, 'Designation': item.designation,
- 'CostCenter': {'CostCenterID': item.costcenter.id, 'Name': item.costcenter.name}})
+ 'CostCentre': {'CostCentreID': item.cost_centre.id, 'Name': item.cost_centre.name}})
if count is not None and index == count - 1:
break
return list
@@ -185,7 +184,7 @@ def show_term(request):
def employee_info(id):
if id is None:
- employee = {'Code': '(Auto)', 'IsActive': True, 'CostCenter': CostCenter.overall()}
+ employee = {'Code': '(Auto)', 'IsActive': True, 'CostCentre': CostCentre.overall()}
else:
employee = Employee.by_id(id)
if employee is None:
@@ -194,7 +193,7 @@ def employee_info(id):
'IsActive': employee.is_active, 'Designation': employee.designation, 'Salary': employee.salary,
'ServicePoints': employee.service_points, 'JoiningDate': employee.joining_date.strftime('%d-%b-%Y'),
'LeavingDate': None if employee.is_active else employee.leaving_date.strftime('%d-%b-%Y'),
- 'CostCenter': {'CostCenterID': employee.costcenter_id, 'Name': employee.costcenter.name}}
+ 'CostCentre': {'CostCentreID': employee.cost_centre_id, 'Name': employee.cost_centre.name}}
return employee
diff --git a/brewman/views/messaging.py b/brewman/views/messaging.py
index 05ba205a..d98dfcac 100644
--- a/brewman/views/messaging.py
+++ b/brewman/views/messaging.py
@@ -1,16 +1,14 @@
import datetime
import uuid
+
import pkg_resources
from pyramid.response import FileResponse
-from pyramid.security import authenticated_userid
-
from pyramid.view import view_config
-from sqlalchemy.orm import joinedload_all
import transaction
+
from brewman import groupfinder
from brewman.models import DBSession
from brewman.models.auth import User
-
from brewman.models.messaging import Thread, Post, Tag, Subscriber
from brewman.models.tzinfoutc import get_age
from brewman.models.validation_exception import TryCatchFunction, ValidationError
@@ -27,7 +25,7 @@ def html(request):
@view_config(request_method='POST', route_name='api_message', renderer='json', permission='Authenticated')
@TryCatchFunction
def save(request):
- user_id = uuid.UUID(authenticated_userid(request))
+ user_id = uuid.UUID(request.authenticated_userid)
user_name = User.by_id(user_id).name
title = request.json_body['Title'].strip()
if Thread.by_title(title) is not None:
@@ -60,7 +58,7 @@ def save(request):
@view_config(request_method='POST', route_name='api_message_id', renderer='json', permission='Authenticated')
@TryCatchFunction
def update(request):
- user_id = uuid.UUID(authenticated_userid(request))
+ user_id = uuid.UUID(request.authenticated_userid)
user_name = User.by_id(user_id).name
super_user = 'Messages' in groupfinder(user_id, request)
thread = Thread.by_id(uuid.UUID(request.matchdict['id']))
@@ -127,14 +125,14 @@ def update(request):
@view_config(request_method='GET', route_name='api_message', renderer='json', permission='Authenticated')
def show_blank(request):
- user = User.by_id(authenticated_userid(request)).name
+ user = User.by_id(request.authenticated_userid).name
return {'Title': '', 'User': user, 'Tags': [], 'Priority': 4, 'Public': False,
'Posts': [], 'Closed': False, 'Subscribers': [user]}
@view_config(request_method='GET', route_name='api_message_id', renderer='json', permission='Authenticated')
def show_id(request):
- user_id = authenticated_userid(request) and uuid.UUID(authenticated_userid(request))
+ user_id = request.authenticated_userid and uuid.UUID(request.authenticated_userid)
thread = Thread.by_id(request.matchdict['id'])
subscriber = [s for s in thread.subscribers if s.user_id == user_id]
if len(subscriber) > 0:
@@ -146,7 +144,7 @@ def show_id(request):
@view_config(request_method='GET', route_name='api_message', renderer='json', request_param='list')
def show_list(request):
- user_id = authenticated_userid(request) and uuid.UUID(authenticated_userid(request))
+ user_id = request.authenticated_userid and uuid.UUID(request.authenticated_userid)
list = Thread.query()
type = request.params.get('type', 'open')
diff --git a/brewman/views/product.py b/brewman/views/product.py
index bac4262e..36f0ffe4 100644
--- a/brewman/views/product.py
+++ b/brewman/views/product.py
@@ -3,7 +3,6 @@ import uuid
import pkg_resources
from pyramid.response import Response, FileResponse
-from pyramid.security import authenticated_userid
from pyramid.view import view_config
from sqlalchemy import desc
from sqlalchemy.orm import joinedload_all
@@ -109,7 +108,7 @@ def update(request):
@TryCatchFunction
def delete(request):
product = Product.by_id(uuid.UUID(request.matchdict['id']))
- can_delete, reason = product.can_delete('Advanced Delete' in groupfinder(authenticated_userid(request), request))
+ can_delete, reason = product.can_delete('Advanced Delete' in groupfinder(request.authenticated_userid, request))
if can_delete:
delete_with_data(product)
diff --git a/brewman/views/reports/closing_stock.py b/brewman/views/reports/closing_stock.py
index 8b0786e1..81502694 100644
--- a/brewman/views/reports/closing_stock.py
+++ b/brewman/views/reports/closing_stock.py
@@ -6,7 +6,7 @@ from sqlalchemy.sql.expression import func
from pyramid.view import view_config
from brewman.models import DBSession
-from brewman.models.master import Product, CostCenter
+from brewman.models.master import Product, CostCentre
from brewman.models.voucher import Voucher, Journal, Inventory
from brewman.views.services.session import session_period_finish
@@ -38,7 +38,7 @@ def build_report(date):
query = DBSession.query(Product, quantity_sum, amount_sum) \
.join(Product.inventories).join(Inventory.voucher).join(Voucher.journals) \
.filter(Voucher.date <= date) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.group_by(Product) \
.order_by(amount_sum.desc()).all()
@@ -54,7 +54,7 @@ def get_opening_stock(startDate):
opening_stock = DBSession.query(func.sum(Inventory.quantity * Inventory.rate * (1 + Inventory.tax) * Journal.debit)) \
.join(Journal.voucher).join(Journal.ledger).join(Voucher.inventories) \
.filter(Voucher.date < startDate) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.scalar()
return 0 if opening_stock is None else opening_stock
@@ -63,6 +63,6 @@ def get_closing_stock(finishDate):
closing_stock = DBSession.query(func.sum(Inventory.quantity * Inventory.rate * (1 + Inventory.tax) * Journal.debit)) \
.join(Journal.voucher).join(Journal.ledger).join(Voucher.inventories) \
.filter(Voucher.date <= finishDate) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.scalar()
return 0 if closing_stock is None else closing_stock
diff --git a/brewman/views/reports/product_ledger.py b/brewman/views/reports/product_ledger.py
index ce4c13a6..a8765a7b 100644
--- a/brewman/views/reports/product_ledger.py
+++ b/brewman/views/reports/product_ledger.py
@@ -8,7 +8,7 @@ import uuid
from pyramid.view import view_config
from brewman.models import DBSession
-from brewman.models.master import Product, CostCenter
+from brewman.models.master import Product, CostCentre
from brewman.models.validation_exception import ValidationError, TryCatchFunction
from brewman.models.voucher import Voucher, Journal, VoucherType, Inventory
@@ -62,18 +62,18 @@ def build_report(request, info):
query = DBSession.query(Voucher, Inventory, Journal).options(
joinedload(Journal.ledger, innerjoin=True),
- joinedload(Journal.costcenter, innerjoin=True)) \
+ joinedload(Journal.cost_centre, innerjoin=True)) \
.filter(Voucher.id == Inventory.voucher_id) \
.filter(Voucher.id == Journal.voucher_id) \
.filter(Inventory.product_id == product_id) \
- .filter(Journal.cost_center_id != CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id != CostCentre.cost_centre_purchase()) \
.filter(Voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y')) \
.filter(Voucher.date <= datetime.datetime.strptime(finish_date, '%d-%b-%Y')) \
.order_by(Voucher.date).order_by(Voucher.last_edit_date).all()
for row in query:
journalDebit = row.Journal.debit * -1
- name = row.Journal.costcenter.name if row.Voucher.type == VoucherType.by_name(
+ name = row.Journal.cost_centre.name if row.Voucher.type == VoucherType.by_name(
'Issue').id else row.Journal.ledger.name
debitQ = row.Inventory.quantity if journalDebit == 1 else 0
debitA = row.Inventory.amount if journalDebit == 1 else 0
@@ -108,7 +108,7 @@ def opening_balance(product_id, start_date):
.filter(Voucher.id == Inventory.voucher_id) \
.filter(Voucher.id == Journal.voucher_id) \
.filter(Inventory.product_id == product_id) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.filter(Voucher.date < datetime.datetime.strptime(start_date, '%d-%b-%Y')) \
.one()
diff --git a/brewman/views/reports/purchase_entries.py b/brewman/views/reports/purchase_entries.py
index b3b4f6cf..32ba0930 100644
--- a/brewman/views/reports/purchase_entries.py
+++ b/brewman/views/reports/purchase_entries.py
@@ -6,7 +6,7 @@ from sqlalchemy.sql.expression import func, desc
from pyramid.view import view_config
from brewman.models import DBSession
-from brewman.models.master import CostCenter, LedgerType, LedgerBase
+from brewman.models.master import CostCentre, LedgerType, LedgerBase
from brewman.models.voucher import Voucher, Journal, VoucherType, Inventory
from brewman.views.services.session import session_period_start, session_period_finish
diff --git a/brewman/views/reports/purchases.py b/brewman/views/reports/purchases.py
index f5d18087..1c3be6ff 100644
--- a/brewman/views/reports/purchases.py
+++ b/brewman/views/reports/purchases.py
@@ -6,7 +6,7 @@ from sqlalchemy.sql.expression import func, desc
from pyramid.view import view_config
from brewman.models import DBSession
-from brewman.models.master import CostCenter, Product
+from brewman.models.master import CostCentre, Product
from brewman.models.voucher import Voucher, Journal, Inventory, VoucherType
from brewman.views.services.session import session_period_start, session_period_finish
@@ -42,7 +42,7 @@ def build_report(request, start_date, finish_date):
.filter(Voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y')) \
.filter(Voucher.date <= datetime.datetime.strptime(finish_date, '%d-%b-%Y')) \
.filter(Voucher.type != VoucherType.by_name('Issue').id) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.group_by(Product).order_by(desc(amount_sum)).all()
total_amount = 0
diff --git a/brewman/views/reports/raw_material_cost.py b/brewman/views/reports/raw_material_cost.py
index 9d2c7405..9b122819 100644
--- a/brewman/views/reports/raw_material_cost.py
+++ b/brewman/views/reports/raw_material_cost.py
@@ -7,7 +7,7 @@ from sqlalchemy.sql.expression import func, case
from pyramid.view import view_config
from brewman.models import DBSession
-from brewman.models.master import LedgerBase, CostCenter, Product, ProductGroup
+from brewman.models.master import LedgerBase, CostCentre, Product, ProductGroup
from brewman.models.voucher import Voucher, Journal, Inventory
from brewman.views.services.session import session_period_start, session_period_finish
@@ -50,24 +50,24 @@ def build_report(request, start_date, finish_date):
sum_issue = func.sum(case([(LedgerBase.type == 2, Journal.signed_amount)], else_=0)).label('issue')
sum_sale = (func.sum(case([(LedgerBase.type == 3, Journal.signed_amount)], else_=0)) * -1).label('sale')
- query = DBSession.query(CostCenter, sum_issue, sum_sale) \
- .join(CostCenter.journals).join(Journal.voucher).join(Journal.ledger) \
+ query = DBSession.query(CostCentre, sum_issue, sum_sale) \
+ .join(CostCentre.journals).join(Journal.voucher).join(Journal.ledger) \
.filter(Voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y')) \
.filter(Voucher.date <= datetime.datetime.strptime(finish_date, '%d-%b-%Y')) \
- .filter(Journal.cost_center_id != CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id != CostCentre.cost_centre_purchase()) \
.filter(LedgerBase.type.in_([2, 3])) \
- .group_by(CostCenter) \
+ .group_by(CostCentre) \
.order_by(sum_sale.desc()).all()
issues = 0
sales = 0
- for cost_center, issue, sale in query:
+ for cost_centre, issue, sale in query:
issues += issue
sales += sale
rmc = 0 if sale == 0 else issue / sale
report['Body'].append(
- {'Name': cost_center.name, 'Issue': issue, 'Sale': sale, 'Rmc': rmc,
- 'Url': request.route_url('raw_material_cost_id', id=str(cost_center.id),
+ {'Name': cost_centre.name, 'Issue': issue, 'Sale': sale, 'Rmc': rmc,
+ 'Url': request.route_url('raw_material_cost_id', id=str(cost_centre.id),
_query={'StartDate': start_date, 'FinishDate': finish_date})})
rmc = 0 if sales == 0 else issues / sales
@@ -76,7 +76,7 @@ def build_report(request, start_date, finish_date):
return report
-def build_report_id(request, cost_center_id, start_date, finish_date):
+def build_report_id(request, cost_centre_id, start_date, finish_date):
report = {'StartDate': start_date, 'FinishDate': finish_date, 'Body': []}
sum_quantity = func.sum(Inventory.quantity * Journal.debit).label('quantity')
@@ -88,7 +88,7 @@ def build_report_id(request, cost_center_id, start_date, finish_date):
.filter(Voucher.date >= datetime.datetime.strptime(start_date, '%d-%b-%Y')) \
.filter(Voucher.date <= datetime.datetime.strptime(finish_date, '%d-%b-%Y')) \
.filter(Voucher.type == 3) \
- .filter(Journal.cost_center_id == cost_center_id) \
+ .filter(Journal.cost_centre_id == cost_centre_id) \
.group_by(Product).group_by(Journal.debit).group_by(ProductGroup.name) \
.order_by(ProductGroup.name).order_by(sum_net.desc()).all()
diff --git a/brewman/views/reports/stock_movement.py b/brewman/views/reports/stock_movement.py
index 6bfd4a8d..b940c027 100644
--- a/brewman/views/reports/stock_movement.py
+++ b/brewman/views/reports/stock_movement.py
@@ -6,7 +6,7 @@ from sqlalchemy.sql.expression import func
from pyramid.view import view_config
from brewman.models import DBSession
-from brewman.models.master import Product, CostCenter
+from brewman.models.master import Product, CostCentre
from brewman.models.voucher import Voucher, Journal, VoucherType, Inventory
from brewman.views.services.session import session_period_start, session_period_finish
@@ -40,7 +40,7 @@ def build_stock_movement(start_date, finish_date):
openings = DBSession.query(Product, quantity_sum) \
.join(Product.inventories).join(Inventory.voucher).join(Voucher.journals) \
.filter(Voucher.date < start_date) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.group_by(Product).all()
for product, quantity in openings:
dict[product.id] = {'ProductID': product.id, 'Name': product.full_name, 'Group': product.product_group.name,
@@ -50,7 +50,7 @@ def build_stock_movement(start_date, finish_date):
.filter(Voucher.date >= start_date) \
.filter(Voucher.date <= finish_date) \
.filter(Voucher.type != VoucherType.by_name('Issue').id) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.group_by(Product).all()
for product, quantity in purchases:
if product.id in dict:
@@ -63,7 +63,7 @@ def build_stock_movement(start_date, finish_date):
.filter(Voucher.date >= start_date) \
.filter(Voucher.date <= finish_date) \
.filter(Voucher.type == VoucherType.by_name('Issue').id) \
- .filter(Journal.cost_center_id == CostCenter.cost_center_purchase()) \
+ .filter(Journal.cost_centre_id == CostCentre.cost_centre_purchase()) \
.group_by(Product).all()
for product, quantity in issues:
if product.id in dict:
diff --git a/brewman/views/services/cost_center.py b/brewman/views/services/cost_centre.py
similarity index 86%
rename from brewman/views/services/cost_center.py
rename to brewman/views/services/cost_centre.py
index 26a38e71..17bed7da 100644
--- a/brewman/views/services/cost_center.py
+++ b/brewman/views/services/cost_centre.py
@@ -22,9 +22,9 @@ def grid_date(request):
@TryCatchFunction
def grid_voucher(request):
voucher = Voucher.by_id(uuid.UUID(request.matchdict['date']))
- source = [j.cost_center_id for j in voucher.journals if j.debit == -1]
+ source = [j.cost_centre_id for j in voucher.journals if j.debit == -1]
source = source[0]
- destination = [j.cost_center_id for j in voucher.journals if j.debit == 1]
+ destination = [j.cost_centre_id for j in voucher.journals if j.debit == 1]
destination = destination[0]
return get_grid(voucher.date, source, destination)
@@ -34,8 +34,8 @@ def get_grid(date, source, destination):
source_journal = aliased(Journal)
destination_journal = aliased(Journal)
- source_or = (and_(source_journal.cost_center_id == source, source_journal.debit == -1))
- destination_or = (and_(destination_journal.cost_center_id == destination, destination_journal.debit == 1))
+ source_or = (and_(source_journal.cost_centre_id == source, source_journal.debit == -1))
+ destination_or = (and_(destination_journal.cost_centre_id == destination, destination_journal.debit == 1))
query = DBSession.query(Voucher, source_journal.amount)\
.join(source_journal, Voucher.journals)\
.join(destination_journal, Voucher.journals)\
diff --git a/brewman/views/services/session.py b/brewman/views/services/session.py
index 83925585..a8b53e46 100644
--- a/brewman/views/services/session.py
+++ b/brewman/views/services/session.py
@@ -1,22 +1,25 @@
from datetime import date, timedelta
import uuid
-from pyramid.security import authenticated_userid
from pyramid.view import view_config
+
from brewman import groupfinder
from brewman.models.auth import Role, User
+
def session_current_date(request):
session = request.session
if 'currentDate' not in session:
session['currentDate'] = date.today().strftime('%d-%b-%Y')
return session['currentDate']
+
def session_current_date_set(request, date):
session = request.session
session['currentDate'] = date
return session['currentDate']
+
def session_period_start(request):
session = request.session
if 'periodStart' not in session:
@@ -33,7 +36,7 @@ def session_period_finish(request):
@view_config(route_name='api_auth', renderer='json')
def user_permission(request):
- user_id = authenticated_userid(request)
+ user_id = request.authenticated_userid
if user_id is None:
auth = {'isAuthenticated': False, 'perms': {}}
elif 'auth' in request.session:
diff --git a/brewman/views/services/voucher/__init__.py b/brewman/views/services/voucher/__init__.py
index d130e909..99f65d43 100644
--- a/brewman/views/services/voucher/__init__.py
+++ b/brewman/views/services/voucher/__init__.py
@@ -1,22 +1,25 @@
+import datetime
+from decimal import Decimal
import uuid
import pkg_resources
from pyramid.response import Response, FileResponse
-from pyramid.security import authenticated_userid
from pyramid.view import view_config
-from sqlalchemy import func
+from sqlalchemy import func, or_
import transaction
from brewman import groupfinder
from brewman.models import DBSession
from brewman.models.auth import User
-from brewman.models.master import LedgerBase, CostCenter
+from brewman.models.master import LedgerBase, CostCentre, Employee, AttendanceType, Ledger
from brewman.models.validation_exception import ValidationError, TryCatchFunction
-from brewman.models.voucher import Voucher, VoucherType, Inventory, DbImage
+from brewman.models.voucher import Voucher, VoucherType, Inventory, DbImage, Attendance, Journal
from brewman.views import get_lock_info
from .issue import issue_create_voucher, issue_update_voucher
from .journal import journal_update_voucher, journal_create_voucher
from .purchase import purchase_create_voucher, purchase_update_voucher
+from .service_charge import service_charge_create_voucher, service_charge_update_voucher
+from ..session import get_first_day
__author__ = 'tanshu'
@@ -36,6 +39,8 @@ __author__ = 'tanshu'
@view_config(request_method='GET', route_name='issue', permission='Issue')
@view_config(request_method='GET', route_name='salary_deduction_id', permission='Issue')
@view_config(request_method='GET', route_name='salary_deduction', permission='Issue')
+@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)
file = pkg_resources.resource_filename(package, resource)
@@ -46,7 +51,7 @@ def journal_get(request):
permission='Post Vouchers')
@TryCatchFunction
def voucher_post(request):
- user = User.by_id(uuid.UUID(authenticated_userid(request)))
+ user = User.by_id(uuid.UUID(request.authenticated_userid))
voucher = Voucher.by_id(uuid.UUID(request.matchdict['id']))
start, finish = get_lock_info()
if start is not None and start > voucher.date:
@@ -60,7 +65,7 @@ def voucher_post(request):
def check_delete_permissions(request, voucher):
- user = User.by_id(uuid.UUID(authenticated_userid(request)))
+ user = User.by_id(uuid.UUID(request.authenticated_userid))
permissions = groupfinder(user.id, request)
if voucher.posted and not 'Edit Posted Vouchers' in permissions:
@@ -99,10 +104,10 @@ def delete(request):
if voucher.type == VoucherType.by_name('Issue').id:
for item in voucher.journals:
if item.debit == 1:
- destination = item.cost_center_id
+ destination = item.cost_centre_id
else:
- source = item.cost_center_id
- batch_consumed = True if source == CostCenter.cost_center_purchase() else False if destination == CostCenter.cost_center_purchase() else None
+ source = item.cost_centre_id
+ batch_consumed = True if source == CostCentre.cost_centre_purchase() else False if destination == CostCentre.cost_centre_purchase() else None
if batch_consumed is None:
pass
elif batch_consumed:
@@ -151,6 +156,7 @@ def voucher_info(voucher, request):
'Journals': [],
'Inventories': [],
'SalaryDeductions': [],
+ 'ServiceCharges': [],
'Files': [],
'CreationDate': voucher.creation_date.strftime('%d-%b-%Y %H:%M'),
'LastEditDate': voucher.last_edit_date.strftime('%d-%b-%Y %H:%M'),
@@ -161,7 +167,7 @@ def voucher_info(voucher, request):
for item in voucher.journals:
json_voucher['Journals'].append({'JournalID': item.id, 'Debit': item.debit, 'Amount': item.amount,
'Ledger': {'LedgerID': item.ledger.id, 'Name': item.ledger.name},
- 'CostCenter': {'CostCenterID': item.cost_center_id}})
+ 'CostCentre': {'CostCentreID': item.cost_centre_id}})
for item in voucher.salary_deductions:
json_voucher['SalaryDeductions'].append(
{'GrossSalary': item.gross_salary,
@@ -173,8 +179,16 @@ def voucher_info(voucher, request):
'Journal': {'JournalID': item.journal.id,
'Ledger': {'LedgerID': item.journal.ledger.id, 'Name': item.journal.ledger.name,
'Designation': item.journal.ledger.designation,
- 'CostCenter': {'CostCenterID': item.journal.ledger.costcenter.id,
- 'Name': item.journal.ledger.costcenter.name}}}})
+ 'CostCentre': {'CostCentreID': item.journal.ledger.cost_centre.id,
+ 'Name': item.journal.ledger.cost_centre.name}}}})
+ for item in voucher.service_charges:
+ json_voucher['ServiceCharges'].append(
+ {'EmployeeID': item.journal.ledger_id, 'Name': item.journal.ledger.name,
+ 'Designation': Employee.by_id(item.journal.ledger_id).designation,
+ 'Department': item.journal.ledger.cost_centre.name, 'DaysWorked': item.days_worked, 'Points': item.points})
+ if len(json_voucher['ServiceCharges']) > 0:
+ json_voucher['ServiceCharge'] = [x.amount for x in voucher.journals if
+ x.ledger_id == Ledger.service_charge_id()][0]
for item in voucher.inventories:
text = "{0} ({1}) {2:.2f}@{3:.2f} from {4}".format(item.product.name, item.product.units,
item.batch.quantity_remaining, item.batch.rate,
@@ -233,36 +247,68 @@ def blank_voucher(info):
json_voucher['Journals'].append({'Ledger': {'LedgerID': LedgerBase.all_purchases()},
'Amount': 0,
'Debit': -1,
- 'CostCenter': {'CostCenterID': info['Source']}})
+ 'CostCentre': {'CostCentreID': info['Source']}})
json_voucher['Journals'].append({'Ledger': {'LedgerID': LedgerBase.all_purchases()},
'Amount': 0,
'Debit': 1,
- 'CostCenter': {'CostCenterID': info['Destination']}})
+ 'CostCentre': {'CostCentreID': info['Destination']}})
elif 'Journals' not in info:
json_voucher['Journals'].append({'Ledger': {'LedgerID': LedgerBase.all_purchases()},
'Amount': 0,
'Debit': -1,
- 'CostCenter': {'CostCenterID': CostCenter.cost_center_purchase()}})
+ 'CostCentre': {'CostCentreID': CostCentre.cost_centre_purchase()}})
json_voucher['Journals'].append({'Ledger': {'LedgerID': LedgerBase.all_purchases()},
'Amount': 0,
'Debit': 1,
- 'CostCenter': {'CostCenterID': CostCenter.cost_center_kitchen()}})
+ 'CostCentre': {'CostCentreID': CostCentre.cost_centre_kitchen()}})
else:
json_voucher['Date'] = info['Date']
for item in info['Journals']:
json_voucher['Journals'].append({'Ledger': {'LedgerID': item['Ledger']['LedgerID']},
'Amount': 0,
'Debit': item['Debit'],
- 'CostCenter': {'CostCenterID': item['CostCenter']['CostCenterID']}})
+ 'CostCentre': {'CostCentreID': item['CostCentre']['CostCentreID']}})
elif type == 'Salary Deduction':
json_voucher['SalaryDeductions'] = []
+ elif type == 'Service Charge':
+ json_voucher['ServiceCharges'], json_voucher['ServiceCharge'] = service_charge_employees(info['Date'])
else:
raise ValidationError("Voucher of type \"{0}\" does not exist.".format(type))
json_voucher['Files'] = []
return json_voucher
+def service_charge_employees(date):
+ date = datetime.datetime.strptime(date, '%d-%b-%Y')
+ start_date = get_first_day(date)
+ finish_date = date + datetime.timedelta(1)
+ details = []
+ employees = DBSession().query(Employee) \
+ .filter(Employee.joining_date <= finish_date) \
+ .filter(or_(Employee.is_active, Employee.leaving_date >= start_date)) \
+ .order_by(Employee.cost_centre_id).order_by(Employee.designation).order_by(Employee.name).all()
+ for employee in employees:
+ att = DBSession.query(Attendance) \
+ .filter(Attendance.employee_id == employee.id) \
+ .filter(Attendance.date >= start_date) \
+ .filter(Attendance.date < finish_date) \
+ .filter(Attendance.is_valid == True) \
+ .all()
+ att = sum(map(lambda x: AttendanceType.by_id(x.attendance_type).value, att))
+ details.append({'EmployeeID': employee.id, 'Name': employee.name, 'Designation': employee.designation,
+ 'Department': employee.cost_centre.name, 'DaysWorked': att, 'Points': employee.service_points})
+
+ amount = DBSession.query(func.sum(Journal.amount * Journal.debit)) \
+ .join(Journal.voucher) \
+ .filter(Voucher.date < finish_date) \
+ .filter(Voucher.type != VoucherType.by_name('Issue').id) \
+ .filter(Journal.ledger_id == Ledger.service_charge_id()) \
+ .scalar()
+ amount = 0 if amount is None else amount * Decimal(.7) * Decimal(.9) * -1
+ return details, amount
+
+
def get_edit_url(request, voucher):
if voucher.type == 1:
return request.route_url('journal_id', id=voucher.id)
@@ -278,5 +324,7 @@ def get_edit_url(request, voucher):
return request.route_url('purchase_return_id', id=voucher.id)
elif voucher.type == 12:
return request.route_url('salary_deduction_id', id=voucher.id)
+ elif voucher.type == 13:
+ return request.route_url('service_charge_id', id=voucher.id)
else:
return '#'
diff --git a/brewman/views/services/voucher/credit_salary.py b/brewman/views/services/voucher/credit_salary.py
index 56c386bd..9f010902 100644
--- a/brewman/views/services/voucher/credit_salary.py
+++ b/brewman/views/services/voucher/credit_salary.py
@@ -1,10 +1,11 @@
import calendar
import datetime
import uuid
-from pyramid.security import authenticated_userid
+
from pyramid.view import view_config
from sqlalchemy import or_
import transaction
+
from ....models import DBSession
from ....models.auth import User
from ....models.master import Employee, AttendanceType, Ledger
@@ -12,19 +13,20 @@ from ....models.validation_exception import TryCatchFunction
from ....models.voucher import Voucher, VoucherType, Attendance, Journal
from ..session import get_first_day, get_last_day
+
__author__ = 'tanshu'
@view_config(request_method='POST', route_name='api_credit_salary', renderer='json', permission='Attendance')
@TryCatchFunction
def credit_salary(request):
- user = User.by_id(uuid.UUID(authenticated_userid(request)))
+ user = User.by_id(uuid.UUID(request.authenticated_userid))
month = datetime.datetime.strptime(request.json_body['Month'], '%d-%b-%Y')
start_date = get_first_day(month)
finish_date = get_last_day(month)
voucher = Voucher(date=finish_date, narration='Auto Generated Salary Entry', user_id=user.id,
- type=VoucherType.by_name('Journal'), posted=True, poster_id=user.id)
+ type=VoucherType.by_name('Journal'), posted=True, poster_id=user.id)
DBSession.add(voucher)
for item in salary_journals(start_date, finish_date):
voucher.journals.append(item)
@@ -38,24 +40,25 @@ def salary_journals(start_date, finish_date):
finish_date = finish_date + datetime.timedelta(1)
amount = 0
journals = []
- employees = DBSession().query(Employee)\
- .filter(Employee.joining_date <= finish_date)\
- .filter(or_(Employee.is_active, Employee.leaving_date >= start_date))\
- .order_by(Employee.costcenter_id).order_by(Employee.designation).order_by(Employee.name).all()
+ employees = DBSession().query(Employee) \
+ .filter(Employee.joining_date <= finish_date) \
+ .filter(or_(Employee.is_active, Employee.leaving_date >= start_date)) \
+ .order_by(Employee.cost_centre_id).order_by(Employee.designation).order_by(Employee.name).all()
for employee in employees:
- att = DBSession.query(Attendance)\
- .filter(Attendance.employee_id == employee.id)\
- .filter(Attendance.date >= start_date)\
- .filter(Attendance.date < finish_date)\
- .filter(Attendance.is_valid == True)\
- .all()
+ att = DBSession.query(Attendance) \
+ .filter(Attendance.employee_id == employee.id) \
+ .filter(Attendance.date >= start_date) \
+ .filter(Attendance.date < finish_date) \
+ .filter(Attendance.is_valid == True) \
+ .all()
att = sum(map(lambda x: AttendanceType.by_id(x.attendance_type).value, att))
att = round(att * employee.salary / days)
if att != 0:
amount += att
- journals.append(Journal(amount=att, debit=-1, ledger_id=employee.id, cost_center_id=employee.costcenter_id))
+ journals.append(
+ Journal(amount=att, debit=-1, ledger_id=employee.id, cost_centre_id=employee.cost_centre_id))
salary = Ledger.salary()
salary = Ledger.by_id(uuid.UUID(salary['LedgerID']))
- journals.append(Journal(amount=amount, debit=1, ledger_id=salary.id, cost_center_id=salary.costcenter_id))
+ journals.append(Journal(amount=amount, debit=1, ledger_id=salary.id, cost_centre_id=salary.cost_centre_id))
return journals
diff --git a/brewman/views/services/voucher/credit_service_charge.py b/brewman/views/services/voucher/credit_service_charge.py
deleted file mode 100644
index 044d6ddc..00000000
--- a/brewman/views/services/voucher/credit_service_charge.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import datetime
-import uuid
-from decimal import Decimal
-from pyramid.security import authenticated_userid
-from pyramid.view import view_config
-from sqlalchemy import or_, func
-import transaction
-from ....models import DBSession
-from ....models.auth import User
-from ....models.master import Employee, AttendanceType, Ledger
-from ....models.validation_exception import TryCatchFunction
-from ....models.voucher import Voucher, VoucherType, Attendance, Journal
-from ..session import get_first_day, get_last_day
-
-__author__ = 'tanshu'
-
-
-@view_config(request_method='POST', route_name='api_credit_service_charge', renderer='json', permission='Attendance')
-@TryCatchFunction
-def credit_sc(request):
- user = User.by_id(uuid.UUID(authenticated_userid(request)))
- month = datetime.datetime.strptime(request.json_body['Month'], '%d-%b-%Y')
- credit_date = datetime.datetime.strptime(request.json_body['CreditDate'], '%d-%b-%Y')
-
- amount = balance(month)
- start_date = get_first_day(month)
- finish_date = get_last_day(month)
- voucher = Voucher(date=credit_date, narration='Auto Generated Service Charge Entry', user_id=user.id,
- type=VoucherType.by_name('Journal'), posted=True, poster_id=user.id)
- DBSession.add(voucher)
- for item in service_charge_journals(amount, start_date, finish_date):
- voucher.journals.append(item)
- DBSession.add(item)
- transaction.commit()
- return {'message': 'Salary Entry created'}
-
-
-def service_charge_journals(amount, start_date, finish_date):
- amount = amount * Decimal(.7) * Decimal(.9)
- total_points = 0
- details = []
- finish_date = finish_date + datetime.timedelta(1)
- journals = []
- employees = DBSession().query(Employee) \
- .filter(Employee.joining_date <= finish_date) \
- .filter(or_(Employee.is_active, Employee.leaving_date >= start_date)) \
- .order_by(Employee.costcenter_id).order_by(Employee.designation).order_by(Employee.name).all()
- for employee in employees:
- if employee.service_points != 0:
- att = DBSession.query(Attendance) \
- .filter(Attendance.employee_id == employee.id) \
- .filter(Attendance.date >= start_date) \
- .filter(Attendance.date < finish_date) \
- .filter(Attendance.is_valid == True) \
- .all()
- att = sum(map(lambda x: AttendanceType.by_id(x.attendance_type).value, att))
- points = Decimal(att) * employee.service_points
- if points != 0:
- total_points += points
- details.append({'Employee': employee, 'Points': points})
- if total_points == 0:
- raise ValueError("There is no data to credit service charges")
- point_value = round(amount / total_points, 2)
- amount = 0
- for item in details:
- ee = item['Employee']
- employee_amount = round(point_value * item['Points'])
- journal = Journal(amount=employee_amount, debit=-1, ledger_id=ee.id, cost_center_id=ee.costcenter_id)
- journals.append(journal)
- amount += employee_amount
- sc = Ledger.by_id(uuid.UUID(Ledger.service_charge()['LedgerID']))
- journals.append(Journal(amount=amount, debit=1, ledger_id=sc.id, cost_center_id=sc.costcenter_id))
- return journals
-
-
-def balance(date):
- amount = DBSession.query(func.sum(Journal.amount * Journal.debit)) \
- .join(Journal.voucher) \
- .filter(Voucher.date < date + datetime.timedelta(1)) \
- .filter(Voucher.type != VoucherType.by_name('Issue').id) \
- .filter(Journal.ledger_id == uuid.UUID(Ledger.service_charge()['LedgerID'])) \
- .scalar()
- return 0 if amount is None else amount * -1
diff --git a/brewman/views/services/voucher/empty_voucher.py b/brewman/views/services/voucher/empty_voucher.py
index 06d25fea..d29f8eba 100644
--- a/brewman/views/services/voucher/empty_voucher.py
+++ b/brewman/views/services/voucher/empty_voucher.py
@@ -53,6 +53,15 @@ class blank_voucher_view(object):
else:
return self.get_blank()
+ @view_config(request_param='type=Service Charge', permission='Service Charge')
+ def service_charge(self):
+ voucher_type = self.request.GET.get('type', None)
+ date = self.request.GET.get('Date', None)
+ if date is not None :
+ return blank_voucher({'Type': voucher_type, 'Date': date})
+ else:
+ return self.get_blank()
+
def get_blank(self, additional_info=None):
voucher_type = self.request.GET.get('type', None)
if additional_info is None:
diff --git a/brewman/views/services/voucher/issue.py b/brewman/views/services/voucher/issue.py
index 41ba8311..5cd346c5 100644
--- a/brewman/views/services/voucher/issue.py
+++ b/brewman/views/services/voucher/issue.py
@@ -2,7 +2,7 @@ import datetime
from decimal import Decimal
import uuid
from brewman.models import DBSession
-from brewman.models.master import CostCenter, LedgerBase
+from brewman.models.master import CostCentre, LedgerBase
from brewman.models.operations import journals_valid, inventory_valid
from brewman.models.validation_exception import ValidationError
from brewman.models.voucher import Voucher, VoucherType, Batch, Inventory, Journal
@@ -17,12 +17,12 @@ def issue_create_voucher(json, user):
for item in json['Journals']:
if int(item['Debit']) == 1:
- destination = uuid.UUID(item['CostCenter']['CostCenterID'])
+ destination = uuid.UUID(item['CostCentre']['CostCentreID'])
else:
- source = uuid.UUID(item['CostCenter']['CostCenterID'])
+ source = uuid.UUID(item['CostCentre']['CostCentreID'])
if source == destination:
raise ValidationError("Source cannot be the same as destination")
- batch_consumed = True if source == CostCenter.cost_center_purchase() else False if destination == CostCenter.cost_center_purchase() else None
+ batch_consumed = True if source == CostCentre.cost_centre_purchase() else False if destination == CostCentre.cost_centre_purchase() else None
for item in json['Inventories']:
issue_create_inventory(voucher, item, batch_consumed)
for item in issue_create_journals(voucher.inventories, source, destination):
@@ -62,9 +62,9 @@ def issue_create_journals(inventories, source, destination):
for item in inventories:
amount += item.amount
return [Journal(debit=-1, ledger_id=LedgerBase.all_purchases(), amount=round(amount, 2),
- cost_center_id=source),
+ cost_centre_id=source),
Journal(debit=1, ledger_id=LedgerBase.all_purchases(), amount=round(amount, 2),
- cost_center_id=destination)]
+ cost_centre_id=destination)]
def issue_update_voucher(voucher, json, user):
@@ -75,22 +75,22 @@ def issue_update_voucher(voucher, json, user):
for item in voucher.journals:
if item.debit == 1:
- destination = item.cost_center_id
+ destination = item.cost_centre_id
else:
- source = item.cost_center_id
- old_batch_consumed = True if source == CostCenter.cost_center_purchase() else False if destination == CostCenter.cost_center_purchase() else None
+ source = item.cost_centre_id
+ old_batch_consumed = True if source == CostCentre.cost_centre_purchase() else False if destination == CostCentre.cost_centre_purchase() else None
for item in json['Journals']:
if int(item['Debit']) == 1:
- destination = uuid.UUID(item['CostCenter']['CostCenterID'])
+ destination = uuid.UUID(item['CostCentre']['CostCentreID'])
else:
- source = uuid.UUID(item['CostCenter']['CostCenterID'])
+ source = uuid.UUID(item['CostCentre']['CostCentreID'])
if source == destination:
raise ValidationError("Source cannot be the same as destination")
- new_batch_consumed = True if source == CostCenter.cost_center_purchase() else False if destination == CostCenter.cost_center_purchase() else None
+ new_batch_consumed = True if source == CostCentre.cost_centre_purchase() else False if destination == CostCentre.cost_centre_purchase() else None
if new_batch_consumed != old_batch_consumed:
- raise ValidationError("Purchase cost center cannot be changed")
+ raise ValidationError("Purchase cost centre cannot be changed")
issue_update_inventory(voucher, json['Inventories'], old_batch_consumed)
issue_update_journals(voucher, source, destination)
@@ -160,10 +160,10 @@ def issue_update_journals(voucher, source, destination):
for i in range(len(voucher.journals), 0, -1):
item = voucher.journals[i - 1]
if item.debit == -1:
- item.cost_center_id = source
+ item.cost_centre_id = source
item.amount = round(amount, 2)
else:
- item.cost_center_id = destination
+ item.cost_centre_id = destination
item.amount = round(amount, 2)
diff --git a/brewman/views/services/voucher/journal.py b/brewman/views/services/voucher/journal.py
index f0f4bf31..1d4980cf 100644
--- a/brewman/views/services/voucher/journal.py
+++ b/brewman/views/services/voucher/journal.py
@@ -20,7 +20,7 @@ def journal_create_voucher(json, files, user):
journal_id = uuid.UUID(item['JournalID']) if 'JournalID' in item else None
amount = round(Decimal(item['Amount']), 2)
journal = Journal(id=journal_id, amount=amount, debit=int(item['Debit']), ledger_id=ledger.id,
- cost_center_id=ledger.costcenter_id)
+ cost_centre_id=ledger.cost_centre_id)
voucher.journals.append(journal)
DBSession.add(journal)
journals_valid(voucher)
@@ -48,7 +48,7 @@ def journal_update_voucher(voucher, json, files, user):
item.debit = int(j['Debit'])
item.amount = round(Decimal(j['Amount']), 2)
item.ledger_id = ledger.id
- item.cost_center_id = ledger.costcenter_id
+ item.cost_centre_id = ledger.cost_centre_id
newJournals.remove(j)
break
if not found:
@@ -56,7 +56,7 @@ def journal_update_voucher(voucher, json, files, user):
for j in newJournals:
ledger = LedgerBase.by_id(uuid.UUID(j['Ledger']['LedgerID']))
journal = Journal(id=None, amount=round(Decimal(j['Amount']), 2), debit=int(j['Debit']), ledger_id=ledger.id,
- cost_center_id=ledger.costcenter_id)
+ cost_centre_id=ledger.cost_centre_id)
DBSession.add(journal)
voucher.journals.append(journal)
journals_valid(voucher)
diff --git a/brewman/views/services/voucher/purchase.py b/brewman/views/services/voucher/purchase.py
index d3dacba1..e1b41190 100644
--- a/brewman/views/services/voucher/purchase.py
+++ b/brewman/views/services/voucher/purchase.py
@@ -63,9 +63,9 @@ def purchase_create_journals(inventories, ledgerID):
if ledger.id in journals:
journals[ledger.id].amount += item_amount
else:
- journals[ledger.id] = Journal(debit=1, cost_center_id=ledger.costcenter_id, ledger_id=ledger.id,
+ journals[ledger.id] = Journal(debit=1, cost_centre_id=ledger.cost_centre_id, ledger_id=ledger.id,
amount=item_amount)
- journals[otherLedger.id] = Journal(debit=-1, cost_center_id=otherLedger.costcenter_id, ledger_id=otherLedger.id,
+ journals[otherLedger.id] = Journal(debit=-1, cost_centre_id=otherLedger.cost_centre_id, ledger_id=otherLedger.id,
amount=amount)
return list(journals.values())
@@ -168,16 +168,16 @@ def purchase_update_journals(voucher, journals):
if ledger.id in journals:
journals[ledger.id].amount += item.amount
else:
- journals[ledger.id] = Journal(debit=1, cost_center_id=ledger.costcenter_id, ledger_id=ledger.id,
+ journals[ledger.id] = Journal(debit=1, cost_centre_id=ledger.cost_centre_id, ledger_id=ledger.id,
amount=item.amount)
- journals[other_ledger.id] = Journal(debit=-1, cost_center_id=other_ledger.costcenter_id, ledger_id=other_ledger.id,
+ journals[other_ledger.id] = Journal(debit=-1, cost_centre_id=other_ledger.cost_centre_id, ledger_id=other_ledger.id,
amount=amount)
for i in range(len(voucher.journals), 0, -1):
item = voucher.journals[i - 1]
if item.ledger_id in journals:
item.debit = journals[item.ledger_id].debit
item.amount = round(journals[item.ledger_id].amount, 2)
- item.cost_center_id = journals[item.ledger_id].cost_center_id
+ item.cost_centre_id = journals[item.ledger_id].cost_centre_id
del journals[item.ledger_id]
else:
DBSession.delete(item)
diff --git a/brewman/views/services/voucher/purchase_return.py b/brewman/views/services/voucher/purchase_return.py
index a9bc9cf7..65c02b4a 100644
--- a/brewman/views/services/voucher/purchase_return.py
+++ b/brewman/views/services/voucher/purchase_return.py
@@ -57,9 +57,9 @@ def purchase_return_create_journals(inventories, ledgerID):
if ledger.id in journals:
journals[ledger.id].amount += round(item.amount, 2)
else:
- journals[ledger.id] = Journal(debit=-1, cost_center_id=ledger.costcenter_id, ledger_id=ledger.id,
+ journals[ledger.id] = Journal(debit=-1, cost_centre_id=ledger.cost_centre_id, ledger_id=ledger.id,
amount=round(item.amount, 2))
- journals[otherLedger.id] = Journal(debit=1, cost_center_id=otherLedger.costcenter_id, ledger_id=otherLedger.id,
+ journals[otherLedger.id] = Journal(debit=1, cost_centre_id=otherLedger.cost_centre_id, ledger_id=otherLedger.id,
amount=amount)
return list(journals.values())
@@ -126,16 +126,16 @@ def purchase_return_update_journals(voucher, journals):
if ledger.id in journals:
journals[ledger.id].amount += round(item.amount, 2)
else:
- journals[ledger.id] = Journal(debit=-1, cost_center_id=ledger.costcenter_id, ledger_id=ledger.id,
+ journals[ledger.id] = Journal(debit=-1, cost_centre_id=ledger.cost_centre_id, ledger_id=ledger.id,
amount=round(item.amount, 2))
- journals[otherLedger.id] = Journal(debit=1, cost_center_id=otherLedger.costcenter_id, ledger_id=otherLedger.id,
+ journals[otherLedger.id] = Journal(debit=1, cost_centre_id=otherLedger.cost_centre_id, ledger_id=otherLedger.id,
amount=amount)
for i in range(len(voucher.journals), 0, -1):
item = voucher.journals[i - 1]
if item.ledger_id in journals:
item.debit = journals[item.ledger_id].debit
item.amount = journals[item.ledger_id].amount
- item.cost_center_id = journals[item.ledger_id].cost_center_id
+ item.cost_centre_id = journals[item.ledger_id].cost_centre_id
del journals[item.ledger_id]
else:
DBSession.delete(item)
diff --git a/brewman/views/services/voucher/salary_deduction.py b/brewman/views/services/voucher/salary_deduction.py
index 5f0b7b95..afb5bd6a 100644
--- a/brewman/views/services/voucher/salary_deduction.py
+++ b/brewman/views/services/voucher/salary_deduction.py
@@ -22,11 +22,11 @@ def salary_deduction_create_voucher(json, user):
exp += item_exp
total += item_total
ledger = LedgerBase.by_id(LedgerBase.esi_pf_expense())
- journal = Journal(amount=exp, debit=1, ledger_id=ledger.id, cost_center_id=ledger.costcenter_id)
+ journal = Journal(amount=exp, debit=1, ledger_id=ledger.id, cost_centre_id=ledger.cost_centre_id)
DBSession.add(journal)
voucher.journals.append(journal)
ledger = LedgerBase.by_id(LedgerBase.esi_pf_payable())
- journal = Journal(amount=total, debit=-1, ledger_id=ledger.id, cost_center_id=ledger.costcenter_id)
+ journal = Journal(amount=total, debit=-1, ledger_id=ledger.id, cost_centre_id=ledger.cost_centre_id)
DBSession.add(journal)
voucher.journals.append(journal)
@@ -81,7 +81,7 @@ def add_salary_deduction(item, days_in_month, voucher):
days_worked = int(item['DaysWorked'])
esi_ee, esi_er, esi_both = esi_contribution(gross_salary, days_worked, days_in_month)
pf_ee, pf_er, pf_both = pf_contribution(gross_salary, days_worked, days_in_month)
- journal = Journal(amount=esi_ee + pf_ee, debit=1, ledger_id=ledger.id, cost_center_id=ledger.costcenter_id)
+ journal = Journal(amount=esi_ee + pf_ee, debit=1, ledger_id=ledger.id, cost_centre_id=ledger.cost_centre_id)
sd = SalaryDeduction(journal=journal, gross_salary=gross_salary, days_worked=days_worked, esi_ee=esi_ee,
pf_ee=pf_ee, esi_er=esi_er, pf_er=pf_er)
voucher.journals.append(journal)
diff --git a/brewman/views/services/voucher/save_voucher.py b/brewman/views/services/voucher/save_voucher.py
index b38ce5b5..f4b9942c 100644
--- a/brewman/views/services/voucher/save_voucher.py
+++ b/brewman/views/services/voucher/save_voucher.py
@@ -2,7 +2,6 @@ import uuid
from json import loads
import datetime
-from pyramid.security import authenticated_userid
from pyramid.view import view_defaults, view_config
import transaction
@@ -12,6 +11,7 @@ from brewman.models.voucher import Voucher
from brewman.views import get_lock_info
from brewman.views.services.session import session_current_date_set
from . import voucher_info, journal_create_voucher, purchase_create_voucher, issue_create_voucher
+from . import service_charge_create_voucher
from .purchase_return import purchase_return_create_voucher
from .salary_deduction import salary_deduction_create_voucher
@@ -38,7 +38,7 @@ class save_voucher(object):
return model, files
self.request = request
- self.user = User.by_id(uuid.UUID(authenticated_userid(request)))
+ self.user = User.by_id(uuid.UUID(request.authenticated_userid))
self.json, self.files = parse_post(request)
self.start, self.finish = get_lock_info()
self.voucher_date = datetime.datetime.strptime(self.json['Date'], '%d-%b-%Y')
@@ -77,6 +77,10 @@ class save_voucher(object):
def salary_deduction(self):
return self.save()
+ @view_config(request_param='type=Service Charge', permission='Service Charge')
+ def salary_deduction(self):
+ return self.save()
+
@TryCatchFunction
def save(self):
if self.start is not None and self.start > self.voucher_date:
@@ -94,6 +98,8 @@ class save_voucher(object):
voucher = issue_create_voucher(self.json, self.user)
elif self.json['Type'] in ['Salary Deduction']:
voucher = salary_deduction_create_voucher(self.json, self.user)
+ elif self.json['Type'] in ['Service Charge']:
+ voucher = service_charge_create_voucher(self.json, self.user)
transaction.commit()
session_current_date_set(self.request, self.json['Date'])
return voucher_info(Voucher.by_id(voucher.id), self.request)
diff --git a/brewman/views/services/voucher/service_charge.py b/brewman/views/services/voucher/service_charge.py
new file mode 100644
index 00000000..721df5de
--- /dev/null
+++ b/brewman/views/services/voucher/service_charge.py
@@ -0,0 +1,132 @@
+import datetime
+from decimal import Decimal
+import uuid
+
+from sqlalchemy import or_, func
+
+from brewman.models import DBSession
+from brewman.models.master import Employee, AttendanceType, Ledger
+from brewman.models.operations import journals_valid
+from brewman.models.voucher import Journal, Voucher, VoucherType, Attendance, ServiceCharge
+from brewman.views.services.session import get_first_day
+
+
+__author__ = 'tanshu'
+
+
+def service_charge_create_voucher(json, user):
+ date = datetime.datetime.strptime(json['Date'], '%d-%b-%Y')
+
+ voucher = Voucher(date=date, user_id=user.id, type=VoucherType.by_id(13))
+ DBSession.add(voucher)
+
+ employees = get_employees(get_first_day(date), date + datetime.timedelta(1), json['ServiceCharges'])
+ amount = balance(date) * Decimal(.7) * Decimal(.9)
+
+ total_points = 0
+ for item in employees:
+ total_points += item['Points'] * item['DaysWorked']
+ point_value = round(amount / total_points, 2)
+ total_amount = 0
+
+ for item in employees:
+ item_amount = round(item['Points'] * item['DaysWorked'] * point_value)
+ employee = item['Employee']
+ journal = Journal(amount=item_amount, debit=-1, ledger_id=employee.id, cost_centre_id=employee.cost_centre_id)
+ sc = ServiceCharge(journal=journal, days_worked=item['DaysWorked'], points=item['Points'])
+ voucher.journals.append(journal)
+ voucher.service_charges.append(sc)
+ DBSession.add(journal)
+ DBSession.add(sc)
+ total_amount += item_amount
+
+ sc = Ledger.by_id(Ledger.service_charge_id())
+ journal = Journal(amount=total_amount, debit=1, ledger_id=sc.id, cost_centre_id=sc.cost_centre_id)
+ voucher.journals.append(journal)
+ DBSession.add(journal)
+ journals_valid(voucher)
+ return voucher
+
+
+def service_charge_update_voucher(voucher, json, user):
+ date = datetime.datetime.strptime(json['Date'], '%d-%b-%Y')
+ voucher.date = date
+ voucher.user_id = user.id
+ voucher.posted = False
+ voucher.last_edit_date = datetime.datetime.utcnow()
+
+ employees = get_employees(get_first_day(date), date + datetime.timedelta(1), json['ServiceCharges'], voucher.journals)
+ amount = balance(date, voucher.id) * Decimal(.7) * Decimal(.9)
+
+ total_points = 0
+ for item in employees:
+ total_points += item['Points'] * item['DaysWorked']
+ point_value = round(amount / total_points, 2)
+ total_amount = 0
+
+ for item in voucher.service_charges:
+ employee = [e for e in employees if e['Employee'].id == item.journal.ledger_id][0]
+ item_amount = round(employee['Points'] * employee['DaysWorked'] * point_value)
+ item.days_worked = employee['DaysWorked']
+ item.points = employee['Points']
+ item.journal.amount = item_amount
+ total_amount += item_amount
+
+ journal = [j for j in voucher.journals if j.ledger_id == Ledger.service_charge_id()][0]
+ journal.amount = total_amount
+
+ journals_valid(voucher)
+ return voucher
+
+
+def get_employees(start_date, finish_date, json, voucher_employees=None):
+ details = []
+ employees = DBSession().query(Employee) \
+ .filter(Employee.joining_date <= finish_date) \
+ .filter(or_(Employee.is_active, Employee.leaving_date >= start_date)) \
+ .order_by(Employee.cost_centre_id).order_by(Employee.designation).order_by(Employee.name).all()
+
+ check_if_employees_changed(json, employees, voucher_employees)
+
+ for employee in employees:
+ att = DBSession.query(Attendance) \
+ .filter(Attendance.employee_id == employee.id) \
+ .filter(Attendance.date >= start_date) \
+ .filter(Attendance.date < finish_date) \
+ .filter(Attendance.is_valid == True) \
+ .all()
+ att = sum(map(lambda x: AttendanceType.by_id(x.attendance_type).value, att))
+ details.append({'Employee': employee, 'DaysWorked': round(Decimal(att), 2)})
+ for item in details:
+ j = [x for x in json if uuid.UUID(x['EmployeeID']) == item['Employee'].id][0]
+ item['Points'] = round(Decimal(j['Points']), 2)
+ json.remove(j)
+ return details
+
+
+def balance(date, voucher_id=None):
+ amount = DBSession.query(func.sum(Journal.amount * Journal.debit)) \
+ .join(Journal.voucher) \
+ .filter(Voucher.date < date + datetime.timedelta(1)) \
+ .filter(Voucher.type != VoucherType.by_name('Issue').id) \
+ .filter(Journal.ledger_id == Ledger.service_charge_id())
+ if voucher_id is not None:
+ amount = amount.filter(Voucher.id != voucher_id)
+ amount = amount.scalar()
+ return 0 if amount is None else amount * -1
+
+
+def check_if_employees_changed(json, db, voucher):
+ json = set([uuid.UUID(x['EmployeeID']) for x in json])
+ db = set([x.id for x in db])
+ voucher = set([x.ledger_id for x in voucher]) if voucher is not None else None
+ if voucher is None:
+ if len(json) != len(db):
+ raise ValueError("Employee missing in json data")
+ if len(json ^ db) != 0:
+ raise ValueError("Employee missing in json data")
+ else:
+ if len(json) != len(db) != len(voucher):
+ raise ValueError("Employee missing in json data")
+ if len(json ^ db) != 0 or len(db ^ voucher) != 0:
+ raise ValueError("Employee missing in json data")
\ No newline at end of file
diff --git a/brewman/views/services/voucher/update_voucher.py b/brewman/views/services/voucher/update_voucher.py
index 13d7fb1f..55380640 100644
--- a/brewman/views/services/voucher/update_voucher.py
+++ b/brewman/views/services/voucher/update_voucher.py
@@ -1,20 +1,23 @@
import datetime
from json import loads
import uuid
+
from pyramid.response import Response
-from pyramid.security import authenticated_userid
from pyramid.view import view_defaults, view_config
import transaction
+
from brewman import groupfinder
from brewman.models.auth import User
-from brewman.models.validation_exception import ValidationError, TryCatchFunction
+from brewman.models.validation_exception import TryCatchFunction
from brewman.models.voucher import Voucher
from brewman.views import get_lock_info
from brewman.views.services.session import session_current_date_set
from . import voucher_info, issue_update_voucher, purchase_update_voucher, journal_update_voucher
+from . import service_charge_update_voucher
from brewman.views.services.voucher.purchase_return import purchase_return_update_voucher
from brewman.views.services.voucher.salary_deduction import salary_deduction_update_voucher
+
__author__ = 'tanshu'
@@ -37,13 +40,12 @@ class update_voucher(object):
return model, files
self.request = request
- self.user = User.by_id(uuid.UUID(authenticated_userid(request)))
+ self.user = User.by_id(uuid.UUID(request.authenticated_userid))
self.voucher = Voucher.by_id(uuid.UUID(request.matchdict.get('id', None)))
self.json, self.files = parse_post(request)
self.start, self.finish = get_lock_info()
self.voucher_date = datetime.datetime.strptime(self.json['Date'], '%d-%b-%Y')
-
permissions = groupfinder(self.user.id, self.request)
if self.voucher.posted and not 'Edit Posted Vouchers' in permissions:
response = Response("You are not allowed to edit posted vouchers")
@@ -98,6 +100,10 @@ class update_voucher(object):
def salary_deduction(self):
return self.update()
+ @view_config(request_param='type=Service Charge', permission='Service Charge')
+ def service_charge(self):
+ return self.update()
+
@TryCatchFunction
def update(self):
if self.error is not None:
@@ -112,6 +118,8 @@ class update_voucher(object):
voucher = issue_update_voucher(self.voucher, self.json, self.user)
elif self.json['Type'] in ['Salary Deduction']:
voucher = salary_deduction_update_voucher(self.voucher, self.json, self.user)
+ elif self.json['Type'] in ['Service Charge']:
+ voucher = service_charge_update_voucher(self.voucher, self.json, self.user)
transaction.commit()
session_current_date_set(self.request, self.json['Date'])
return voucher_info(Voucher.by_id(voucher.id), self.request)