Steve Hackbarth [Fri, 19 Sep 2014 14:18:01 +0000 (10:18 -0400)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into 1855
Steve Hackbarth [Thu, 18 Sep 2014 20:08:54 +0000 (16:08 -0400)]
display barcode misfires
Steve Hackbarth [Thu, 18 Sep 2014 19:38:29 +0000 (15:38 -0400)]
Merge pull request #1856 from bendiy/4_7_x
Add personal privilege access to a Customer that a Ship To is on
Steve Hackbarth [Thu, 18 Sep 2014 19:38:04 +0000 (15:38 -0400)]
Merge pull request #1857 from gpazo/bump470
bump to 4.7.0 final
Greg Pazo [Thu, 18 Sep 2014 18:50:31 +0000 (14:50 -0400)]
bump to 4.7.0 final
Ben Thompson [Thu, 18 Sep 2014 18:24:39 +0000 (14:24 -0400)]
Include in manifest
Ben Thompson [Thu, 18 Sep 2014 18:17:20 +0000 (14:17 -0400)]
Include the view when building share_users.
Steve Hackbarth [Thu, 18 Sep 2014 18:13:46 +0000 (14:13 -0400)]
Merge pull request #1848 from gilmoskowitz/i24559_xtlocks
issue #24559 - locking with pg 9.3 and web vs qt clients
Ben Thompson [Thu, 18 Sep 2014 18:10:35 +0000 (14:10 -0400)]
Add personal privilege access to a Contact that is on a Ship To
Gil Moskowitz [Thu, 18 Sep 2014 13:55:53 +0000 (09:55 -0400)]
Merge pull request #1831 from garyhgohoos/24544
Issue #24544:display posted date rather than create date
Gil Moskowitz [Thu, 18 Sep 2014 13:49:27 +0000 (09:49 -0400)]
Merge pull request #1826 from malfredo32/haxtuple1
fix for issue #24159 and issue #24255
Gil Moskowitz [Wed, 17 Sep 2014 21:10:31 +0000 (17:10 -0400)]
Merge branch '4_7_x' of https://github.com/xtuple/xtuple into i24559_xtlocks
and change language of wipe_views to allow building a database
Conflicts:
enyo-client/database/source/delete_system_orms.sql
Travis Webb [Wed, 17 Sep 2014 15:52:32 +0000 (11:52 -0400)]
Merge pull request #1820 from shackbarth/wipe_early
wipe views before foundation database code is executed
Travis Webb [Wed, 17 Sep 2014 15:35:57 +0000 (11:35 -0400)]
Merge pull request #1845 from shackbarth/filter-ext
support user-requested filtering of extensions. resolves #1844.
Steve Hackbarth [Wed, 17 Sep 2014 15:34:17 +0000 (11:34 -0400)]
Merge pull request #1827 from garyhgohoos/23255-2
Issue #23255:rebuild table bankrecimport without not null constraints
Gil Moskowitz [Wed, 17 Sep 2014 15:13:54 +0000 (11:13 -0400)]
temporarily separate qt-client locking from web client locking
Steve Hackbarth [Wed, 17 Sep 2014 14:43:08 +0000 (10:43 -0400)]
Merge pull request #1784 from garyhgohoos/23593-2
Issue #23593:correctly handle nulls in address
garyhgohoos [Wed, 17 Sep 2014 14:43:04 +0000 (10:43 -0400)]
Issue #23255:remove dropping of table
Steve Hackbarth [Wed, 17 Sep 2014 14:40:07 +0000 (10:40 -0400)]
Merge pull request #1836 from shackbarth/linguistbump
update linguist reference
Steve Hackbarth [Wed, 17 Sep 2014 14:39:43 +0000 (10:39 -0400)]
Merge pull request #1843 from xtuple/4_6_x
4 6 x
Steve Hackbarth [Wed, 17 Sep 2014 14:37:39 +0000 (10:37 -0400)]
Merge pull request #1818 from julesstp/22616_invoiceFormat
issue #22616: correct total's alignment in invoice footer
Steve Hackbarth [Wed, 17 Sep 2014 14:27:45 +0000 (10:27 -0400)]
Merge pull request #1837 from garyhgohoos/24224-3
Issue #24224:correct margin calc on booking display
Steve Hackbarth [Wed, 17 Sep 2014 14:25:47 +0000 (10:25 -0400)]
Merge pull request #1847 from garyhgohoos/24584
Issue #24584:create supply order with correct order number
Gil Moskowitz [Wed, 17 Sep 2014 13:42:02 +0000 (09:42 -0400)]
simplify testing with diff postgres version (still need to sync this with vagrant_setup.sh manually)
Gil Moskowitz [Wed, 17 Sep 2014 13:40:29 +0000 (09:40 -0400)]
replace all occurrences of changed column name
Gil Moskowitz [Wed, 17 Sep 2014 13:39:25 +0000 (09:39 -0400)]
fix copy/paste err
Travis Webb [Wed, 17 Sep 2014 04:56:26 +0000 (00:56 -0400)]
Merge pull request #1838 from shackbarth/killthebear
remove ursa. resolves #1658.
Steve Hackbarth [Tue, 16 Sep 2014 20:18:27 +0000 (16:18 -0400)]
set workers to -1
garyhgohoos [Tue, 16 Sep 2014 19:59:10 +0000 (15:59 -0400)]
Issue #24584:create supply order with correct order number
Gil Moskowitz [Tue, 16 Sep 2014 16:19:25 +0000 (12:19 -0400)]
use the proper column name in pg_stat_activity for the postgres version
Gil Moskowitz [Tue, 16 Sep 2014 16:17:46 +0000 (12:17 -0400)]
fix? missing plv8 error
Gil Moskowitz [Tue, 16 Sep 2014 16:16:46 +0000 (12:16 -0400)]
don't know how this passed before
Gil Moskowitz [Tue, 16 Sep 2014 16:15:49 +0000 (12:15 -0400)]
eliminate a warning
Steve Hackbarth [Mon, 15 Sep 2014 17:49:57 +0000 (13:49 -0400)]
support user-requested filtering of extensions. resolves #1844
Steve Hackbarth [Fri, 12 Sep 2014 19:03:45 +0000 (15:03 -0400)]
Merge pull request #1841 from krauseo/4_6_x
haxtuple placeholder for 23344
krauseo [Fri, 12 Sep 2014 18:29:55 +0000 (14:29 -0400)]
Update module_container.js
Steve Hackbarth [Fri, 12 Sep 2014 17:55:21 +0000 (13:55 -0400)]
Merge pull request #1840 from krauseo/4_6_x
haxtuple placeholder for 18023
krauseo [Fri, 12 Sep 2014 17:19:56 +0000 (13:19 -0400)]
Merge pull request #2 from shackbarth/keith2
haxtuple placeholder for 18023
Steve Hackbarth [Fri, 12 Sep 2014 17:16:50 +0000 (13:16 -0400)]
haxtuple placeholder for 18023
Steve Hackbarth [Fri, 12 Sep 2014 17:14:53 +0000 (13:14 -0400)]
Merge pull request #1839 from krauseo/4_6_x
4 6 x
krauseo [Fri, 12 Sep 2014 16:17:28 +0000 (12:17 -0400)]
Merge pull request #1 from shackbarth/keith1
Keith1
Steve Hackbarth [Fri, 12 Sep 2014 15:56:48 +0000 (11:56 -0400)]
haxtuple placeholder for 17921
Steve Hackbarth [Thu, 11 Sep 2014 20:22:01 +0000 (16:22 -0400)]
remove ursa. resolves #1658.
garyhgohoos [Thu, 11 Sep 2014 20:06:28 +0000 (16:06 -0400)]
Issue #24224:correct margin calc on booking display
Steve Hackbarth [Thu, 11 Sep 2014 19:45:30 +0000 (15:45 -0400)]
Merge pull request #1815 from lynnaloo/popup-styling
Changes for "Notify" popups
julesstp [Thu, 11 Sep 2014 18:14:01 +0000 (14:14 -0400)]
add colons to total labels on invoice
Steve Hackbarth [Thu, 11 Sep 2014 15:26:15 +0000 (11:26 -0400)]
update linguist reference
Gil Moskowitz [Thu, 11 Sep 2014 13:09:29 +0000 (09:09 -0400)]
Merge pull request #1743 from garyhgohoos/24315
issue #24315 - improve missing/duplicate po number message
Steve Hackbarth [Mon, 8 Sep 2014 20:50:06 +0000 (16:50 -0400)]
Merge pull request #1787 from tjwebb/node-10
node 10 compatibility on 4.7.x
Travis Webb [Mon, 8 Sep 2014 20:26:39 +0000 (16:26 -0400)]
Merge pull request #11 from shackbarth/node10-fix
skip failing test
Steve Hackbarth [Mon, 8 Sep 2014 19:52:48 +0000 (15:52 -0400)]
skip failing test
garyhgohoos [Mon, 8 Sep 2014 19:33:58 +0000 (15:33 -0400)]
Issue #24544:display posted date rather than create date
Steve Hackbarth [Fri, 5 Sep 2014 20:07:24 +0000 (16:07 -0400)]
Merge pull request #1824 from krauseo/master
Issues 21645 and 23344 - updates to assessfinancecharge.sql and itemsite.sql
Steve Hackbarth [Fri, 5 Sep 2014 17:18:38 +0000 (13:18 -0400)]
Merge pull request #1825 from lynnaloo/npm-fix
Npm install error in Vagrant - Fix
garyhgohoos [Fri, 5 Sep 2014 13:43:09 +0000 (09:43 -0400)]
Issue #23255:rebuild table bankrecimport without not null constraints
malfredo32 [Fri, 5 Sep 2014 06:41:32 +0000 (01:41 -0500)]
Trigger checking MaintainUsers priv before updating table to avoid bug 24255
malfredo32 [Fri, 5 Sep 2014 03:29:12 +0000 (22:29 -0500)]
Change BillingSelections metasql to include only uninvoiced approved selections
Linda Nichols [Fri, 5 Sep 2014 03:02:23 +0000 (03:02 +0000)]
Fixed npm install
Steve Hackbarth [Thu, 4 Sep 2014 20:44:11 +0000 (16:44 -0400)]
Merge pull request #1822 from garyhgohoos/23507-2
Issue #23507:add cascade to column drop
krauseo [Thu, 4 Sep 2014 15:24:30 +0000 (11:24 -0400)]
Update itemsite.sql
Changes needed to add item number to Negative Quantity Average Cost error messages per Feature Request 21645.
garyhgohoos [Thu, 4 Sep 2014 15:20:56 +0000 (11:20 -0400)]
Issue #23507:add cascade to column drop
krauseo [Thu, 4 Sep 2014 14:59:03 +0000 (10:59 -0400)]
Update assessfinancecharge.sql
Changes needed to fulfill Feature Request 23344 to enhance the information shown on the invcitem records for Finance Charge invoices.
Steve Hackbarth [Thu, 4 Sep 2014 14:42:33 +0000 (10:42 -0400)]
move out upgrade test to migration-testing repo
Steve Hackbarth [Thu, 4 Sep 2014 14:35:55 +0000 (10:35 -0400)]
wipe views before foundation database code is executed
julesstp [Wed, 3 Sep 2014 23:21:41 +0000 (19:21 -0400)]
issue #22616: correct total's alignment in invoice footer
garyhgohoos [Tue, 2 Sep 2014 20:03:47 +0000 (16:03 -0400)]
Issue #24315:consolidate po check functions and make error translatable
Linda Nichols [Tue, 2 Sep 2014 17:50:45 +0000 (13:50 -0400)]
Merge pull request #1817 from julesstp/22351-MultipleSitesInPostbooks
site test only if inventory extension not installed
julesstp [Tue, 2 Sep 2014 16:31:41 +0000 (12:31 -0400)]
site test only if inventory extension not installed
Steve Hackbarth [Tue, 2 Sep 2014 15:23:05 +0000 (11:23 -0400)]
Merge pull request #1767 from julesstp/22351-MultipleSitesInPostbooks
issue #22351:Multiple Sites should not be allowed in postbooks
Steve Hackbarth [Tue, 2 Sep 2014 15:20:03 +0000 (11:20 -0400)]
Merge pull request #1813 from lynnaloo/24449-1
Issue #24449 Fixed search error
Linda Nichols [Tue, 2 Sep 2014 14:38:45 +0000 (14:38 +0000)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into popup-styling
Gil Moskowitz [Tue, 2 Sep 2014 12:21:07 +0000 (08:21 -0400)]
Merge pull request #1812 from malfredo32/haxtuple1
issue #24450 - modify metasql to show signed values consistently
Linda Nichols [Tue, 2 Sep 2014 04:22:41 +0000 (04:22 +0000)]
Fixed search error
Steve Hackbarth [Mon, 1 Sep 2014 03:15:13 +0000 (23:15 -0400)]
Merge pull request #1811 from shackbarth/gary23507
issue #23507: non-nettable refactor
Steve Hackbarth [Mon, 1 Sep 2014 02:46:45 +0000 (22:46 -0400)]
remove references to itemsite_nnqoh
malfredo32 [Sat, 30 Aug 2014 18:05:20 +0000 (13:05 -0500)]
Bug 24450 CM not negative in AP Select payments
malfredo32 [Sat, 30 Aug 2014 18:03:19 +0000 (13:03 -0500)]
Merge remote-tracking branch 'origin/master' into 4_7_x
Steve Hackbarth [Sat, 30 Aug 2014 04:21:54 +0000 (00:21 -0400)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into gary23507
Steve Hackbarth [Sat, 30 Aug 2014 04:04:59 +0000 (00:04 -0400)]
Merge pull request #1810 from shackbarth/npm14
peg npm to 1 4 25
Steve Hackbarth [Sat, 30 Aug 2014 03:39:46 +0000 (23:39 -0400)]
peg npm to 1 4 25
Steve Hackbarth [Fri, 29 Aug 2014 20:53:17 +0000 (16:53 -0400)]
Merge pull request #1747 from garyhgohoos/23255
23255:Bank Reconciliation import
garyhgohoos [Fri, 29 Aug 2014 19:26:06 +0000 (15:26 -0400)]
Issue #23507:drop column itemsite_nnqoh
julesstp [Fri, 29 Aug 2014 18:00:49 +0000 (14:00 -0400)]
positive conditional return. uneccessary component name.
garyhgohoos [Fri, 29 Aug 2014 13:19:21 +0000 (09:19 -0400)]
Issue #24315:translatable error messages
Linda Nichols [Thu, 28 Aug 2014 18:28:25 +0000 (18:28 +0000)]
more fixes for the popup styling
Linda Nichols [Thu, 28 Aug 2014 17:56:36 +0000 (17:56 +0000)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into popup-styling
Linda Nichols [Thu, 28 Aug 2014 17:43:02 +0000 (17:43 +0000)]
Changed styling to limit message size on notify
garyhgohoos [Thu, 28 Aug 2014 17:29:29 +0000 (13:29 -0400)]
fix merge conflicts
Linda Nichols [Thu, 28 Aug 2014 16:51:19 +0000 (16:51 +0000)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into popup-styling
julesstp [Thu, 28 Aug 2014 16:30:31 +0000 (12:30 -0400)]
remove commented code, undo active required because crud was tripping on it for some reason
Travis Webb [Thu, 28 Aug 2014 07:02:32 +0000 (03:02 -0400)]
Merge pull request #1785 from bendiy/4_6_x
Fix group by
Travis Webb [Thu, 28 Aug 2014 07:01:45 +0000 (03:01 -0400)]
Merge pull request #1782 from shackbarth/23549-linguist
issue #23549: automatically include translations in build
bendiy [Wed, 27 Aug 2014 21:47:04 +0000 (16:47 -0500)]
frustratingly nondeterministic errors were just a bad query?
Travis Webb [Wed, 27 Aug 2014 18:15:39 +0000 (14:15 -0400)]
increased test timeouts
Steve Hackbarth [Wed, 27 Aug 2014 17:30:11 +0000 (13:30 -0400)]
Merge pull request #1791 from tjwebb/fix-jquery-route
Fix jquery route
Steve Hackbarth [Wed, 27 Aug 2014 17:27:27 +0000 (13:27 -0400)]
Merge pull request #1792 from lynnaloo/24405
Issue #24405 - Made name required for Department
Steve Hackbarth [Wed, 27 Aug 2014 17:27:12 +0000 (13:27 -0400)]
Merge pull request #1793 from lynnaloo/24403
Issue #24403 - Added validation for currency abbreviation
Steve Hackbarth [Wed, 27 Aug 2014 17:24:57 +0000 (13:24 -0400)]
Merge pull request #1795 from lynnaloo/24394
Issue #24394 - Changed name to a required field on XM.Shift
Linda Nichols [Wed, 27 Aug 2014 16:10:02 +0000 (16:10 +0000)]
moving shift test to xtuple-extensions
Linda Nichols [Wed, 27 Aug 2014 16:06:05 +0000 (16:06 +0000)]
Merge remote-tracking branch 'XTUPLE/4_7_x' into 24394