shackbarth [Thu, 28 Feb 2013 19:33:46 +0000 (11:33 -0800)]
Merge pull request #58 from shackbarth/master
tweakfix
Steve Hackbarth [Thu, 28 Feb 2013 19:33:07 +0000 (14:33 -0500)]
by date I mean number
Mike O'Donnell [Thu, 28 Feb 2013 19:25:27 +0000 (11:25 -0800)]
Merge pull request #57 from shackbarth/master
two little tweaks
Steve Hackbarth [Thu, 28 Feb 2013 19:22:46 +0000 (14:22 -0500)]
sort orgs
Steve Hackbarth [Thu, 28 Feb 2013 19:22:36 +0000 (14:22 -0500)]
port has to be a datewidget
John Rogelstad [Thu, 28 Feb 2013 18:27:33 +0000 (10:27 -0800)]
Merge pull request #55 from jrogelstad/master
Still fixing quotes and sales type
John Rogelstad [Thu, 28 Feb 2013 18:26:47 +0000 (13:26 -0500)]
Still fixing quote problems
John Rogelstad [Thu, 28 Feb 2013 18:17:58 +0000 (10:17 -0800)]
Merge pull request #54 from jrogelstad/master
Bleh.
John Rogelstad [Thu, 28 Feb 2013 18:17:30 +0000 (13:17 -0500)]
Have to add drop views script back. bleh.
John Rogelstad [Thu, 28 Feb 2013 18:11:18 +0000 (10:11 -0800)]
Merge pull request #53 from jrogelstad/master
issue #19550: Fixes to orm.
John Rogelstad [Thu, 28 Feb 2013 18:08:23 +0000 (13:08 -0500)]
issue #19550: Fix problem with sale type orm missing system flag. Tweak init script to not have redundant calls.
John Rogelstad [Thu, 28 Feb 2013 16:25:24 +0000 (08:25 -0800)]
Merge pull request #10 from xtuple/master
Catch up.
John Rogelstad [Thu, 28 Feb 2013 12:51:21 +0000 (04:51 -0800)]
Merge pull request #50 from shackbarth/19652
issue #19652: guarded against the sync user callback getting hit twice a...
John Rogelstad [Thu, 28 Feb 2013 12:50:58 +0000 (04:50 -0800)]
Merge pull request #52 from shackbarth/19444
issue #19444: removed print button from crm workspaces
Steve Hackbarth [Thu, 28 Feb 2013 01:11:17 +0000 (20:11 -0500)]
issue #19444: removed print button from crm workspaces
Steve Hackbarth [Wed, 27 Feb 2013 21:57:34 +0000 (16:57 -0500)]
issue #19652: guarded against the sync user callback getting hit twice at the same time
John Rogelstad [Wed, 27 Feb 2013 21:10:31 +0000 (13:10 -0800)]
Merge pull request #49 from shackbarth/19560
issue #19560: reset password even if no orgs
Mike O'Donnell [Wed, 27 Feb 2013 18:58:26 +0000 (10:58 -0800)]
Merge pull request #48 from shackbarth/xtuple
Revert "Issue #19613 Upgrade node to 0.8.20 and upgrade packages and use...
Steve Hackbarth [Wed, 27 Feb 2013 18:50:42 +0000 (13:50 -0500)]
Revert "Issue #19613 Upgrade node to 0.8.20 and upgrade packages and use .x to get future patch releases."
This reverts commit
0d826cca6370efc58e7e04e4527aaa1cc20f1827.
Steve Hackbarth [Wed, 27 Feb 2013 18:48:20 +0000 (13:48 -0500)]
issue #19560: reset password even if no orgs
Mike O'Donnell [Wed, 27 Feb 2013 17:54:37 +0000 (09:54 -0800)]
Merge pull request #29 from bendiy/19613
Issue #19613 Upgrade node to 0.8.20 and upgrade packages and use .x to g...
Mike O'Donnell [Wed, 27 Feb 2013 17:54:12 +0000 (09:54 -0800)]
Merge pull request #46 from jrogelstad/19552
issue #19552: Add calculated detail to quote line item.
John Rogelstad [Wed, 27 Feb 2013 17:51:18 +0000 (12:51 -0500)]
issue #19552: Fix merge conflict (again)
John Rogelstad [Wed, 27 Feb 2013 17:49:52 +0000 (09:49 -0800)]
Merge pull request #9 from xtuple/master
catch up.
John Rogelstad [Wed, 27 Feb 2013 17:48:03 +0000 (12:48 -0500)]
issue #19552: Fix merge conflict.
John Rogelstad [Wed, 27 Feb 2013 17:44:32 +0000 (12:44 -0500)]
issue #19552: Add calculated extended price and tax data to quote model
John Rogelstad [Wed, 27 Feb 2013 17:39:15 +0000 (09:39 -0800)]
Merge pull request #45 from julesstp/19550
incident # 19550 - add XM.SaleType and modify saleType col in quote to use it
root [Wed, 27 Feb 2013 17:02:53 +0000 (11:02 -0600)]
add XM.SaleType for real this time
root [Wed, 27 Feb 2013 17:00:54 +0000 (11:00 -0600)]
add XM.SaleType and change col in quote to use it
John Rogelstad [Wed, 27 Feb 2013 13:14:20 +0000 (05:14 -0800)]
Merge pull request #44 from julesstp/19550
Incident #19550 - add XM.TaxCode, XM.TaxClass and modify quote.json tax function...
root [Wed, 27 Feb 2013 07:13:35 +0000 (01:13 -0600)]
add XM.TaxCode, XM.TaxClass and modify quote.json tax function to look at the new orms
John Rogelstad [Tue, 26 Feb 2013 21:41:47 +0000 (13:41 -0800)]
Merge pull request #43 from jrogelstad/19550
issue #19550: Fixes.
John Rogelstad [Tue, 26 Feb 2013 20:50:07 +0000 (15:50 -0500)]
issue #19550: Rename file
John Rogelstad [Tue, 26 Feb 2013 20:49:26 +0000 (15:49 -0500)]
issue #19550: Fix calculation that got mixed up/lost before.
John Rogelstad [Tue, 26 Feb 2013 20:17:28 +0000 (12:17 -0800)]
Merge pull request #8 from xtuple/master
Catch up.
John Rogelstad [Tue, 26 Feb 2013 20:17:04 +0000 (12:17 -0800)]
Merge pull request #33 from shackbarth/19419
issue #19419: maintenance can run arbitrary initInstanceDb.sh
John Rogelstad [Tue, 26 Feb 2013 20:13:25 +0000 (12:13 -0800)]
Merge pull request #42 from shackbarth/19453c
issue #19453: fixed relational widget emptying bug
shackbarth [Tue, 26 Feb 2013 20:12:13 +0000 (12:12 -0800)]
Merge pull request #38 from jrogelstad/19550
issue #19550: Add all total detail to view and redirect quote orm to use...
John Rogelstad [Tue, 26 Feb 2013 20:12:03 +0000 (12:12 -0800)]
Merge pull request #40 from shackbarth/19543
issue #19543: small fixes but no major progress
Steve Hackbarth [Tue, 26 Feb 2013 20:10:38 +0000 (15:10 -0500)]
issue #19453: fixed relational widget emptying bug
John Rogelstad [Tue, 26 Feb 2013 20:08:15 +0000 (12:08 -0800)]
Merge pull request #7 from xtuple/master
Catch up
John Rogelstad [Tue, 26 Feb 2013 20:01:18 +0000 (12:01 -0800)]
Merge pull request #41 from jrogelstad/19550j
issue #19550: Pull in db side support for customer and quote.
Steve Hackbarth [Tue, 26 Feb 2013 19:30:43 +0000 (14:30 -0500)]
issue #19543: revert dispatch try catch
shackbarth [Tue, 26 Feb 2013 18:02:59 +0000 (10:02 -0800)]
Merge pull request #39 from jrogelstad/19643
issue #19643: Use global username instead of instance username.
John Rogelstad [Tue, 26 Feb 2013 18:01:36 +0000 (13:01 -0500)]
issue #19643: Use global username instead of instance username.
John Rogelstad [Tue, 26 Feb 2013 17:09:52 +0000 (12:09 -0500)]
issue #19550: Add all total detail to view and redirect quote orm to use view so it has totals.
John Rogelstad [Tue, 26 Feb 2013 16:24:11 +0000 (08:24 -0800)]
Merge pull request #37 from jgunderson/master
updated CRM reports, added Sales list reports, fixed numeric issues with Groovy
John Rogelstad [Tue, 26 Feb 2013 16:23:29 +0000 (08:23 -0800)]
Merge pull request #34 from shackbarth/19444
issue #19444: fixed filename for relation models
Jeff Gunderson [Tue, 26 Feb 2013 15:58:08 +0000 (10:58 -0500)]
updates crm and new sales reports. fixed groovy numeric issues
Mike O'Donnell [Tue, 26 Feb 2013 14:52:03 +0000 (06:52 -0800)]
Merge pull request #36 from mikerodonnell89/master
catching up
John Rogelstad [Tue, 26 Feb 2013 13:24:14 +0000 (05:24 -0800)]
Merge pull request #35 from jrogelstad/master
Tweak.
John Rogelstad [Tue, 26 Feb 2013 13:21:13 +0000 (08:21 -0500)]
Merge branch 'master' of github.com:jrogelstad/xtuple
John Rogelstad [Tue, 26 Feb 2013 13:20:40 +0000 (08:20 -0500)]
Tweak.
dev [Tue, 26 Feb 2013 09:35:51 +0000 (03:35 -0600)]
rename calculateItemTaxAmount to calculateTaxAmount
dev [Tue, 26 Feb 2013 09:32:18 +0000 (03:32 -0600)]
add back calculateTaxDetail
dev [Tue, 26 Feb 2013 09:12:09 +0000 (03:12 -0600)]
add quote.sql with tax function
dev [Tue, 26 Feb 2013 09:02:58 +0000 (03:02 -0600)]
add error handling to customer.sql
Steve Hackbarth [Mon, 25 Feb 2013 21:59:13 +0000 (16:59 -0500)]
issue #19543: no real progress
Mike O'Donnell [Mon, 25 Feb 2013 21:04:02 +0000 (13:04 -0800)]
Merge pull request #6 from xtuple/master
catching up
Steve Hackbarth [Mon, 25 Feb 2013 18:26:31 +0000 (13:26 -0500)]
issue #19444: fixed filename for relation models
shackbarth [Mon, 25 Feb 2013 18:17:04 +0000 (10:17 -0800)]
Merge pull request #32 from jrogelstad/master
Vows changes.
Steve Hackbarth [Mon, 25 Feb 2013 18:14:59 +0000 (13:14 -0500)]
issue #19419: deleted old scripts
Steve Hackbarth [Mon, 25 Feb 2013 18:12:23 +0000 (13:12 -0500)]
issue #19419: translations
Steve Hackbarth [Mon, 25 Feb 2013 17:41:00 +0000 (12:41 -0500)]
issue #19419: using backup db on filesystem
Steve Hackbarth [Mon, 25 Feb 2013 17:06:43 +0000 (12:06 -0500)]
issue #19419: almost there
Mike O'Donnell [Sun, 24 Feb 2013 23:34:53 +0000 (15:34 -0800)]
Merge pull request #5 from xtuple/master
catching up
Steve Hackbarth [Sun, 24 Feb 2013 17:28:26 +0000 (12:28 -0500)]
issue #19419: works maybe
Steve Hackbarth [Sun, 24 Feb 2013 16:55:16 +0000 (11:55 -0500)]
issue #19419: ok progress
Steve Hackbarth [Sun, 24 Feb 2013 16:48:15 +0000 (11:48 -0500)]
issue #19419: bash is not my friend
Steve Hackbarth [Sun, 24 Feb 2013 16:48:00 +0000 (11:48 -0500)]
issue #19419: bash is not my friend
Steve Hackbarth [Sun, 24 Feb 2013 16:35:57 +0000 (11:35 -0500)]
issue #19419: hacking through bash
Steve Hackbarth [Sun, 24 Feb 2013 04:54:34 +0000 (23:54 -0500)]
issue #19419: bugfixes
Steve Hackbarth [Sun, 24 Feb 2013 04:34:08 +0000 (23:34 -0500)]
issue #19419: moved org creation stuff back to enyo
John Rogelstad [Sat, 23 Feb 2013 14:36:11 +0000 (06:36 -0800)]
Merge pull request #6 from xtuple/master
Catch up.
John Rogelstad [Sat, 23 Feb 2013 14:33:26 +0000 (06:33 -0800)]
Merge pull request #17 from jgunderson/master
adding reports
John Rogelstad [Sat, 23 Feb 2013 14:31:17 +0000 (06:31 -0800)]
Merge pull request #31 from shackbarth/19560
issue #19560: fix new-user email to old-user problem
John Rogelstad [Sat, 23 Feb 2013 14:28:36 +0000 (09:28 -0500)]
Add working version of project to vows test.
John Rogelstad [Sat, 23 Feb 2013 13:54:02 +0000 (08:54 -0500)]
Rename files
John Rogelstad [Sat, 23 Feb 2013 13:53:04 +0000 (08:53 -0500)]
Make honorific work using discrete crud methods
John Rogelstad [Sat, 23 Feb 2013 00:30:26 +0000 (19:30 -0500)]
Update vows to handle independant tests.
Mike O'Donnell [Fri, 22 Feb 2013 20:03:11 +0000 (12:03 -0800)]
Merge pull request #4 from xtuple/master
catching up
Steve Hackbarth [Fri, 22 Feb 2013 19:09:26 +0000 (14:09 -0500)]
issue #19560: fix new-user email to old-user problem
John Rogelstad [Fri, 22 Feb 2013 19:04:31 +0000 (11:04 -0800)]
Merge pull request #30 from julesstp/19550
Incident #19550 - add CustomerShiptoRelation shell to customer.js, add column to quote.json, add QuoteToDo to quote.js
John Rogelstad [Fri, 22 Feb 2013 19:00:41 +0000 (11:00 -0800)]
Merge pull request #28 from bendiy/19296
For 19296 dead code cleanup. Remove mongo.
root [Fri, 22 Feb 2013 18:53:57 +0000 (12:53 -0600)]
add QuoteToDo shell to quote.js
root [Fri, 22 Feb 2013 18:39:13 +0000 (12:39 -0600)]
Merge remote-tracking branch 'XTUPLE/master' into 19550
dev [Fri, 22 Feb 2013 17:52:39 +0000 (11:52 -0600)]
Merge branch '19550' of https://github.com/julesstp/xtuple into 19550
dev [Fri, 22 Feb 2013 17:50:23 +0000 (11:50 -0600)]
add CustomerShiptoRelation model shell to customer.js and add back the column to quote.json
Ben Thompson [Fri, 22 Feb 2013 00:39:11 +0000 (19:39 -0500)]
Issue #19613 Upgrade node to 0.8.20 and upgrade packages and use .x to get future patch releases.
Ben Thompson [Fri, 22 Feb 2013 00:07:29 +0000 (19:07 -0500)]
Remove mongo.
Mike O'Donnell [Thu, 21 Feb 2013 20:38:14 +0000 (12:38 -0800)]
Merge pull request #27 from jrogelstad/19550
issue #19550: Fix orm so toDos are to many.
Mike O'Donnell [Thu, 21 Feb 2013 19:58:45 +0000 (11:58 -0800)]
Merge pull request #3 from xtuple/master
catching up
John Rogelstad [Thu, 21 Feb 2013 19:56:10 +0000 (11:56 -0800)]
Merge pull request #26 from shackbarth/19456
issue #19456: release lock before refresh
John Rogelstad [Thu, 21 Feb 2013 19:55:02 +0000 (14:55 -0500)]
issue #19550: Fix orm so toDos are to many.
shackbarth [Thu, 21 Feb 2013 19:33:08 +0000 (11:33 -0800)]
Merge pull request #25 from jrogelstad/master
issue #19606: Fix problem with lock for qt users.
Steve Hackbarth [Thu, 21 Feb 2013 19:29:50 +0000 (14:29 -0500)]
merge
Steve Hackbarth [Thu, 21 Feb 2013 19:28:08 +0000 (14:28 -0500)]
merge
John Rogelstad [Thu, 21 Feb 2013 18:59:08 +0000 (10:59 -0800)]
Merge pull request #5 from xtuple/master
catch up.
John Rogelstad [Thu, 21 Feb 2013 18:56:25 +0000 (10:56 -0800)]
Merge pull request #22 from shackbarth/19444
issue #19444: print workspaces, print sales lists
John Rogelstad [Thu, 21 Feb 2013 18:54:09 +0000 (10:54 -0800)]
Merge pull request #21 from shackbarth/19456b
issue #19456: don't release an empty lock