diff --git a/client/src/css/structure.css b/client/src/css/structure.css index 39be218b9e..7b7eba63ed 100644 --- a/client/src/css/structure.css +++ b/client/src/css/structure.css @@ -842,3 +842,8 @@ growl-notification.fading.ng-leave.ng-leave-active { .ui-select-bootstrap > .ui-select-choices.ui-grid-ui-select { width: initial; } + +/* fix weird whitespace at the top of grids. */ +.ui-grid-canvas { + padding-top : 0; +} diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json index 12c30c348e..1527b8abaa 100644 --- a/client/src/i18n/en.json +++ b/client/src/i18n/en.json @@ -648,6 +648,7 @@ "TRANSACTION" : "Transaction", "TRANSFER_ACCOUNT" : "Transfer Account", "TRANSFER_TYPE" : "Transfer Type", + "TRANSACTION_TYPE" : "Transaction Type", "TYPE" : "Type", "UNCONFIGURED" : "Unconfigured", "UNDEFINED" : "Undefined", diff --git a/client/src/js/services/PatientInvoiceForm.js b/client/src/js/services/PatientInvoiceForm.js index b08a61ed1a..ea5808f525 100644 --- a/client/src/js/services/PatientInvoiceForm.js +++ b/client/src/js/services/PatientInvoiceForm.js @@ -14,8 +14,6 @@ PatientInvoiceFormService.$inject = [ * with the Patient PatientInvoiceForm module. You must specify a cacheKey to enable the * class to be instantiated correctly. * - * @todo (required) discuss if all subsidies/billings services are all - * percentages. If so, the logic can be simplified. * @todo (required) only the maximum of the bill should be subsidised * @todo (required) billing services and subsidies should be ignored for * specific debtors. diff --git a/client/src/js/services/VoucherService.js b/client/src/js/services/VoucherService.js index 3aedad7149..9a17600ce1 100644 --- a/client/src/js/services/VoucherService.js +++ b/client/src/js/services/VoucherService.js @@ -2,8 +2,7 @@ angular.module('bhima.services') .service('VoucherService', VoucherService); VoucherService.$inject = [ - 'PrototypeApiService', '$http', 'util', - 'TransactionTypeStoreService' + 'PrototypeApiService', '$http', 'util', 'TransactionTypeStoreService' ]; /** diff --git a/client/src/js/services/util.js b/client/src/js/services/util.js index 354122e10c..c9b299639e 100644 --- a/client/src/js/services/util.js +++ b/client/src/js/services/util.js @@ -183,7 +183,24 @@ function UtilService(moment) { // if we haven't seen the value yet, add it to the array (otherwise, ignore it). if (uniq.indexOf(value) === -1) { uniq.push(value); } return uniq; - }, []); // initialize with an empty array }; + + + /** + * @function xor + * + * @description + * Returns the logical XOR of two booleans. + * + * @param {Boolean} a - a boolean value to XOR with b + * @param {Boolean} b - a boolean value to XOR with a + * + * @returns {Boolean} - the result + */ + service.xor = function xor(a, b) { + /*jshint -W018 */ + return !a !== !b; + /*jshint +W018 */ + }; } diff --git a/client/src/partials/patient_invoice/templates/grid/status.tmpl.html b/client/src/partials/patient_invoice/templates/grid/status.tmpl.html index 7fbe6fe1d7..7311006dd5 100644 --- a/client/src/partials/patient_invoice/templates/grid/status.tmpl.html +++ b/client/src/partials/patient_invoice/templates/grid/status.tmpl.html @@ -13,7 +13,7 @@ +
-
diff --git a/client/src/partials/reports/modals/cashflow.config.js b/client/src/partials/reports/modals/cashflow.config.js index 371e843878..aaf7edbd24 100644 --- a/client/src/partials/reports/modals/cashflow.config.js +++ b/client/src/partials/reports/modals/cashflow.config.js @@ -19,22 +19,21 @@ function CashflowConfigController($state, ModalInstance, Cashbox, Notify, Langua vm.cancel = ModalInstance.dismiss; vm.report = report; - vm.$loading = false; - - Cashbox.read(null, { detailed: 1, is_auxiliary: 0}) - .then(function (list) { - list.forEach(function (cashbox) { - cashbox.hrlabel = cashbox.label + ' ' + cashbox.symbol; - }); - vm.cashboxes = list; - }) - .catch(Notify.handleError); - - function generate() { - var url = 'reports/finance/cashflow'; - if (!vm.cashbox || !vm.dateFrom || !vm.label || !vm.dateTo) { return ; } + Cashbox.read(null, { detailed: 1 }) + .then(function (cashboxes) { + + cashboxes.forEach(function (cashbox) { + cashbox.hrlabel = cashbox.label + ' ' + cashbox.symbol; + }); + + vm.cashboxes = cashboxes; + }) + .catch(Notify.handleError); - vm.$loading = true; + function generate(form) { + if (form.$invalid) { return; } + + var url = 'reports/finance/cashflow'; var options = { account_id: vm.cashbox.account_id, @@ -45,16 +44,11 @@ function CashflowConfigController($state, ModalInstance, Cashbox, Notify, Langua weekly : vm.weekly }; - SavedReports.requestPDF(url, report, options) + return SavedReports.requestPDF(url, report, options) .then(function (result) { ModalInstance.dismiss(); $state.reload(); }) - .catch(function (error) { - throw error; - }) - .finally(function () { - vm.$loading = false; - }); + .catch(Notify.handleError); } } diff --git a/client/src/partials/reports/modals/cashflow.modal.html b/client/src/partials/reports/modals/cashflow.modal.html index c2340462e5..7afcfd5f2d 100644 --- a/client/src/partials/reports/modals/cashflow.modal.html +++ b/client/src/partials/reports/modals/cashflow.modal.html @@ -1,71 +1,71 @@
    -
  1. {{ ReportConfigCtrl.report.title_key | translate }}
    2. -
  2. {{ "FORM.LABELS.CREATE" | translate }}
    3. +
  3. + {{ ReportConfigCtrl.report.title_key | translate }} + {{ "FORM.LABELS.CREATE" | translate }} +
-
-
-
- - + +
-
-
-
+
+ + -
- - - +
+
+
+
- -
- -
+ + + + +
+ +
- -
- - -
-
+ +
+ + +
+
+
-
-
- +
+ - - + {{ "FORM.BUTTONS.GENERATE" | translate }} - -
+
diff --git a/client/src/partials/vouchers/VoucherForm.service.js b/client/src/partials/vouchers/VoucherForm.service.js new file mode 100644 index 0000000000..2dfdef7b26 --- /dev/null +++ b/client/src/partials/vouchers/VoucherForm.service.js @@ -0,0 +1,300 @@ +angular.module('bhima.services') + .service('VoucherForm', VoucherFormService); + +VoucherFormService.$inject = [ + 'VoucherService', 'bhConstants', 'SessionService', 'VoucherItemService', + 'CashboxService', 'AppCache', 'Store', 'AccountService' +]; + +/** + * @class VoucherFormService + * + * @description + * This wraps the journal voucher form + * + */ +function VoucherFormService(Vouchers, Constants, Session, VoucherItem, Cashboxes, AppCache, Store, Accounts) { + + var ROW_ERROR_FLAG = Constants.grid.ROW_ERROR_FLAG; + + // Error Flags + var ERROR_MISSING_TRANSACTION_TYPE = 'VOUCHERS.COMPLEX.ERROR_TYPE'; // must have transaction_type for certain cases + var ERROR_IMBALANCED_TRANSACTION = 'VOUCHERS.COMPLEX.IMBALANCED_TRANSACTION'; // must have sum(debits) === sum(credits) + var ERROR_SINGLE_ACCOUNT_TRANSACTION = 'VOUCHERS.COMPLEX.SINGLE_ACCOUNT_TRANSACTION'; // must have > 1 unique accounts + var ERROR_SINGLE_ROW_TRANSACTION = 'VOUCHERS.COMPLEX.SINGLE_ROW_TRANSACTION'; // must have > 1 rows + + // applied to the reduce + function sumDebitsAndCredits(aggregates, row) { + aggregates.debit += row.debit || 0; + aggregates.credit += row.credit || 0; + return aggregates; + } + + /** + * @function calculateItemTotals + * @param {Array} items - the array of voucher items + * @returns {Object} - totals object with aggregate debit and credit + * + * @description + * This function loops through the items and aggregates the debits and credits + * into an aggregate object. + */ + function calculateItemTotals(items) { + return items.reduce(sumDebitsAndCredits, { debit : 0, credit : 0 }); + } + + /** + * @function buildDescription + * @param {Object} voucher - the voucher object. + * + * @description + * This method builds the voucher description based on whether it has a type + * set or not. The type is factored in it if exists. + */ + function buildDescription(voucher) { + var type = voucher.type_id, + date = voucher.date, + description = String(Session.project.abbr).concat('/VOUCHER'); + + // if there is a journal voucher type, note it. + if (type) { + type = JSON.parse(type); + description = description.concat('/', type.prefix); + } + + description = description.concat('/', date.toDateString()); + + return description; + } + + /** @constructor */ + function VoucherForm(cacheKey) { + + if (!cacheKey) { + throw new Error( + 'VoucherForm expected a cacheKey, but it was not provided.' + ); + } + + // bind the cache key + this.cache = AppCache(cacheKey); + + // this is the overarching details of the voucher to be filled in + this.details = {}; + + // cash accounts require a certain voucher type + this.cashAccounts = []; + var self = this; + + // load cashboxes for their accounts. + Cashboxes.read() + .then(function (cashboxes) { + + self.cashAccounts = cashboxes + + // collect a lost of all cashbox acounts + .reduce(function (accounts, cashbox) { + return accounts.concat([ cashbox.account_id, cashbox.transfer_account_id ]); + }, []) + + // make sure the list is unique + .filter(function (account, index, accounts) { + return accounts.indexOf(account) === index; + }); + + // self.cashAccounts is now a proper list of unique cash account ids + // that can be used to determine if a voucher type is required. + }); + + Accounts.read() + .then(function (accounts) { + self.accounts = Accounts.order(accounts); + }); + + /* @todo + Vouchers.transactionType() + .then(function (types) { + groupType( + }); + */ + + // this will contain the grid rows + this.store = new Store({ identifier: 'uuid', data : [] }); + + // run the setup function + this.setup(); + } + + /** + * @function validate + * + * @description + * This function is called on the journal voucher items to run validation + * checks against each item, returning the global validation state. If there + * is an error in any single line item, that error is set on the form. + * + * It also performs validation to check if a type_id is required for the + * voucher. Voucher types are required if any of the concerned accounts are + * cashbox accounts. + */ + VoucherForm.prototype.validate = function validate() { + var items = this.store.data; + + // calculate the totals for the data + this.totals = calculateItemTotals(items); + + var err; + var cashAccounts = this.cashAccounts; + var hasTypeId = angular.isDefined(this.details.type_id); + + // this array will store unique accounts + var uniqueAccountsArray = []; + + // this will store the validity condition. We could use array.every() but it + // seems like Chrome greedily exits if a false condition is it. + var valid; + + // loop through each row, checking the amounts and accounts of each item. + items.forEach(function (item, index) { + valid = item.validate(); + + // if the row has an error, save it as the form error + if (item._error) { + err = item._error; + } + + // if there is a cashbox account used, the voucher type_id is required + var hasCashboxAccount = cashAccounts.indexOf(item.account_id) > -1; + if (hasCashboxAccount && !hasTypeId) { + err = ERROR_MISSING_TRANSACTION_TYPE; + } + + // if there unique accounts array does not have this account, add it. + if (uniqueAccountsArray.indexOf(item.account_id) === -1) { + uniqueAccountsArray.push(item.account_id); + } + }); + + // validate that this uses multiple accounts in the transaction + var hasUniqueAccounts = (uniqueAccountsArray.length > 1); + if (!hasUniqueAccounts) { + err = ERROR_SINGLE_ACCOUNT_TRANSACTION; + } + + // validate that the number of rows in the grid is > 1 + var hasEnoughRows = (items.length > 1); + if (!hasEnoughRows) { + err = ERROR_SINGLE_ROW_TRANSACTION; + } + + var hasBalancedDebitsAndCredits = (this.totals.debit === this.totals.credit); + if (!hasBalancedDebitsAndCredits) { + err = ERROR_IMBALANCED_TRANSACTION; + } + + // attach error to the form + this._error = err; + + console.log('error:', err); + + // return the boolean condition to the caller + return valid && hasUniqueAccounts; + }; + + /** + * @method setup + * + * @description + * This function initializes the journal voucher form with data. By default, + * two lines are always present in the form. + */ + VoucherForm.prototype.setup = function setup() { + this.details = {}; + this.details.date = new Date(); + this.details.currency_id = Session.enterprise.currency_id; + + this.addItems(2); + }; + + // this is called whenever a change is made to the grid + VoucherForm.prototype.onChanges = function onChanges() { + this.validate(); + }; + + VoucherForm.prototype.configureRow = function configureRow(row) { + row.configure(row); + this.validate(); + }; + + /** + * @method addItems + * + * @description + * Adds an item to the voucher grid. This function is called when from the + * view to add an uninitialized item into the voucher ui-grid. + * + * @param {Number} n - the number of items to add to the grid + */ + VoucherForm.prototype.addItems = function addItems(n) { + while (n--) { + this.store.post(new VoucherItem()); + } + }; + + /** + * @method removeItem + * + * @description + * This method removes an item from the ui-grid by its index. + */ + VoucherForm.prototype.removeItem = function removeItem(uuid) { + return this.store.remove(uuid); + }; + + /** + * @method clear + * + * @description + * This method clears the entire grid, removing all items from the grid. + */ + VoucherForm.prototype.clear = function clear() { + this.store.clear(); + this.setup(); + this.validate(); + }; + + /** + * @method writeCache + * + * @description + * This method writes values from the voucher into the application cache for + * later recovery. + */ + VoucherForm.prototype.writeCache = function writeCache() { + this.cache.details = this.details; + this.cache.items = angular.copy(this.store.data); + }; + + /** + * @method clearCache + * + * @description + * This method deletes the items from the application cache. + */ + VoucherForm.prototype.clearCache = function clearCache() { + delete this.cache.details; + delete this.cache.items; + }; + + /** + * @method hasCacheAvailable + * + * @description + * Checks to see if the invoice has cached items to recover. + */ + VoucherForm.prototype.hasCacheAvailable = function hasCacheAvailable() { + return Object.keys(this.cache).length > 0; + }; + + return VoucherForm; +} diff --git a/client/src/partials/vouchers/VoucherItem.service.js b/client/src/partials/vouchers/VoucherItem.service.js new file mode 100644 index 0000000000..bbf986b831 --- /dev/null +++ b/client/src/partials/vouchers/VoucherItem.service.js @@ -0,0 +1,133 @@ +angular.module('bhima.services') + .service('VoucherItemService', VoucherItemService); + +VoucherItemService.$inject = [ 'uuid', 'bhConstants', 'util' ]; + +/** + * @class VoucherItemService + * + * @description + * This class implements the defaults for a patient invoice item. The class is + * instantiated with every row of the Patient Invoice module's grid. It + * implements the following convenience methods: + * 1. validate() - sets the `_valid` and `_invalid` flags on the row + * 2. configure() - sets up the row's inventory item reference + */ +function VoucherItemService(uuid, Constants, util) { + + // global variables + var MIN_DECIMAL_VALUE = Constants.lengths.minDecimalValue; + var MIN_PRECISION_VALUE = getDecimalPrecision(MIN_DECIMAL_VALUE); + + /** + * @function getDecimalPrecision + * @param {Number} value - a numeric value + * @description + * This function gets the precision (the number of values after the + * decimal point) of a numeric value. + * @private + */ + function getDecimalPrecision(value) { + var valueString = String(value); + var decimalPart = valueString.split('.')[1] || []; + return decimalPart.length; + } + + /** @constructor */ + function VoucherItem(item) { + this.debit = 0; + this.credit = 0; + this.uuid = uuid(); + + // validation state + this._valid = false; + this._invalid = !this._valid; + + // this is set to true where the account_id is configured + this._initialized = false; + + // this will be the error + this._error = undefined; + + // the item is initialized with an object, immediately configure + // based on that object + if (item) { + this.configure(item); + } + } + + /** + * @method validate + * + * @description + * Runs validation on the journal voucher item rows. It performs the following checks: + * 1) Has an account_id + * 2) Has either a debit or a credit + * 3) Has a debit or credit above the min + * + * It will set both the this._valid and this._error properties on itself + */ + VoucherItem.prototype.validate = function validate() { + var item = this; + + // checks that the row is initialised + var initialized = angular.isDefined(item.account_id); + + var debitPrecision = getDecimalPrecision(item.debit); + var creditPrecision = getDecimalPrecision(item.credit); + + // checks that the decimal precision is able to be stored in the database correctly + var hasValidPrecision = ( + debitPrecision <= MIN_PRECISION_VALUE && + creditPrecision <= MIN_PRECISION_VALUE + ); + + // check that only one column - debit or credit is filled out + var hasSingleNumericValue = util.xor(Boolean(item.debit), Boolean(item.credit)); + + // check that the values are greater than zero + var hasPositiveValues = (item.debit >= 0 && item.credit >= 0); + + // set the initialized property + this._initialised = initialized; + + this._valid = initialized && + hasValidPrecision && + hasSingleNumericValue && + hasPositiveValues; + + this._invalid = !this._valid; + + // if invalid, set the error appropriately + if (this._invalid) { + + if (!initialized) { + this._error = 'FORM.ERRORS.NOT_INITIALIZED'; + } else if (!hasValidPrecision) { + this._error = 'VOUCHERS.COMPLEX.ERROR_PRECISION'; + } else if (!hasSingleNumericValue) { + this._error = 'VOUCHERS.COMPLEX.ERROR_AMOUNT'; + } else if (!hasPositiveValues) { + this._error = 'VOUCHERS.COMPLEX.ERRORS_NEGATIVE_VALUES'; + } + + // if not invalid, remove the error message + } else { + this._error = ''; + } + }; + + /** + * @method configure + * + * @description + * This function configures the voucher form with an account selected from + * the ui-select. + */ + VoucherItem.prototype.configure = function configure(item) { + this.account_id = item.account_id; + this._initialized = true; + }; + + return VoucherItem; +} diff --git a/client/src/partials/vouchers/complex.html b/client/src/partials/vouchers/complex.html index dbd434a2b2..706385d83e 100644 --- a/client/src/partials/vouchers/complex.html +++ b/client/src/partials/vouchers/complex.html @@ -13,10 +13,12 @@
+
@@ -33,10 +35,11 @@ ({{ 'VOUCHERS.SIMPLE.INCOME' | translate }}) ({{ 'VOUCHERS.SIMPLE.EXPENSE' | translate }}) + @@ -50,33 +53,37 @@
-
+
+

@@ -88,59 +95,70 @@

-
-
- -
+
- -
- - - {{ 'FORM.LABELS.TRANSACTION' | translate }}s - - + +
- -
+ +
+ + + +
+
+
- -
- - - - {{ ComplexVoucherCtrl.notifyMessage.label | translate }} - - + +
+
- - {{ "FORM.BUTTONS.SUBMIT" | translate }} - -
+
+
+

+ {{ ComplexVoucherCtrl.Voucher._error | translate }} +

+
+ +
+ + + + {{ "FORM.BUTTONS.SUBMIT" | translate }} +
diff --git a/client/src/partials/vouchers/complex.js b/client/src/partials/vouchers/complex.js index 1633208ad8..dae5702f33 100644 --- a/client/src/partials/vouchers/complex.js +++ b/client/src/partials/vouchers/complex.js @@ -1,11 +1,11 @@ angular.module('bhima.controllers') -.controller('ComplexJournalVoucherController', ComplexJournalVoucherController); + .controller('ComplexJournalVoucherController', ComplexJournalVoucherController); ComplexJournalVoucherController.$inject = [ - 'VoucherService', '$translate', 'AccountService', 'CurrencyService', - 'SessionService', 'FindEntityService', 'FindReferenceService', - 'NotifyService', 'CashboxService', 'VoucherToolkitService', 'ReceiptModal', - 'bhConstants', 'GridAggregatorService', 'uiGridConstants' + 'VoucherService', '$translate', 'CurrencyService', 'SessionService', + 'FindEntityService', 'FindReferenceService', 'NotifyService', + 'VoucherToolkitService', 'ReceiptModal', 'bhConstants', 'GridAggregatorService', + 'uiGridConstants', 'VoucherForm' ]; /** @@ -17,14 +17,30 @@ ComplexJournalVoucherController.$inject = [ * @constructor * * @todo - Implement caching mechanism for incomplete forms (via AppCache) - * @todo - Implement Patient Invoices data and Cash Payment data for modal - * @todo - Implement a mean to categorise transactions for cashflow reports * @todo/@fixme - this error notification system needs serious refactor. */ -function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currencies, Session, FindEntity, FindReference, Notify, Cashbox, Toolkit, Receipts, bhConstants, GridAggregators, uiGridConstants) { +function ComplexJournalVoucherController(Vouchers, $translate, Currencies, Session, FindEntity, FindReference, Notify, Toolkit, Receipts, bhConstants, GridAggregators, uiGridConstants, VoucherForm) { var vm = this; + // bind constants vm.bhConstants = bhConstants; + vm.enterprise = Session.enterprise; + vm.itemIncrement = 1; + vm.timestamp = new Date(); + + // bind the complex voucher form + vm.Voucher = new VoucherForm('ComplexVouchers'); + + // fired to clear the grid + vm.clear = function clear() { + vm.Voucher.clear(); + }; + + // fired on changes + vm.onChanges = function onChanges() { + vm.Voucher.onChanges(); + vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.EDIT); + }; // bread crumb paths vm.paths = [{ @@ -40,14 +56,11 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc option: Toolkit.options }]; - // global variables - var MIN_DECIMAL_VALUE= bhConstants.lengths.minDecimalValue; - var MIN_PRECISION_VALUE = getDecimalPrecision(MIN_DECIMAL_VALUE); - // ui-grid options vm.gridOptions = { appScopeProvider : vm, - fastWatch : true, + //fastWatch : true, + flatEntityAccess : true, enableSorting : false, enableColumnMenus : false, showColumnFooter : true, @@ -74,11 +87,9 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc vm.rows = result.rows; vm.rows.forEach(function (item) { - checkRowValidity(item.index); }); - vm.gridOptions.data = vm.rows; - refreshState(); + // vm.gridOptions.data = vm.rows; conventionPaymentDetails(result.convention); }); } @@ -86,34 +97,24 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc // set convention payment details function conventionPaymentDetails(convention) { vm.financialTransaction = true; + var conventionType = vm.incomes.filter(function (item) { return item.id === 3; })[0]; + vm.voucher.type_id = JSON.stringify(conventionType); vm.voucher.description = convention.name; vm.defaultIncomeTypeId = 3; - buildDescription(); } /** ======================== end voucher tools ======================= */ - // bind the startup method as a reset method vm.submit = submit; vm.currencySymbol = currencySymbol; - vm.addVoucherItem = addVoucherItem; - vm.removeVoucherItem = removeVoucherItem; - vm.checkRowValidity = checkRowValidity; vm.openEntityModal = openEntityModal; vm.openReferenceModal = openReferenceModal; - // load the list of accounts - Accounts.read() - .then(function (accounts) { - vm.accounts = accounts; - }) - .catch(Notify.handleError); - // load the available currencies Currencies.read() .then(function (currencies) { @@ -146,208 +147,9 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc return Currencies.symbol(currency_id); } - /** Add transaction row */ - function addVoucherItem() { - vm.rows.push(generateRow()); - refreshState(); - } - - /** remove transaction row */ - function removeVoucherItem(index) { - vm.rows.splice(index, 1); - refreshState(); - } - - /** generate row element */ - function generateRow() { - var index = vm.rows.length || 0; - return { - index : index, - account_id : undefined, - debit : 0, - credit : 0, - document_uuid : undefined, - entity_uuid : undefined - }; - } - - /** clean and generate voucher correct data */ - function handleVoucher() { - - buildDescription(); - - var voucher; - var voucherTypeId = vm.voucher.type_id ? JSON.parse(vm.voucher.type_id).id : null; - var voucherDescription = vm.descriptionPrefix.concat('/', vm.voucher.description); - - if (vm.sumCredit === vm.sumDebit) { - voucher = { - project_id : Session.project.id, - date : vm.voucher.date, - description : voucherDescription, - currency_id : vm.voucher.currency_id, - amount : vm.sumDebit, - user_id : Session.user.id, - type_id : voucherTypeId - }; - } - - return voucher; - } - - /** clean and generate voucher items data */ - function handleVoucherItems() { - var voucherItems; - var account_id; - var entity_uuid; - var document_uuid; - - voucherItems = vm.rows.map(function (row) { - - account_id = row.account && row.account.id ? row.account.id : ''; - entity_uuid = row.entity && row.entity.uuid ? row.entity.uuid : ''; - document_uuid = row.reference && row.reference.uuid ? row.reference.uuid : ''; - - return { - account_id : account_id, - debit : row.debit, - credit : row.credit, - document_uuid : document_uuid, - entity_uuid : entity_uuid - }; - - }); - - return voucherItems; - } - - /** validation function */ - function validRowsInput() { - - // validate amount - var allValidAmount = vm.rows.every(function (row) { - - // must have a one non-zero value - var validAmount = - ((row.debit > 0 && !row.credit) || (!row.debit && row.credit > 0)) && - (angular.isDefined(row.debit) && angular.isDefined(row.credit)); - - return validAmount; - }); - - // validate account - var allValidAccount = vm.rows.every(function (row) { - - // must have an account defined - return row.account && row.account.id; - }); - - var allValidPrecision = vm.rows.every(function (row) { - return ( - getDecimalPrecision(row.debit) <= MIN_PRECISION_VALUE && - getDecimalPrecision(row.credit) <= MIN_PRECISION_VALUE - ); - }); - - // validate that the transaction balances - var totals = vm.rows.reduce(function (aggregate, row) { - aggregate.debit += row.debit; - aggregate.credit += row.credit; - return aggregate; - }, { debit : 0, credit : 0 }); - - var validTotals = totals.debit === totals.credit; - - // use multiple validation - return { - validAmount : allValidAmount, - validAccount : allValidAccount, - validTotals : validTotals, - validPrecision : allValidPrecision - }; - } - - /** check validity and refresh all bonding data */ - function refreshState() { - vm.posted = false; - vm.financialTransaction = false; - vm.rowsInput = validRowsInput(); - - vm.validInput = ( - vm.rowsInput.validAmount && vm.rowsInput.validAccount && - vm.rowsInput.validPrecision && vm.rowsInput.validTotals && - vm.rows.length > 1 - ); - - vm.notifyMessage = - !vm.rowsInput.validAmount ? { icon : 'glyphicon glyphicon-alert', label : 'VOUCHERS.COMPLEX.ERROR_AMOUNT' } : - !vm.rowsInput.validAccount ? { icon : 'glyphicon glyphicon-alert', label : 'VOUCHERS.COMPLEX.ERROR_ACCOUNT' } : - !vm.rowsInput.validTotals ? { icon : 'glyphicon glyphicon-alert', label : 'VOUCHERS.COMPLEX.ERROR_TOTALS' } : - !vm.rowsInput.validPrecision ? { icon : 'glyphicon glyphicon-alert', label : 'VOUCHERS.COMPLEX.ERROR_PRECISION' } : - vm.rowsInput.validTotals && vm.validInput ? { icon : 'glyphicon glyphicon-ok-sign', label : 'VOUCHERS.COMPLEX.VALID_TOTALS' } : - { icon : '', label : '' }; - - summation(); - } - - // get the length of the portion after the decimal point. - function getDecimalPrecision(value) { - var valueString = String(value); - var decimalPart = valueString.split('.')[1] || []; - return decimalPart.length; - } - - /** checking validity of a row */ - function checkRowValidity(index) { - if (angular.isUndefined(index)) { return; } - - var row = vm.rows[index]; - - /** validity of the amount */ - var hasValidAmount = - ((!row.credit && row.debit >= MIN_DECIMAL_VALUE) || (!row.debit && row.credit >= MIN_DECIMAL_VALUE)) && - (angular.isDefined(row.debit) && angular.isDefined(row.credit)); - - /** must have an account defined */ - var hasValidAccount = (row.account && row.account.id); - - // the amounts recorded in each line should have the correct number of - // digits after the decimal point - var hasValidPrecision = ( - getDecimalPrecision(row.debit) <= MIN_PRECISION_VALUE && - getDecimalPrecision(row.credit) <= MIN_PRECISION_VALUE - ); - - /** validity of the row */ - row.isValid = hasValidAccount && hasValidAmount && hasValidPrecision; - row.hasAccount = hasValidAccount; - - /** - * refresh the ui to the real state - * This function does a lot of process but it useful for informing the user - * it notify about : - * -- the validity of all amount given - * -- the validity of totals (balanced or not) - * -- the validity of accounts - * -- the validity of missing values - */ - refreshState(); - - /** - * Check financial account - */ - isFinancial(); - } /** summation */ function summation() { - vm.sumDebit = 0; - vm.sumCredit = 0; - vm.rows.forEach(function (row) { - vm.sumDebit += row.debit; - vm.sumCredit += row.credit; - }); - // if the gridApi is available call the datachange function to recompute footer totals if (vm.gridApi) { vm.gridApi.core.notifyDataChange(uiGridConstants.dataChange.EDIT); @@ -356,75 +158,17 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc /** run the module on startup and refresh */ function startup() { - // init posted variable - vm.posted = false; - - // current timestamp to limit date - vm.timestamp = new Date(); - - // set up default voucher values - vm.voucher = {}; - vm.voucher.date = new Date(); - - // setup the enterprise currency as default - vm.voucher.currency_id = Session.enterprise.currency_id; - - // init voucher items with two rows - vm.rows = []; - vm.rows.push(generateRow()); - vm.rows.push(generateRow()); - vm.gridOptions.data = vm.rows; - - // init sum debit and credit - vm.sumDebit = 0; - vm.sumCredit = 0; - - // init financial accounts - vm.financialAccount = []; - - Cashbox.read(null, { detailed: 1 }) - .then(function (list) { - - list.forEach(function (item) { - - if (vm.financialAccount.indexOf(item.account_id) === -1) { - vm.financialAccount.push(item.account_id); - } - - if (vm.financialAccount.indexOf(item.transfer_account_id) === -1) { - vm.financialAccount.push(item.transfer_account_id); - } - - }); - }) - .catch(Notify.handleError); + vm.gridOptions.data = vm.Voucher.store.data; } - /** check use of financial accounts */ - function isFinancial() { + /* ============================= Transaction Type ============================= */ - vm.financialTransaction = false; - for (var i = 0; i < vm.rows.length; i++) { - if (vm.rows[i].account && vm.financialAccount.indexOf(vm.rows[i].account.id) !== -1) { - vm.financialTransaction = true; - break; - } - } - - // prevent persistent value - vm.voucher.type_id = vm.financialTransaction ? vm.voucher.type_id : null; - - } - - /* ============================= Transfer Type ============================= */ Vouchers.transactionType() .then(function (list) { groupType(list.data); }) .catch(Notify.handleError); - vm.buildDescription = buildDescription; - function groupType(array) { vm.incomes = array.filter(function (item) { return item.type === 'income'; @@ -434,29 +178,6 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc }); } - function buildDescription() { - var type = vm.voucher.type_id, - current = new Date(), - description = String(Session.project.abbr).concat('/VOUCHER'); - - if (type) { - - type = JSON.parse(type); - - vm.type = type.type; - - vm.descriptionPrefix = description - .concat('/', type.prefix) - .concat('/', current.toDateString()); - - } else { - - vm.descriptionPrefix = description.concat('/', current.toDateString()); - - } - - } - /* ============================= End Transfer Type ========================= */ /* ============================= Grid ====================================== */ @@ -466,23 +187,33 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc field : 'isValid', displayName : '...', cellTemplate: 'partials/vouchers/templates/status.grid.tmpl.html', + aggregationType: uiGridConstants.aggregationTypes.count, + aggregationHideLabel : true, + footerCellClass : 'text-center', width: 40 }, { field : 'account', displayName : 'FORM.LABELS.ACCOUNT', headerCellFilter: 'translate', - cellTemplate: 'partials/vouchers/templates/account.grid.tmpl.html' + cellTemplate: 'partials/vouchers/templates/account.grid.tmpl.html', + width: '35%' }, { field : 'debit', displayName : 'FORM.LABELS.DEBIT', headerCellFilter: 'translate', cellTemplate: 'partials/vouchers/templates/debit.grid.tmpl.html', + aggregationType: uiGridConstants.aggregationTypes.sum, + aggregationHideLabel : true, + footerCellFilter: 'currency:' + Session.enterprise.currency_id, footerCellClass : 'text-right' }, { field : 'credit', displayName : 'FORM.LABELS.CREDIT', headerCellFilter: 'translate', cellTemplate: 'partials/vouchers/templates/credit.grid.tmpl.html', + aggregationType: uiGridConstants.aggregationTypes.sum, + aggregationHideLabel : true, + footerCellFilter: 'currency:' + Session.enterprise.currency_id, footerCellClass : 'text-right' }, { field : 'entity', @@ -500,10 +231,6 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc cellTemplate: 'partials/vouchers/templates/remove.grid.tmpl.html', }]; - // set up the debit/credit aggregators - GridAggregators.extendColumnWithAggregator(vm.gridOptions.columnDefs[2], GridAggregators.aggregators.tree.debit); - GridAggregators.extendColumnWithAggregator(vm.gridOptions.columnDefs[3], GridAggregators.aggregators.tree.credit); - /* ============================= End Grid ================================== */ /** submit data */ @@ -515,24 +242,20 @@ function ComplexJournalVoucherController(Vouchers, $translate, Accounts, Currenc return; } - // get the updated state of the module with all checks made - refreshState(); - - var voucherItems = handleVoucherItems(); - var voucher = handleVoucher(); + var valid = vm.Voucher.validate(); - if (voucherItems.length > 0) { - voucher.items = voucherItems; + if (!valid) { + Notify.danger(vm.Voucher._error); + return; } + var voucher = vm.Voucher.details; + voucher.items = vm.Voucher.store.data; + return Vouchers.create(voucher) .then(function (result) { - form.$setPristine(); - startup(); - refreshState(); - vm.posted = true; - Receipts.voucher(result.uuid, true); + vm.Voucher.clear(); }) .catch(Notify.handleError); } diff --git a/client/src/partials/vouchers/templates/account.grid.tmpl.html b/client/src/partials/vouchers/templates/account.grid.tmpl.html index 74a9904af8..889920f8ac 100644 --- a/client/src/partials/vouchers/templates/account.grid.tmpl.html +++ b/client/src/partials/vouchers/templates/account.grid.tmpl.html @@ -1,9 +1,8 @@
@@ -12,9 +11,8 @@ + repeat="account.id as account in grid.appScope.Voucher.accounts | filter: { 'hrlabel' : $select.search } track by account.id"> diff --git a/client/src/partials/vouchers/templates/credit.grid.tmpl.html b/client/src/partials/vouchers/templates/credit.grid.tmpl.html index baaf76b358..e3567c589d 100644 --- a/client/src/partials/vouchers/templates/credit.grid.tmpl.html +++ b/client/src/partials/vouchers/templates/credit.grid.tmpl.html @@ -1,8 +1,8 @@
diff --git a/client/src/partials/vouchers/templates/debit.grid.tmpl.html b/client/src/partials/vouchers/templates/debit.grid.tmpl.html index 96c79c546e..1e2c53b85f 100644 --- a/client/src/partials/vouchers/templates/debit.grid.tmpl.html +++ b/client/src/partials/vouchers/templates/debit.grid.tmpl.html @@ -1,8 +1,8 @@
diff --git a/client/src/partials/vouchers/templates/remove.grid.tmpl.html b/client/src/partials/vouchers/templates/remove.grid.tmpl.html index 72424282bd..67323256f2 100644 --- a/client/src/partials/vouchers/templates/remove.grid.tmpl.html +++ b/client/src/partials/vouchers/templates/remove.grid.tmpl.html @@ -1,7 +1,7 @@
+ ng-click="grid.appScope.Voucher.removeItem(row.entity.uuid)">
diff --git a/client/src/partials/vouchers/templates/status.grid.tmpl.html b/client/src/partials/vouchers/templates/status.grid.tmpl.html index e05f65344d..faf31f02e1 100644 --- a/client/src/partials/vouchers/templates/status.grid.tmpl.html +++ b/client/src/partials/vouchers/templates/status.grid.tmpl.html @@ -1,29 +1,19 @@ - - -
- + - +
-
+
-
diff --git a/server/controllers/finance/reports/cashflow/index.js b/server/controllers/finance/reports/cashflow/index.js index 121dc4fa0b..51da9984c5 100644 --- a/server/controllers/finance/reports/cashflow/index.js +++ b/server/controllers/finance/reports/cashflow/index.js @@ -41,10 +41,10 @@ function report(req, res, next) { let params = req.query; processingCashflowReport(params) - .then(result => { - res.status(200).json(result); - }) - .catch(next); + .then(result => { + res.status(200).json(result); + }) + .catch(next); } /** processingCashflowReport */ @@ -541,9 +541,11 @@ function document(req, res, next) { tempExpense[item.origin_id] = typeof tempExpense[item.origin_id] !== 'undefined' ? false : true; if (tempExpense[item.origin_id] === true) { + var value = expenses.reduce(function (a, b) { return b.origin_id === item.origin_id ? b.credit_equiv + a : a; }, 0); + session.summationExpense[period].push({ 'transfer_type' : item.transactionType, 'currency_id' : item.currency_id, diff --git a/server/controllers/finance/reports/cashflow/report.handlebars b/server/controllers/finance/reports/cashflow/report.handlebars index 880968630d..6817b28098 100644 --- a/server/controllers/finance/reports/cashflow/report.handlebars +++ b/server/controllers/finance/reports/cashflow/report.handlebars @@ -207,12 +207,8 @@ {{/each}} - - -
-
diff --git a/server/models/procedures.sql b/server/models/procedures.sql index 0496511f05..c1a1d30bcd 100644 --- a/server/models/procedures.sql +++ b/server/models/procedures.sql @@ -183,16 +183,16 @@ BEGIN -- populate core set-up values CALL PostingSetupUtil(date, enterprise_id, project_id, currency_id, current_fiscal_year_id, current_period_id, current_exchange_rate, enterprise_currency_id, transaction_id, gain_account_id, loss_account_id); - -- Check that all invoice items have sales accounts - if they do not the transaction will be imbalanced - SELECT COUNT(invoice_item.uuid) + -- Check that all invoice items have sales accounts - if they do not the transaction will be imbalanced + SELECT COUNT(invoice_item.uuid) INTO verify_invalid_accounts FROM invoice JOIN invoice_item JOIN inventory JOIN inventory_group - ON invoice.uuid = invoice_item.invoice_uuid - AND invoice_item.inventory_uuid = inventory.uuid + ON invoice.uuid = invoice_item.invoice_uuid + AND invoice_item.inventory_uuid = inventory.uuid AND inventory.group_uuid = inventory_group.uuid WHERE invoice.uuid = uuid AND inventory_group.sales_account IS NULL; - + IF verify_invalid_accounts > 0 THEN SIGNAL InvalidSalesAccounts SET MESSAGE_TEXT = 'A NULL sales account has been found for an inventory item in this invoice.'; @@ -660,16 +660,16 @@ BEGIN the difference to the debtor and credit the difference as a gain to the gain_account - The debtor entity an invoice reference are not included on the gain - account transaction. In this case the debtor covered MORE than the - invoiced amount and so referencing them on the enterprise gain will - actually debit them the additional amount. + account transaction. In this case the debtor covered MORE than the + invoiced amount and so referencing them on the enterprise gain will + actually debit them the additional amount. */ IF (remainder > 0) THEN - - -- The debtor is not debited in this transaction. They have already - -- balanced the invoice and their debt according to the invoice (the + + -- The debtor is not debited in this transaction. They have already + -- balanced the invoice and their debt according to the invoice (the -- exact amount). The additional payment can just be put in a gain account. - + -- credit the rounding account INSERT INTO posting_journal ( uuid, project_id, fiscal_year_id, period_id, trans_id, trans_date, @@ -687,9 +687,9 @@ BEGIN A negative remainder means that the debtor underpaid slightly and we should credit the difference to the debtor and debit the difference as a loss to the loss_account - - The debtor and invoice are referenced on the loss account transaction - make up for the amount that is loss. In this case the debtor has not - actually paid enough money to cover the amount of the invoice. If this + - The debtor and invoice are referenced on the loss account transaction + make up for the amount that is loss. In this case the debtor has not + actually paid enough money to cover the amount of the invoice. If this is not referenced his balance will not be zero. */ ELSE