John Rogelstad [Wed, 20 Mar 2013 19:51:53 +0000 (12:51 -0700)]
Merge pull request #182 from shackbarth/19829b
issue #19829: parameter filter bugfix
Steve Hackbarth [Wed, 20 Mar 2013 18:40:49 +0000 (14:40 -0400)]
issue #19829: parameter filter bugfix
Linda [Tue, 19 Mar 2013 18:13:18 +0000 (11:13 -0700)]
Merge pull request #179 from mikerodonnell89/customerTest
fix customer test
mikerodonnell89 [Tue, 19 Mar 2013 18:03:46 +0000 (14:03 -0400)]
Using a different sales rep ID as 29 seems to be missing from the testing db
Mike O'Donnell [Tue, 19 Mar 2013 17:20:22 +0000 (10:20 -0700)]
Merge pull request #173 from shackbarth/testroutes
rehabbed the report route test
mikerodonnell89 [Tue, 19 Mar 2013 16:42:27 +0000 (12:42 -0400)]
fixed customer test so that it fetches a salesrep
mikerodonnell89 [Tue, 19 Mar 2013 16:28:33 +0000 (12:28 -0400)]
Merge branch 'xtuple'
Mike O'Donnell [Tue, 19 Mar 2013 16:25:36 +0000 (09:25 -0700)]
Merge pull request #178 from elevow/fix_tests
update tests against Existing Values; Modified Project vows to not asser...
elevow [Tue, 19 Mar 2013 16:12:25 +0000 (12:12 -0400)]
update tests against Existing Values; Modified Project vows to not assert to hardcoded value
shackbarth [Tue, 19 Mar 2013 13:44:09 +0000 (06:44 -0700)]
Merge pull request #176 from msinclairstevens/18668f
Issue #18668. Regenerated JSDoc files for enyo-x and backbone-x.
mikerodonnell89 [Tue, 19 Mar 2013 13:40:40 +0000 (09:40 -0400)]
Merge branch 'master' of https://github.com/mikerodonnell89/xtuple
Mike O'Donnell [Tue, 19 Mar 2013 13:40:21 +0000 (06:40 -0700)]
Merge pull request #44 from xtuple/master
catching up
John Rogelstad [Tue, 19 Mar 2013 12:16:15 +0000 (05:16 -0700)]
Merge pull request #175 from jrogelstad/master
issue #19754: Change timout to 1 hour.
John Rogelstad [Tue, 19 Mar 2013 12:15:37 +0000 (08:15 -0400)]
issue #19754: Change timout to 1 hour.
John Rogelstad [Tue, 19 Mar 2013 12:04:57 +0000 (05:04 -0700)]
Merge pull request #174 from jrogelstad/master
issue #19741: Make amount show on list
John Rogelstad [Tue, 19 Mar 2013 12:04:03 +0000 (08:04 -0400)]
issue #19741: Make amount show on list
Steve Hackbarth [Tue, 19 Mar 2013 02:02:08 +0000 (22:02 -0400)]
moved report test
Steve Hackbarth [Tue, 19 Mar 2013 02:00:28 +0000 (22:00 -0400)]
zombie vows triumph
Steve Hackbarth [Tue, 19 Mar 2013 01:00:54 +0000 (21:00 -0400)]
moved back sale type
Steve Hackbarth [Tue, 19 Mar 2013 01:00:11 +0000 (21:00 -0400)]
cleanup
Steve Hackbarth [Tue, 19 Mar 2013 00:56:29 +0000 (20:56 -0400)]
refactor state test
Steve Hackbarth [Tue, 19 Mar 2013 00:49:45 +0000 (20:49 -0400)]
refactor item_site test
Steve Hackbarth [Tue, 19 Mar 2013 00:43:02 +0000 (20:43 -0400)]
typo fix
Steve Hackbarth [Tue, 19 Mar 2013 00:41:18 +0000 (20:41 -0400)]
cleanup
Steve Hackbarth [Tue, 19 Mar 2013 00:39:44 +0000 (20:39 -0400)]
cleanup
Steve Hackbarth [Tue, 19 Mar 2013 00:37:44 +0000 (20:37 -0400)]
crazy enough to work
Steve Hackbarth [Tue, 19 Mar 2013 00:23:58 +0000 (20:23 -0400)]
geez pretty close
Steve Hackbarth [Tue, 19 Mar 2013 00:14:17 +0000 (20:14 -0400)]
getting there
Steve Hackbarth [Tue, 19 Mar 2013 00:08:31 +0000 (20:08 -0400)]
progress
Steve Hackbarth [Tue, 19 Mar 2013 00:03:43 +0000 (20:03 -0400)]
starting path
Steve Hackbarth [Tue, 19 Mar 2013 00:03:21 +0000 (20:03 -0400)]
starting path
Linda [Mon, 18 Mar 2013 21:12:34 +0000 (14:12 -0700)]
Merge pull request #171 from shackbarth/money
issue #19453: moneywidget to show base currency by default
Steve Hackbarth [Mon, 18 Mar 2013 20:52:21 +0000 (16:52 -0400)]
silence
Steve Hackbarth [Mon, 18 Mar 2013 20:47:27 +0000 (16:47 -0400)]
Merge branch 'xtuple' into money
Steve Hackbarth [Mon, 18 Mar 2013 20:42:03 +0000 (16:42 -0400)]
issue #19453: moneywidget to show base currecy by default
mikerodonnell89 [Mon, 18 Mar 2013 20:02:31 +0000 (16:02 -0400)]
Merge branch 'xtuple'
Mike O'Donnell [Mon, 18 Mar 2013 20:01:57 +0000 (13:01 -0700)]
Merge pull request #170 from elevow/update_vows
Updated Vows Comments to be more Readable
elevow [Mon, 18 Mar 2013 19:55:25 +0000 (15:55 -0400)]
Updated Vows Comments to be more Readable
Mike O'Donnell [Mon, 18 Mar 2013 19:47:59 +0000 (12:47 -0700)]
Merge pull request #43 from xtuple/master
all tests in model directory should pass now
Mike O'Donnell [Mon, 18 Mar 2013 19:46:55 +0000 (12:46 -0700)]
Merge pull request #168 from shackbarth/itemsitetest
more test fixes. all model tests pass for me now
Steve Hackbarth [Mon, 18 Mar 2013 19:15:27 +0000 (15:15 -0400)]
moved out sale type
Steve Hackbarth [Mon, 18 Mar 2013 19:15:06 +0000 (15:15 -0400)]
sale type still broken
Steve Hackbarth [Mon, 18 Mar 2013 18:37:47 +0000 (14:37 -0400)]
plv8 notices only if DEBUG
Steve Hackbarth [Mon, 18 Mar 2013 18:02:55 +0000 (14:02 -0400)]
working on sale type test
Steve Hackbarth [Mon, 18 Mar 2013 17:44:20 +0000 (13:44 -0400)]
Merge remote-tracking branch 'XTUPLE/master' into itemsitetest
Steve Hackbarth [Mon, 18 Mar 2013 17:42:05 +0000 (13:42 -0400)]
moved opportunity test
Steve Hackbarth [Mon, 18 Mar 2013 17:41:46 +0000 (13:41 -0400)]
fixed opportunity test
Mike O'Donnell [Mon, 18 Mar 2013 17:19:10 +0000 (10:19 -0700)]
Merge pull request #42 from xtuple/master
catching up
Mel Stevens [Mon, 18 Mar 2013 16:59:59 +0000 (11:59 -0500)]
Issue #18668. Regenerated JSDoc files for enyo-x and backbone-x. Did not do edits to any of the underlying source files.
Overrode the jsdoc-default.css with the customizations made for xTuple in November 2012 for the xTuple website version of this documentation.
shackbarth [Mon, 18 Mar 2013 16:51:42 +0000 (09:51 -0700)]
Merge pull request #167 from jrogelstad/master
Fix query modifier
John Rogelstad [Mon, 18 Mar 2013 16:50:35 +0000 (09:50 -0700)]
Merge pull request #166 from shackbarth/itemsitetest
rehabbed item site test
John Rogelstad [Mon, 18 Mar 2013 16:49:27 +0000 (09:49 -0700)]
Merge pull request #165 from shackbarth/widgetbug
fixed contact widget
John Rogelstad [Mon, 18 Mar 2013 16:48:20 +0000 (12:48 -0400)]
Fix query modifier to accept that all toOnes are nested now
Steve Hackbarth [Mon, 18 Mar 2013 16:39:25 +0000 (12:39 -0400)]
do not load zombie more than once
Steve Hackbarth [Mon, 18 Mar 2013 16:03:22 +0000 (12:03 -0400)]
moved item site test
Steve Hackbarth [Mon, 18 Mar 2013 16:01:17 +0000 (12:01 -0400)]
cleanup
Steve Hackbarth [Mon, 18 Mar 2013 15:58:22 +0000 (11:58 -0400)]
itemsite should extend model
Steve Hackbarth [Mon, 18 Mar 2013 15:37:31 +0000 (11:37 -0400)]
fixed contact widget
Steve Hackbarth [Mon, 18 Mar 2013 14:22:19 +0000 (10:22 -0400)]
issue #19453: working on itemsite test
Mike O'Donnell [Sun, 17 Mar 2013 21:09:45 +0000 (14:09 -0700)]
Merge pull request #41 from xtuple/master
catching up
Steve Hackbarth [Sun, 17 Mar 2013 16:38:26 +0000 (12:38 -0400)]
Merge branch 'xtuple'
shackbarth [Sun, 17 Mar 2013 16:37:48 +0000 (09:37 -0700)]
Merge pull request #163 from jrogelstad/master
Fixes to pass all vows test.
shackbarth [Sun, 17 Mar 2013 16:36:08 +0000 (09:36 -0700)]
Merge pull request #162 from jrogelstad/19714
issue #19714: Fix timing problem with number check. Make sure validation...
John Rogelstad [Sun, 17 Mar 2013 14:34:03 +0000 (07:34 -0700)]
Merge pull request #164 from jrogelstad/19453
issue #19453: Fixes.
John Rogelstad [Sun, 17 Mar 2013 12:23:11 +0000 (08:23 -0400)]
Oops. Actually remove tests that were moved.
John Rogelstad [Sun, 17 Mar 2013 12:22:04 +0000 (08:22 -0400)]
Various fixes to models and tests so all tests pass. Move two tests to wip that need substantial work.
John Rogelstad [Sat, 16 Mar 2013 14:23:12 +0000 (10:23 -0400)]
issue #19714: Fix timing problem with number check. Make sure validation happens when busy committing.
John Rogelstad [Fri, 15 Mar 2013 20:36:03 +0000 (13:36 -0700)]
Merge pull request #160 from shackbarth/fixes
various fixes
Steve Hackbarth [Fri, 15 Mar 2013 20:33:27 +0000 (16:33 -0400)]
Merge branch 'xtuple'
Steve Hackbarth [Fri, 15 Mar 2013 20:32:14 +0000 (16:32 -0400)]
merge
John Rogelstad [Fri, 15 Mar 2013 20:01:44 +0000 (13:01 -0700)]
Merge pull request #159 from jgunderson/master
fixed null strings, added runtime lib jars
Steve Hackbarth [Fri, 15 Mar 2013 18:51:57 +0000 (14:51 -0400)]
first pass at selling units filter
Jeff Gunderson [Fri, 15 Mar 2013 17:48:05 +0000 (13:48 -0400)]
fixed null strings
John Rogelstad [Fri, 15 Mar 2013 17:32:53 +0000 (10:32 -0700)]
Merge pull request #158 from xtuple/quote_dev
Merge: Quote dev
Steve Hackbarth [Fri, 15 Mar 2013 17:26:20 +0000 (13:26 -0400)]
more careful stepping into readOnly search path
John Rogelstad [Fri, 15 Mar 2013 15:57:12 +0000 (11:57 -0400)]
Merge branch 'quote_dev' into 19453
John Rogelstad [Fri, 15 Mar 2013 15:56:42 +0000 (08:56 -0700)]
Merge pull request #154 from shackbarth/timeout2
extend timeout to 12 hours
John Rogelstad [Fri, 15 Mar 2013 15:56:15 +0000 (08:56 -0700)]
Merge pull request #156 from lynnaloo/19453
19453 - Cosmetic changes and field corrections in QuoteList
John Rogelstad [Fri, 15 Mar 2013 15:56:05 +0000 (08:56 -0700)]
Merge pull request #147 from shackbarth/19453n
issue #19453: do not validate non-nested tomany relations
John Rogelstad [Fri, 15 Mar 2013 15:55:26 +0000 (08:55 -0700)]
Merge pull request #157 from elevow/vows_move
Vows move
John Rogelstad [Fri, 15 Mar 2013 15:54:44 +0000 (08:54 -0700)]
Merge pull request #155 from shackbarth/19245
issue 19245: fixed double history
John Rogelstad [Fri, 15 Mar 2013 15:51:53 +0000 (11:51 -0400)]
Merge branch 'quote_dev' into 19453
John Rogelstad [Fri, 15 Mar 2013 15:51:17 +0000 (11:51 -0400)]
issue #19453: Fix currency to calculate to base properly and not make redundant calls. Silence sets that should be silent permanently.
Steve Hackbarth [Fri, 15 Mar 2013 15:16:43 +0000 (11:16 -0400)]
bugfix
Steve Hackbarth [Fri, 15 Mar 2013 15:10:39 +0000 (11:10 -0400)]
refresh button available on new records
Steve Hackbarth [Fri, 15 Mar 2013 14:45:22 +0000 (10:45 -0400)]
save and new button becomes save button on clean model
elevow [Fri, 15 Mar 2013 14:42:54 +0000 (10:42 -0400)]
added priority vows
elevow [Fri, 15 Mar 2013 14:38:31 +0000 (10:38 -0400)]
updated to number test
elevow [Fri, 15 Mar 2013 14:34:14 +0000 (10:34 -0400)]
moved broken vows to wip
Mike O'Donnell [Fri, 15 Mar 2013 14:18:37 +0000 (07:18 -0700)]
Merge pull request #40 from xtuple/quote_dev
quote_dev pull
Steve Hackbarth [Fri, 15 Mar 2013 14:14:47 +0000 (10:14 -0400)]
get that saveAndNew button back on the workspaces
Steve Hackbarth [Fri, 15 Mar 2013 14:10:59 +0000 (10:10 -0400)]
disable relation icon button appropriately
Jeff Gunderson [Fri, 15 Mar 2013 14:08:15 +0000 (10:08 -0400)]
fix jars for runtime
Steve Hackbarth [Fri, 15 Mar 2013 13:40:11 +0000 (09:40 -0400)]
Merge remote-tracking branch 'XTUPLE/quote_dev'
Linda Nichols [Fri, 15 Mar 2013 03:47:43 +0000 (23:47 -0400)]
Issue 19453: Cosmetic fixes for QuoteList
Linda Nichols [Fri, 15 Mar 2013 03:41:23 +0000 (23:41 -0400)]
Issue 19453: Cosmetic fixes for QuoteList
Steve Hackbarth [Fri, 15 Mar 2013 03:21:59 +0000 (23:21 -0400)]
issue 19245: fixed double history
Steve Hackbarth [Fri, 15 Mar 2013 02:14:01 +0000 (22:14 -0400)]
extend timeout to 12 hours
Steve Hackbarth [Fri, 15 Mar 2013 02:08:23 +0000 (22:08 -0400)]
Merge branch 'xtuple'
Linda Nichols [Fri, 15 Mar 2013 01:41:33 +0000 (21:41 -0400)]
Issue 19453: Merged changes and added discount/markup label logic to workspace.
projects / xtuple / log