Skip to content

Commit

Permalink
Merge #2532
Browse files Browse the repository at this point in the history
2532: Release v0.7.0 r=jniles a=jniles

This release packages all changes since December 2017.  Remember to update your dependencies!
  • Loading branch information
bors[bot] committed Feb 8, 2018
2 parents 3820595 + 6d3972a commit 16ca7e7
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 3 deletions.
53 changes: 53 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,59 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="0.7.0"></a>
# [0.7.0](https://github.com/IMA-WorldHealth/bhima-2.X/compare/v0.6.0...v0.7.0) (2018-02-08)


### Bug Fixes

* **account statement:** remove posted toggle ([33dacbe](https://github.com/IMA-WorldHealth/bhima-2.X/commit/33dacbe)), closes [#2429](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2429)
* **account statement:** show description ([13dee94](https://github.com/IMA-WorldHealth/bhima-2.X/commit/13dee94))
* **accounts:** properly compute $$treeLevel ([799efa9](https://github.com/IMA-WorldHealth/bhima-2.X/commit/799efa9)), closes [#2433](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2433)
* **accounts:** unify account types ([483b3f3](https://github.com/IMA-WorldHealth/bhima-2.X/commit/483b3f3)), closes [#2436](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2436)
* **General Ledger:** identify title accounts ([b49ff7a](https://github.com/IMA-WorldHealth/bhima-2.X/commit/b49ff7a)), closes [#2348](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2348)
* **inventory:** misc ui improvements. ([dce11ed](https://github.com/IMA-WorldHealth/bhima-2.X/commit/dce11ed)), closes [#2499](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2499) [#2493](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2493)
* **invoices:** remove projects from links ([b682fa6](https://github.com/IMA-WorldHealth/bhima-2.X/commit/b682fa6)), closes [#2415](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2415)
* **journal:** cache filters typo ([14a28c0](https://github.com/IMA-WorldHealth/bhima-2.X/commit/14a28c0)), closes [#2521](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2521)
* **package:** update chai-spies to version 1.0.0 ([fb94899](https://github.com/IMA-WorldHealth/bhima-2.X/commit/fb94899))
* **package:** update dotenv to version 5.0.0 ([2f2101e](https://github.com/IMA-WorldHealth/bhima-2.X/commit/2f2101e))
* **package:** update mailgun-js to version 0.14.0 ([8b388fd](https://github.com/IMA-WorldHealth/bhima-2.X/commit/8b388fd))
* **purchase:** ui glitches in purchase orders ([c7ef425](https://github.com/IMA-WorldHealth/bhima-2.X/commit/c7ef425)), closes [#1842](https://github.com/IMA-WorldHealth/bhima-2.X/issues/1842)
* **reports:** order Income/Expense by account ([ed07548](https://github.com/IMA-WorldHealth/bhima-2.X/commit/ed07548))
* **stock:** force refresh grid index ([5849d99](https://github.com/IMA-WorldHealth/bhima-2.X/commit/5849d99)), closes [#2492](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2492)
* links to patient registry ([294b6e1](https://github.com/IMA-WorldHealth/bhima-2.X/commit/294b6e1)), closes [#2391](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2391) [#2403](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2403)
* use strings for testing account numbers ([c48dbac](https://github.com/IMA-WorldHealth/bhima-2.X/commit/c48dbac))
* **stock:** only add line if no line expected ([7da7ead](https://github.com/IMA-WorldHealth/bhima-2.X/commit/7da7ead))
* **tests:** add fiscal year ([8494bec](https://github.com/IMA-WorldHealth/bhima-2.X/commit/8494bec))


### Features

* **account statement:** grid beginning balance ([01c9311](https://github.com/IMA-WorldHealth/bhima-2.X/commit/01c9311)), closes [#1762](https://github.com/IMA-WorldHealth/bhima-2.X/issues/1762)
* **Account Statement:** implement SaveState ([7d74317](https://github.com/IMA-WorldHealth/bhima-2.X/commit/7d74317)), closes [#1762](https://github.com/IMA-WorldHealth/bhima-2.X/issues/1762)
* **bhPeriodSelect:** preserve custom dates ([010e9e2](https://github.com/IMA-WorldHealth/bhima-2.X/commit/010e9e2)), closes [#2516](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2516)
* **build:** Use to cross-env module to stop deal with the operation system ([9042f2a](https://github.com/IMA-WorldHealth/bhima-2.X/commit/9042f2a))
* **exchange:** add the current exchange rate ([468a134](https://github.com/IMA-WorldHealth/bhima-2.X/commit/468a134)), closes [#2387](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2387)
* **General Ledger:** implement checksum footer ([085500d](https://github.com/IMA-WorldHealth/bhima-2.X/commit/085500d)), closes [#2463](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2463)
* **General Ledger:** implement title summing ([22f4cc1](https://github.com/IMA-WorldHealth/bhima-2.X/commit/22f4cc1))
* **General Ledger:** link Account Statement ([ae25a1d](https://github.com/IMA-WorldHealth/bhima-2.X/commit/ae25a1d)), closes [#2459](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2459)
* **General Ledger:** prune empty accounts ([ceec405](https://github.com/IMA-WorldHealth/bhima-2.X/commit/ceec405))
* **General Ledger:** use Account Statement Report ([a2096d1](https://github.com/IMA-WorldHealth/bhima-2.X/commit/a2096d1)), closes [#1706](https://github.com/IMA-WorldHealth/bhima-2.X/issues/1706)
* **journal:** add debit/credit source sums ([27f4eeb](https://github.com/IMA-WorldHealth/bhima-2.X/commit/27f4eeb)), closes [#2512](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2512)
* **reports:** additional opts for Account Report ([2c5b2f8](https://github.com/IMA-WorldHealth/bhima-2.X/commit/2c5b2f8))
* **stock:** allow moving lots registry columns ([2a8362e](https://github.com/IMA-WorldHealth/bhima-2.X/commit/2a8362e)), closes [#2502](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2502)
* **Tree:** implement sumOnProperty() ([663165a](https://github.com/IMA-WorldHealth/bhima-2.X/commit/663165a))
* **Tree:** implement tree structure w/ tests ([85892b6](https://github.com/IMA-WorldHealth/bhima-2.X/commit/85892b6))
* **vouchers:** filter on account ([01ac57e](https://github.com/IMA-WorldHealth/bhima-2.X/commit/01ac57e)), closes [#2412](https://github.com/IMA-WorldHealth/bhima-2.X/issues/2412)


### Performance Improvements

* **general_leger:** optimize GL Matrix ([542db22](https://github.com/IMA-WorldHealth/bhima-2.X/commit/542db22))
* **vouchers:** improve FindReference usability ([0bb06ac](https://github.com/IMA-WorldHealth/bhima-2.X/commit/0bb06ac))



<a name="0.6.0"></a>
# [0.6.0](https://github.com/IMA-WorldHealth/bhima-2.X/compare/v0.5.0...v0.6.0) (2017-12-15)

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bhima",
"version": "0.6.0",
"version": "0.7.0",
"homepage": "https://github.com/IMA-WorldHealth/bhima-2.X",
"description": "A hospital information system for developing countries.",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bhima",
"version": "0.6.0",
"version": "0.7.0",
"description": "A rural hospital information management system.",
"main": "npm run build",
"scripts": {
Expand All @@ -15,7 +15,7 @@
"test:server-unit": "./node_modules/.bin/mocha --recursive --exit test/server-unit",
"build": "./node_modules/.bin/gulp build",
"build:db": "./sh/build-database.sh",
"build:clean" : "./sh/build-init-database.sh",
"build:clean": "./sh/build-init-database.sh",
"watch": "./node_modules/.bin/gulp watch-client",
"release": "./node_modules/.bin/standard-version",
"snyk-protect": "snyk protect",
Expand Down
105 changes: 105 additions & 0 deletions server/models/migrations/v0.6.0-v0.7.0/migrate.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/*
This script will update the database to its current version.
*/

SET foreign_key_checks = 0;
ALTER TABLE inventory_group ADD COLUMN `expires` TINYINT(1) DEFAULT 1;
ALTER TABLE inventory_group ADD COLUMN `unique_item` TINYINT(1) DEFAULT 0;

ALTER TABLE account DROP COLUMN `is_asset`;
ALTER TABLE account DROP COLUMN `is_brut_link`;
ALTER TABLE account DROP COLUMN `is_title`;
ALTER TABLE account DROP COLUMN `is_charge`;

DROP TABLE `config_rubric`;
DROP TABLE `config_rubric_item`;
DROP TABLE `config_tax`;
DROP TABLE `config_tax_item`;

DROP TABLE `cotisation`;
DROP TABLE `cotisation_paiement`;
DROP TABLE `paiement_period`;

DROP TABLE `rubric`;
DROP TABLE `rubric_paiement`;

DROP TABLE `tax`;
DROP TABLE `tax_paiement`;

DROP TABLE `config_cotisation_item`;
DROP TABLE `config_cotisation`;

DROP TABLE IF EXISTS `rubric_payroll`;

CREATE TABLE `rubric_payroll` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`label` VARCHAR(80) NOT NULL,
`abbr` varchar(6) DEFAULT NULL,
`is_employee` tinyint(1) DEFAULT 0,
`is_percent` tinyint(1) DEFAULT 0,
`is_discount` tinyint(1) DEFAULT 0,
`is_tax` tinyint(1) DEFAULT 0,
`is_social_care` tinyint(1) DEFAULT 0,
`debtor_account_id` int(10) unsigned DEFAULT NULL,
`expense_account_id` int(10) unsigned DEFAULT NULL,
`is_ipr` tinyint(1) DEFAULT 0,
`value` float DEFAULT 0,
PRIMARY KEY (`id`),
UNIQUE KEY `rubric_payroll_1` (`label`),
KEY `debtor_account_id` (`debtor_account_id`),
KEY `expense_account_id` (`expense_account_id`),
FOREIGN KEY (`debtor_account_id`) REFERENCES `account` (`id`),
FOREIGN KEY (`expense_account_id`) REFERENCES `account` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- For some reason, MariaDB is being a pain with this. Skipping it for now.
-- ALTER TABLE `offday` DROP CONSTRAINT `offday_1`;
-- ALTER TABLE `offday` ADD UNIQUE `offday_1` (`date`);

ALTER TABLE `inventory` ADD COLUMN `is_broken` TINYINT(1) NOT NULL DEFAULT 0;
ALTER TABLE `inventory` ADD COLUMN `note` text NULL;

ALTER TABLE `patient` ADD COLUMN `health_zone` VARCHAR(30);
ALTER TABLE `patient` ADD COLUMN `health_area` VARCHAR(30);

ALTER TABLE `inventory` ADD COLUMN `last_purchase` DATE NULL COMMENT 'This element allows to store the date of the last purchase order of the product in order to allow the calculation without making much of the average ordering interval';
ALTER TABLE `inventory` ADD COLUMN `num_purchase` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Number of purchase orders';
ALTER TABLE `inventory` ADD COLUMN `num_delivery` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Number of stock delivery';

ALTER TABLE `inventory` CHANGE COLUMN `delay` `delay` DECIMAL(10,4) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Delivery time';
ALTER TABLE `inventory` CHANGE COLUMN `avg_consumption` `avg_consumption` DECIMAL(10,4) UNSIGNED NOT NULL DEFAULT 1 COMMENT 'Average consumption' ;
ALTER TABLE `inventory` CHANGE COLUMN `purchase_interval` `purchase_interval` DECIMAL(10,4) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Purchase Order interval' ;

DROP TABLE IF EXISTS `taxe_ipr`;
CREATE TABLE `taxe_ipr` (
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`label` VARCHAR(100) NOT NULL,
`description` TEXT,
`currency_id` TINYINT(3) UNSIGNED NOT NULL,
PRIMARY KEY (`id`),
KEY `currency_id` (`currency_id`),
FOREIGN KEY (`currency_id`) REFERENCES `currency` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

DROP TABLE IF EXISTS `taxe_ipr_configuration`;
CREATE TABLE `taxe_ipr_configuration` (
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`rate` float NOT NULL,
`tranche_annuelle_debut` float DEFAULT NULL,
`tranche_annuelle_fin` float DEFAULT NULL,
`tranche_mensuelle_debut` float DEFAULT NULL,
`tranche_mensuelle_fin` float DEFAULT NULL,
`ecart_annuel` float DEFAULT NULL,
`ecart_mensuel` float DEFAULT NULL,
`impot_annuel` float DEFAULT NULL,
`impot_mensuel` float DEFAULT NULL,
`cumul_annuel` float DEFAULT NULL,
`cumul_mensuel` float DEFAULT NULL,
`taxe_ipr_id` int(10) UNSIGNED NOT NULL,
PRIMARY KEY (`id`),
KEY `taxe_ipr_id` (`taxe_ipr_id`),
FOREIGN KEY (`taxe_ipr_id`) REFERENCES `taxe_ipr` (`id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;


SET foreign_key_checks = 1;

0 comments on commit 16ca7e7

Please sign in to comment.