tjwebb [Tue, 19 Nov 2013 23:39:04 +0000 (18:39 -0500)]
bumped to 1.5.0
Linda Nichols [Tue, 19 Nov 2013 16:53:49 +0000 (08:53 -0800)]
Merge pull request #1079 from shackbarth/spork2
disable billing extension
Steve Hackbarth [Tue, 19 Nov 2013 16:45:10 +0000 (11:45 -0500)]
so much sporking
Steve Hackbarth [Tue, 19 Nov 2013 16:37:21 +0000 (11:37 -0500)]
more sporking
Steve Hackbarth [Tue, 19 Nov 2013 16:17:57 +0000 (11:17 -0500)]
Merge branch 'master' into spork2
shackbarth [Tue, 19 Nov 2013 15:38:58 +0000 (07:38 -0800)]
Merge pull request #1078 from shackbarth/revert
Revert TravisCI pull
Steve Hackbarth [Tue, 19 Nov 2013 15:37:48 +0000 (10:37 -0500)]
Revert "travisci test"
This reverts commit
ff62888d7e85afa965aa8632aa8a9f7841b57d3d.
Steve Hackbarth [Tue, 19 Nov 2013 15:37:41 +0000 (10:37 -0500)]
Revert "added build badge"
This reverts commit
600cee55ec9a3c40ba345b3169728a70a3ae71b7.
Steve Hackbarth [Tue, 19 Nov 2013 15:37:31 +0000 (10:37 -0500)]
Revert "removed sudo from nvm cmd"
This reverts commit
78ce596799e442b46c160d850e7a1990cd521ee2.
Steve Hackbarth [Tue, 19 Nov 2013 15:37:23 +0000 (10:37 -0500)]
Revert "pilot for 826 in travis-ci"
This reverts commit
b395b79c9f7be2f33c0ebe5d06edc7c82acab7a3.
Steve Hackbarth [Tue, 19 Nov 2013 15:37:14 +0000 (10:37 -0500)]
Revert "changed node ports"
This reverts commit
85236bd5d7c42274a22f93f1674c8ca3b4d51651.
Steve Hackbarth [Tue, 19 Nov 2013 15:36:44 +0000 (10:36 -0500)]
Revert "removed badge from readme"
This reverts commit
e136549078d2915334a2820b8e44948c9b9f0a33.
Steve Hackbarth [Tue, 19 Nov 2013 15:36:31 +0000 (10:36 -0500)]
Revert "fixed install xtuple doc"
This reverts commit
282056c475f2e6c9e2d78e53829af855450c9834.
Steve Hackbarth [Tue, 19 Nov 2013 15:36:22 +0000 (10:36 -0500)]
Revert "fixed install script formatting"
This reverts commit
a315df0ae2e2a14bc6218db8277b534cea113820.
shackbarth [Tue, 19 Nov 2013 14:51:59 +0000 (06:51 -0800)]
Merge pull request #1074 from tjwebb/travis-ci
Node 0.8.26 Compatibility + Travis-CI Integration
tjwebb [Tue, 19 Nov 2013 05:49:14 +0000 (00:49 -0500)]
fixed install script formatting
tjwebb [Tue, 19 Nov 2013 05:47:41 +0000 (00:47 -0500)]
fixed install xtuple doc
Linda Nichols [Tue, 19 Nov 2013 05:45:46 +0000 (21:45 -0800)]
Merge pull request #1073 from tjwebb/login-fix-dogfood
fixed breakage of single extension builds
tjwebb [Tue, 19 Nov 2013 05:41:42 +0000 (00:41 -0500)]
removed badge from readme
tjwebb [Tue, 19 Nov 2013 05:29:23 +0000 (00:29 -0500)]
Merge branch 'master' of github.com:xtuple/xtuple into travis-ci
tjwebb [Tue, 19 Nov 2013 05:24:12 +0000 (00:24 -0500)]
changed node ports
tjwebb [Tue, 19 Nov 2013 04:34:29 +0000 (23:34 -0500)]
fixed breakage of single extension builds
Steve Hackbarth [Mon, 18 Nov 2013 21:53:58 +0000 (16:53 -0500)]
disable billing and spork tests
shackbarth [Mon, 18 Nov 2013 21:39:56 +0000 (13:39 -0800)]
Merge pull request #1072 from lynnaloo/21757
21757 - Fixed priv issue with Project Types
tjwebb [Mon, 18 Nov 2013 20:36:43 +0000 (15:36 -0500)]
pilot for 826 in travis-ci
Linda Nichols [Mon, 18 Nov 2013 19:18:35 +0000 (19:18 +0000)]
Issue #21757: Commented out project types test until privilege is added by prep_database
tjwebb [Mon, 18 Nov 2013 19:10:50 +0000 (14:10 -0500)]
Merge branch 'master' of github.com:xtuple/xtuple into travis-ci
Linda Nichols [Mon, 18 Nov 2013 18:42:55 +0000 (18:42 +0000)]
merge from master
Linda Nichols [Mon, 18 Nov 2013 18:41:48 +0000 (18:41 +0000)]
revert nav changes
Linda Nichols [Mon, 18 Nov 2013 18:38:46 +0000 (18:38 +0000)]
add priv
shackbarth [Mon, 18 Nov 2013 18:30:57 +0000 (10:30 -0800)]
Merge pull request #1070 from tjwebb/revert-pulls-1049-1067
Revert pulls 1049, 1067
shackbarth [Mon, 18 Nov 2013 18:30:23 +0000 (10:30 -0800)]
Merge pull request #1066 from tjwebb/login-fix-dogfood
tentative fix for dogfood "100 parameters" issue
tjwebb [Mon, 18 Nov 2013 17:48:20 +0000 (12:48 -0500)]
Revert "Merge pull request #1067 from shackbarth/unbilling"
This reverts commit
459a4f111ae8ae5ab67cc9c02a7a688d6b5f0085, reversing
changes made to
05a0dffc2b8c433c3452879fa36912e8198330df.
tjwebb [Mon, 18 Nov 2013 17:47:54 +0000 (12:47 -0500)]
Revert "Merge pull request #1049 from jgunderson/21859-1"
This reverts commit
a0373ec5312138e08c5fcd2c9ef81a819eac1d63, reversing
changes made to
fd7d36f8c8c235a1ab97efcbf81b7d09f53639d0.
Linda Nichols [Mon, 18 Nov 2013 17:15:03 +0000 (17:15 +0000)]
Merge branch 'master' into 21757
Linda Nichols [Mon, 18 Nov 2013 17:13:33 +0000 (17:13 +0000)]
Issue #21757: Added MaintainProjectTypes priv
John Rogelstad [Mon, 18 Nov 2013 16:44:35 +0000 (08:44 -0800)]
Merge pull request #1065 from jgunderson/fixdatamart
install script fix - don't drop datamart
John Rogelstad [Mon, 18 Nov 2013 16:37:38 +0000 (08:37 -0800)]
Merge pull request #1069 from shackbarth/21994-install
Revert "fixed redirection in both files, fixed setting testDatabase usin...
John Rogelstad [Mon, 18 Nov 2013 16:33:42 +0000 (08:33 -0800)]
Merge pull request #1068 from shackbarth/21801-trigger
issue #21801: make sure js_init has been called for triggers
Steve Hackbarth [Mon, 18 Nov 2013 16:29:33 +0000 (11:29 -0500)]
Revert "fixed redirection in both files, fixed setting testDatabase using the DATABASE variable in the install_xtuple script"
This reverts commit
3708eb9a82c89d349019c761de93196a446bef86.
Steve Hackbarth [Mon, 18 Nov 2013 16:07:38 +0000 (11:07 -0500)]
issue #21801: make sure js_init has been called for triggers
Linda Nichols [Mon, 18 Nov 2013 15:32:19 +0000 (07:32 -0800)]
Merge pull request #1067 from shackbarth/unbilling
do not yet automatically install billing
Steve Hackbarth [Mon, 18 Nov 2013 15:03:05 +0000 (10:03 -0500)]
do not yet automatically install billing
tjwebb [Mon, 18 Nov 2013 05:41:46 +0000 (00:41 -0500)]
removed old line
tjwebb [Mon, 18 Nov 2013 04:35:02 +0000 (23:35 -0500)]
don't use concat for XM.Inventory options
tjwebb [Mon, 18 Nov 2013 04:32:15 +0000 (23:32 -0500)]
increased safety of js_init
- simplified pg_worker, reduced # of js_init invocations
- added js_init flag
- freeze objects created by js_init
- remove js_init call from build_database install script
John Rogelstad [Sat, 16 Nov 2013 15:02:39 +0000 (07:02 -0800)]
Merge pull request #1061 from davecramer/master
redirectServer listens on bindAddress as well
John Rogelstad [Sat, 16 Nov 2013 15:02:14 +0000 (07:02 -0800)]
Merge pull request #1049 from jgunderson/21859-1
21895, organize BI charts in extension and support d3 dimplejs library
John Rogelstad [Sat, 16 Nov 2013 14:58:16 +0000 (06:58 -0800)]
Merge pull request #1064 from julesstp/21508-WorkOrder
actions cleanup
jgunderson [Sat, 16 Nov 2013 00:31:46 +0000 (19:31 -0500)]
install script fix - don't drop datamart
jgunderson [Fri, 15 Nov 2013 20:19:40 +0000 (15:19 -0500)]
21895, pull out dimple lib
julesstp [Fri, 15 Nov 2013 20:15:48 +0000 (14:15 -0600)]
actions cleanup
Linda Nichols [Fri, 15 Nov 2013 19:47:06 +0000 (11:47 -0800)]
Merge pull request #1063 from tjwebb/21664-billing-cash-receipt
21664 billing cash receipt
Linda Nichols [Fri, 15 Nov 2013 19:37:28 +0000 (11:37 -0800)]
Merge pull request #1060 from shackbarth/21684-invoice
issue #21684: invoice bugfixes
tjwebb [Fri, 15 Nov 2013 19:35:17 +0000 (14:35 -0500)]
Merge branch '21684-invoice' of github.com:shackbarth/xtuple into 21664-billing-cash-receipt
Conflicts:
enyo-client/extensions/source/billing/database/source/xt/views/cashrcpt_receivable.sql
tjwebb [Fri, 15 Nov 2013 19:34:15 +0000 (14:34 -0500)]
Merge branch '21628' of github.com:lynnaloo/xtuple into 21664-billing-cash-receipt
tjwebb [Fri, 15 Nov 2013 19:32:54 +0000 (14:32 -0500)]
connected line to cashreceiptreceivable instead of receivablerelation
Linda Nichols [Fri, 15 Nov 2013 19:12:20 +0000 (19:12 +0000)]
merge
Linda Nichols [Fri, 15 Nov 2013 18:59:01 +0000 (18:59 +0000)]
merge Travis
tjwebb [Fri, 15 Nov 2013 18:55:16 +0000 (13:55 -0500)]
Merge branch 'master' into 21664-billing-cash-receipt
tjwebb [Fri, 15 Nov 2013 18:54:29 +0000 (13:54 -0500)]
updated cashrceipt orm, crud tests passing
Linda Nichols [Fri, 15 Nov 2013 18:38:59 +0000 (18:38 +0000)]
Issue #21628: Fixed display on commission
Dave Cramer [Fri, 15 Nov 2013 16:51:32 +0000 (11:51 -0500)]
Merge branch 'master' of github.com:xtuple/xtuple
Dave Cramer [Fri, 15 Nov 2013 16:50:18 +0000 (11:50 -0500)]
redirect port needs to honour the bindAddress
Steve Hackbarth [Fri, 15 Nov 2013 16:37:42 +0000 (11:37 -0500)]
fix build
Linda Nichols [Fri, 15 Nov 2013 16:06:27 +0000 (16:06 +0000)]
Issue #21628: Fixed display of commission
Steve Hackbarth [Fri, 15 Nov 2013 16:04:42 +0000 (11:04 -0500)]
Merge remote-tracking branch 'XTUPLE/master' into 21684-invoice
Steve Hackbarth [Fri, 15 Nov 2013 16:04:22 +0000 (11:04 -0500)]
issue #21684: update todos
Steve Hackbarth [Fri, 15 Nov 2013 16:03:53 +0000 (11:03 -0500)]
issue #21684: move order number and date higher
Steve Hackbarth [Fri, 15 Nov 2013 15:33:36 +0000 (10:33 -0500)]
issue #21684: alternate approach to fix triggering bug
John Rogelstad [Fri, 15 Nov 2013 12:49:13 +0000 (04:49 -0800)]
Merge pull request #1056 from jgunderson/exportlabel
fix disable export string to "disable export and print"
John Rogelstad [Fri, 15 Nov 2013 12:17:05 +0000 (04:17 -0800)]
Merge pull request #1057 from davecramer/master
fixed redirection in both files, fixed setting testDatabase using the DA...
John Rogelstad [Fri, 15 Nov 2013 12:16:38 +0000 (04:16 -0800)]
Merge pull request #1059 from lynnaloo/21628
21628 - Bug fixes for filtering DocumentNumber and posted receivables and receivable application sql
tjwebb [Fri, 15 Nov 2013 07:07:59 +0000 (02:07 -0500)]
cashreceipt save-able from UI
Linda Nichols [Thu, 14 Nov 2013 23:40:04 +0000 (15:40 -0800)]
Merge pull request #1058 from shackbarth/21684-invoice
issue #21684: tax adjustment panel on invoice
Linda Nichols [Thu, 14 Nov 2013 23:12:10 +0000 (23:12 +0000)]
Issue #21628: Added base amounts and calculations to views
Steve Hackbarth [Thu, 14 Nov 2013 21:56:22 +0000 (16:56 -0500)]
Merge remote-tracking branch 'XTUPLE/master' into 21684-invoice
Steve Hackbarth [Thu, 14 Nov 2013 21:55:54 +0000 (16:55 -0500)]
issue #21684: start on binding bug
tjwebb [Thu, 14 Nov 2013 21:38:30 +0000 (16:38 -0500)]
Merge branch '21628' of github.com:lynnaloo/xtuple into 21664-billing-cash-receipt
tjwebb [Thu, 14 Nov 2013 21:38:22 +0000 (16:38 -0500)]
incremental
Dave Cramer [Thu, 14 Nov 2013 20:51:15 +0000 (15:51 -0500)]
fixed redirection in both files, fixed setting testDatabase using the DATABASE variable in the install_xtuple script
Linda Nichols [Thu, 14 Nov 2013 20:50:13 +0000 (20:50 +0000)]
merge Travis more
Steve Hackbarth [Thu, 14 Nov 2013 20:45:45 +0000 (15:45 -0500)]
issue #21684: tax adjustments read-only for posted invoices
Steve Hackbarth [Thu, 14 Nov 2013 20:43:30 +0000 (15:43 -0500)]
issue #21684: tax adjustment ui
Linda Nichols [Thu, 14 Nov 2013 20:43:13 +0000 (20:43 +0000)]
merge Travis
Linda Nichols [Thu, 14 Nov 2013 20:28:17 +0000 (20:28 +0000)]
fixed test for taxTotal currency
Linda Nichols [Thu, 14 Nov 2013 20:23:37 +0000 (20:23 +0000)]
Issue #21628: Fixes for Receivable Applications
Linda Nichols [Thu, 14 Nov 2013 20:16:36 +0000 (12:16 -0800)]
Merge pull request #1055 from tjwebb/21664-billing-cash-receipt
21664 billing cash receipt
jgunderson [Thu, 14 Nov 2013 19:22:34 +0000 (14:22 -0500)]
fix disable export string
tjwebb [Thu, 14 Nov 2013 18:17:19 +0000 (13:17 -0500)]
update orm docs with derived field feature
tjwebb [Thu, 14 Nov 2013 18:00:43 +0000 (13:00 -0500)]
reinstated orm type check
Linda Nichols [Thu, 14 Nov 2013 18:00:08 +0000 (18:00 +0000)]
Issue #21628: Fixed number parameter search
jgunderson [Thu, 14 Nov 2013 15:41:25 +0000 (10:41 -0500)]
21859, fixed conflict
tjwebb [Thu, 14 Nov 2013 10:23:55 +0000 (05:23 -0500)]
re-enabled compile-time column reference checking for ORMs
tjwebb [Thu, 14 Nov 2013 09:52:25 +0000 (04:52 -0500)]
Merge branch 'master' into 21664-billing-cash-receipt
tjwebb [Thu, 14 Nov 2013 09:51:04 +0000 (04:51 -0500)]
fixed orm schema omission caused by method feature. all tests pass
tjwebb [Thu, 14 Nov 2013 08:36:14 +0000 (03:36 -0500)]
added method feature to orm; re-did cashrcpt views
Linda Nichols [Thu, 14 Nov 2013 03:14:18 +0000 (19:14 -0800)]
Merge pull request #1054 from shackbarth/21684-invoice
issue #21684: line items should start disabled
Steve Hackbarth [Thu, 14 Nov 2013 03:10:18 +0000 (22:10 -0500)]
Merge remote-tracking branch 'XTUPLE/master' into 21684-invoice
Steve Hackbarth [Thu, 14 Nov 2013 03:08:41 +0000 (22:08 -0500)]
issue #21684: line items start disabled