Merge pull request #1262 from shackbarth/1_7_x

bump to 1.7.1
rnordin · Feb 10, 2014 · 6daa183 · 6daa183
2 parents ec1ba48 + 73d6e43
commit 6daa183
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,9 +1,24 @@
+1.7.1 (2014/02/10)
+==================
+
+Features and bugfixes
+---------------------
+- Fixed
+  issue #[22659](http://www.xtuple.org/xtincident/view/bugs/22659)
+  _Remove xt.obj inheritance to avoid backup column reordering_
+
 1.7.0 (2014/02/03)
 ==================
 
 Features and bugfixes
 ---------------------
 
+- Implemented
+  issue #[22059](http://www.xtuple.org/xtincident/view/bugs/22059)
+  _Approve for billing and create invoice at time of shipping_
+- Implemented
+  issue #[22029](http://www.xtuple.org/xtincident/view/bugs/22029)
+  _Cash receipt on sales order_
 - Implemented
   issue #[21229](http://www.xtuple.org/xtincident/view/bugs/21229)
   _REST - Add support for a count query_

diff --git a/enyo-client/database/source/update_version.sql b/enyo-client/database/source/update_version.sql
@@ -1 +1 @@
-UPDATE pkghead SET pkghead_version = '1.7.0' WHERE pkghead_name = 'xt' ;
+UPDATE pkghead SET pkghead_version = '1.7.1' WHERE pkghead_name = 'xt' ;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		UPDATE pkghead SET pkghead_version = '1.7.0' WHERE pkghead_name = 'xt' ;
		UPDATE pkghead SET pkghead_version = '1.7.1' WHERE pkghead_name = 'xt' ;