xtuple
10 years agoMerge pull request #960 from lynnaloo/21587
Travis Webb [Tue, 22 Oct 2013 23:25:54 +0000 (16:25 -0700)]
Merge pull request #960 from lynnaloo/21587

21587 - Billing Configuration

10 years agomerge from master
Linda Nichols [Tue, 22 Oct 2013 15:17:34 +0000 (15:17 +0000)]
merge from master

10 years agoMerge pull request #955 from jrogelstad/21679
Travis Webb [Tue, 22 Oct 2013 14:59:23 +0000 (07:59 -0700)]
Merge pull request #955 from jrogelstad/21679

issue #21679: Fine tuning on icons.

10 years agoMerge remote-tracking branch 'XTUPLE/billing' into 21587
Linda Nichols [Tue, 22 Oct 2013 03:23:05 +0000 (03:23 +0000)]
Merge remote-tracking branch 'XTUPLE/billing' into 21587

10 years agoMerge pull request #959 from lynnaloo/billing
Linda Nichols [Tue, 22 Oct 2013 03:22:26 +0000 (20:22 -0700)]
Merge pull request #959 from lynnaloo/billing

Merge master into billing without conflicts

10 years agomerged master into billing and resolved conflicts
Linda Nichols [Tue, 22 Oct 2013 03:20:57 +0000 (03:20 +0000)]
merged master into billing and resolved conflicts

10 years agomerge master
Linda Nichols [Tue, 22 Oct 2013 01:00:16 +0000 (01:00 +0000)]
merge master

10 years agomerge more code
Linda Nichols [Tue, 22 Oct 2013 00:54:45 +0000 (00:54 +0000)]
merge more code

10 years agoMerge pull request #957 from tjwebb/billing-testfix
Linda Nichols [Tue, 22 Oct 2013 00:35:12 +0000 (17:35 -0700)]
Merge pull request #957 from tjwebb/billing-testfix

fixed some erroneous tests

10 years agoMerge pull request #953 from szuke/master
Travis Webb [Mon, 21 Oct 2013 22:54:31 +0000 (15:54 -0700)]
Merge pull request #953 from szuke/master

Update README.md

10 years agofixed some erroneous tests
tjwebb [Mon, 21 Oct 2013 22:51:40 +0000 (18:51 -0400)]
fixed some erroneous tests

10 years agoMerge pull request #954 from jrogelstad/20438
Travis Webb [Mon, 21 Oct 2013 22:43:54 +0000 (15:43 -0700)]
Merge pull request #954 from jrogelstad/20438

issue #20438: Implement convert quote to work order.

10 years agoMerge remote-tracking branch 'upstream/billing'
tjwebb [Mon, 21 Oct 2013 22:00:55 +0000 (18:00 -0400)]
Merge remote-tracking branch 'upstream/billing'

Conflicts:
lib/enyo-x/source/less/screen.less
lib/enyo-x/source/widgets/picker.js

10 years agomerrrrrrgeeeeee
Linda Nichols [Mon, 21 Oct 2013 21:35:21 +0000 (21:35 +0000)]
merrrrrrgeeeeee

10 years agoIssue #21587: Fixed failing tests
Linda Nichols [Mon, 21 Oct 2013 21:16:07 +0000 (21:16 +0000)]
Issue #21587: Fixed failing tests

10 years agoMerge pull request #950 from tjwebb/INCDT-Feature-21585
John Rogelstad [Mon, 21 Oct 2013 19:20:30 +0000 (12:20 -0700)]
Merge pull request #950 from tjwebb/INCDT-Feature-21585

Incdt feature 21585

10 years agoadded xtuple fork of font-onyx to gitmodules
tjwebb [Mon, 21 Oct 2013 17:11:13 +0000 (13:11 -0400)]
added xtuple fork of font-onyx to gitmodules

10 years agoIssue #21587: Added spinner to terms and cleaned up existing tests
Linda Nichols [Mon, 21 Oct 2013 15:54:23 +0000 (15:54 +0000)]
Issue #21587: Added spinner to terms and cleaned up existing tests

10 years agoMerge branch 'billing' of github.com:xtuple/xtuple into INCDT-Feature-21585
tjwebb [Mon, 21 Oct 2013 13:58:45 +0000 (09:58 -0400)]
Merge branch 'billing' of github.com:xtuple/xtuple into INCDT-Feature-21585

10 years agomore fixes
Linda Nichols [Mon, 21 Oct 2013 05:44:40 +0000 (05:44 +0000)]
more fixes

10 years agoIssue #21587: Added test for number spinner
Linda Nichols [Mon, 21 Oct 2013 05:40:56 +0000 (05:40 +0000)]
Issue #21587: Added test for number spinner

10 years agoissue #21585 ready.
tjwebb [Mon, 21 Oct 2013 05:23:06 +0000 (01:23 -0400)]
issue #21585 ready.

SalesCategory
- isActive field is disabled when canDeactivate is false
- removed superfluous handlers in list/listitem
- simplified canDeactivate requirements

List
- simplified itemTap handler
- simplified corresponding navigator handler for itemTap
- reverted non-multi-select requirement for sending haveAllAnswers
  response to list items

Workspace
- added ability to disable field by default

Model
- Added status:CODE events to model
- Finalized view.delegateEvents impl

10 years agoIssue #21587: Finished configure workspace
Linda Nichols [Mon, 21 Oct 2013 04:39:38 +0000 (04:39 +0000)]
Issue #21587: Finished configure workspace

10 years agoMerge remote-tracking branch 'XTUPLE/billing' into 21587
Linda Nichols [Mon, 21 Oct 2013 03:51:22 +0000 (03:51 +0000)]
Merge remote-tracking branch 'XTUPLE/billing' into 21587

10 years agomerge from master
Linda Nichols [Mon, 21 Oct 2013 03:51:13 +0000 (03:51 +0000)]
merge from master

10 years agoIssue #21587: Added address information
Linda Nichols [Mon, 21 Oct 2013 03:46:08 +0000 (03:46 +0000)]
Issue #21587: Added address information

10 years agoIssue #21587: Fixed event issue with number spinner
Linda Nichols [Mon, 21 Oct 2013 03:17:22 +0000 (03:17 +0000)]
Issue #21587: Fixed event issue with number spinner

10 years agoIssue #21587: Added spinner widget
Linda Nichols [Mon, 21 Oct 2013 02:39:31 +0000 (02:39 +0000)]
Issue #21587: Added spinner widget

10 years agoIssue #21587: Added spinner widget
Linda Nichols [Sat, 19 Oct 2013 03:31:55 +0000 (03:31 +0000)]
Issue #21587: Added spinner widget

10 years agoissue #21679: Spruce up grid box icons.
John Rogelstad [Sat, 19 Oct 2013 01:45:39 +0000 (21:45 -0400)]
issue #21679: Spruce up grid box icons.

10 years agoissue #21679: Soften calendar icon a bit.
John Rogelstad [Sat, 19 Oct 2013 00:45:50 +0000 (20:45 -0400)]
issue #21679: Soften calendar icon a bit.

10 years agoissue #21679: Use matching calendar icon.
John Rogelstad [Fri, 18 Oct 2013 23:20:04 +0000 (19:20 -0400)]
issue #21679: Use matching calendar icon.

10 years agoissue #21679: Fine tuning on icons.
John Rogelstad [Fri, 18 Oct 2013 23:06:25 +0000 (19:06 -0400)]
issue #21679: Fine tuning on icons.

10 years agoissue #20438: Clean up.
John Rogelstad [Fri, 18 Oct 2013 21:37:00 +0000 (17:37 -0400)]
issue #20438: Clean up.

10 years agoMerge pull request #942 from julesstp/21508-WorkOrder
John Rogelstad [Fri, 18 Oct 2013 20:05:10 +0000 (13:05 -0700)]
Merge pull request #942 from julesstp/21508-WorkOrder

21508 - Issue Material (Work Order)

10 years agoMerge pull request #951 from jrogelstad/21757
John Rogelstad [Fri, 18 Oct 2013 19:58:09 +0000 (12:58 -0700)]
Merge pull request #951 from jrogelstad/21757

issue #21757: Add project task to project

10 years agoUpdate README.md
szuke [Fri, 18 Oct 2013 19:50:28 +0000 (15:50 -0400)]
Update README.md

Updated README.md to reflect changes from ./tools/buildExtensions.sh to /scripts/build_app.js

10 years agoone more
julesstp [Fri, 18 Oct 2013 19:49:36 +0000 (13:49 -0600)]
one more

10 years agomissing strings
julesstp [Fri, 18 Oct 2013 19:44:45 +0000 (13:44 -0600)]
missing strings

10 years agoMerge pull request #952 from shackbarth/21604
John Rogelstad [Fri, 18 Oct 2013 19:44:23 +0000 (12:44 -0700)]
Merge pull request #952 from shackbarth/21604

issue #21604: finish terms object

10 years agoissue #20438: Rearrange so error trapping can work.
John Rogelstad [Fri, 18 Oct 2013 19:35:27 +0000 (15:35 -0400)]
issue #20438: Rearrange so error trapping can work.

10 years agoIssue #21587: Added configure workspace and dispatch
Linda Nichols [Fri, 18 Oct 2013 17:57:12 +0000 (17:57 +0000)]
Issue #21587: Added configure workspace and dispatch

10 years agoissue #21604: finish workspace and clean up diffs
Steve Hackbarth [Fri, 18 Oct 2013 17:34:17 +0000 (13:34 -0400)]
issue #21604: finish workspace and clean up diffs

10 years agoissue #20438: Get rid of cruft.
John Rogelstad [Fri, 18 Oct 2013 17:29:42 +0000 (13:29 -0400)]
issue #20438: Get rid of cruft.

10 years agoissue #20438: Swat. Swat.
John Rogelstad [Fri, 18 Oct 2013 17:00:09 +0000 (13:00 -0400)]
issue #20438: Swat. Swat.

10 years agoissue #20438: Working on enforcing credit rules.
John Rogelstad [Fri, 18 Oct 2013 16:50:48 +0000 (12:50 -0400)]
issue #20438: Working on enforcing credit rules.

10 years agomerge
Steve Hackbarth [Fri, 18 Oct 2013 16:16:16 +0000 (12:16 -0400)]
merge

10 years agoissue #21604: finish terms as much as is possible
Steve Hackbarth [Fri, 18 Oct 2013 16:11:52 +0000 (12:11 -0400)]
issue #21604: finish terms as much as is possible

10 years agoissue #21604: updated terms workspace
Steve Hackbarth [Fri, 18 Oct 2013 15:43:59 +0000 (11:43 -0400)]
issue #21604: updated terms workspace

10 years agoMerge remote-tracking branch 'xtuple/master' into 21508-WorkOrder
julesstp [Fri, 18 Oct 2013 15:34:02 +0000 (09:34 -0600)]
Merge remote-tracking branch 'xtuple/master' into 21508-WorkOrder

10 years agoissue #20438: Tweak customer can purchase function to not blow up on prospects.
John Rogelstad [Fri, 18 Oct 2013 14:38:01 +0000 (10:38 -0400)]
issue #20438: Tweak customer can purchase function to not blow up on prospects.

10 years agoissue #21604: DAYS logic and calculate dueDate
Steve Hackbarth [Fri, 18 Oct 2013 14:31:13 +0000 (10:31 -0400)]
issue #21604: DAYS logic and calculate dueDate

10 years agoissue #20438: First pass making customer handle its own id sequence
John Rogelstad [Fri, 18 Oct 2013 14:08:24 +0000 (10:08 -0400)]
issue #20438: First pass making customer handle its own id sequence

10 years agoissue #20438: Get error params working
John Rogelstad [Fri, 18 Oct 2013 00:15:17 +0000 (20:15 -0400)]
issue #20438: Get error params working

10 years agoissue #20438: Fix default currency problem. Improve formatting.
John Rogelstad [Thu, 17 Oct 2013 23:10:17 +0000 (19:10 -0400)]
issue #20438: Fix default currency problem. Improve formatting.

10 years agoissue #20438: Incremental progress.
John Rogelstad [Thu, 17 Oct 2013 22:42:58 +0000 (18:42 -0400)]
issue #20438: Incremental progress.

10 years agotodo for days logic
Steve Hackbarth [Thu, 17 Oct 2013 21:03:17 +0000 (17:03 -0400)]
todo for days logic

10 years agoissue #21604: implement and test proximo logic
Steve Hackbarth [Thu, 17 Oct 2013 21:00:51 +0000 (17:00 -0400)]
issue #21604: implement and test proximo logic

10 years agoissue #20438: Incremental progress.
John Rogelstad [Thu, 17 Oct 2013 20:40:30 +0000 (16:40 -0400)]
issue #20438: Incremental progress.

10 years agorenamed files to lowercase
tjwebb [Thu, 17 Oct 2013 20:25:45 +0000 (16:25 -0400)]
renamed files to lowercase

10 years agoissue #20438: Incremental progress.
John Rogelstad [Thu, 17 Oct 2013 20:11:01 +0000 (16:11 -0400)]
issue #20438: Incremental progress.

10 years agocorrected view 'template' naming, removed _super
tjwebb [Thu, 17 Oct 2013 19:53:04 +0000 (15:53 -0400)]
corrected view 'template' naming, removed _super

10 years agoremoved underscore wrapping
tjwebb [Thu, 17 Oct 2013 19:44:00 +0000 (15:44 -0400)]
removed underscore wrapping

10 years agocleanup based on github review
tjwebb [Thu, 17 Oct 2013 19:34:41 +0000 (15:34 -0400)]
cleanup based on github review

10 years agoissue #21604: added boolean fields to terms
Steve Hackbarth [Thu, 17 Oct 2013 19:18:17 +0000 (15:18 -0400)]
issue #21604: added boolean fields to terms

10 years agoMerge remote-tracking branch 'XTUPLE/billing' into 21587
Linda Nichols [Thu, 17 Oct 2013 19:17:02 +0000 (19:17 +0000)]
Merge remote-tracking branch 'XTUPLE/billing' into 21587

10 years agoMerge pull request #944 from lynnaloo/21614
John Rogelstad [Thu, 17 Oct 2013 19:11:23 +0000 (12:11 -0700)]
Merge pull request #944 from lynnaloo/21614

Issue #21614 - Create Bank Account business object for billing/sales

10 years agoIssue #21614: Changed XM.BankAccount to require MaintainBankAccount for viewing
Linda Nichols [Thu, 17 Oct 2013 19:03:36 +0000 (19:03 +0000)]
Issue #21614: Changed XM.BankAccount to require MaintainBankAccount for viewing

10 years ago.
julesstp [Thu, 17 Oct 2013 18:51:20 +0000 (12:51 -0600)]
.

10 years agoMerge remote-tracking branch 'XTUPLE/billing' into 21604
Steve Hackbarth [Thu, 17 Oct 2013 18:47:15 +0000 (14:47 -0400)]
Merge remote-tracking branch 'XTUPLE/billing' into 21604

10 years agoMerge remote-tracking branch 'XTUPLE/master' into 21604
Steve Hackbarth [Thu, 17 Oct 2013 18:47:11 +0000 (14:47 -0400)]
Merge remote-tracking branch 'XTUPLE/master' into 21604

10 years agoMove inventory functions to inventory.sql
julesstp [Thu, 17 Oct 2013 18:47:02 +0000 (12:47 -0600)]
Move inventory functions to inventory.sql

10 years agoReady.
julesstp [Thu, 17 Oct 2013 18:16:10 +0000 (12:16 -0600)]
Ready.

10 years agoMerge remote-tracking branch 'XTUPLE/master' into 21614
Linda Nichols [Thu, 17 Oct 2013 17:54:39 +0000 (17:54 +0000)]
Merge remote-tracking branch 'XTUPLE/master' into 21614

10 years agorestored overflow row funcionality
tjwebb [Thu, 17 Oct 2013 17:51:36 +0000 (13:51 -0400)]
restored overflow row funcionality

10 years agoissue #21757: Add version check and release notes.
John Rogelstad [Thu, 17 Oct 2013 17:39:49 +0000 (13:39 -0400)]
issue #21757: Add version check and release notes.

10 years agoCorrect validate method.
julesstp [Thu, 17 Oct 2013 17:38:20 +0000 (11:38 -0600)]
Correct validate method.

10 years agoMerge branch 'master' into 21757
John Rogelstad [Thu, 17 Oct 2013 17:37:31 +0000 (13:37 -0400)]
Merge branch 'master' into 21757

10 years agoMerge branch 'xtuple'
John Rogelstad [Thu, 17 Oct 2013 17:37:21 +0000 (13:37 -0400)]
Merge branch 'xtuple'

10 years agoissue #21245, issue #21757: Modify picker to disallow selection of inactive records.
John Rogelstad [Thu, 17 Oct 2013 17:12:26 +0000 (13:12 -0400)]
issue #21245, issue #21757: Modify picker to disallow selection of inactive records.

10 years agoremoved log statements
tjwebb [Thu, 17 Oct 2013 07:16:26 +0000 (03:16 -0400)]
removed log statements

10 years agoremoved extra file: listmenu
tjwebb [Thu, 17 Oct 2013 07:14:11 +0000 (03:14 -0400)]
removed extra file: listmenu

10 years agofixed package files
tjwebb [Thu, 17 Oct 2013 07:08:41 +0000 (03:08 -0400)]
fixed package files

10 years agoissue#: 21585 SalesCategory
tjwebb [Thu, 17 Oct 2013 06:55:23 +0000 (02:55 -0400)]
issue#: 21585 SalesCategory

nearly complete. 3 minor TODOs listed at bottom of this comment msg.

see spec in incident.

new list menu functionality to support SalesCategory:
- asynchronous 'haveAllAnswers' responses handled in UI with a spinner in place of the gear.
- utilize font-awesome and font-onyx to simplify this UI fix implementation.

new list item decorations:
- defined a backbone View for SalesCategoryListItem. wrote EnyoView which auto-binds with enyo.
- layout model attributes in list item according to SalesCategoryView#template DSL.
- use <table> for tabular data inside ListItem; View template rendered automatically by SimpleModelTable.
- subclass ModelDecorator to override styles.

refactorings:
list:
- removed custom "selectionChanged" logic from setupItem. enyo.List gives us this for free.
- removed custom "toggleSelected" logic from setupItem. XV.ListItem#selectedChanged.

list item:

model:
- removed the prototypeFetch "feature".
- decomposed fetch into fetch() and _prepareFetch().
- fetch overrides can simply call _prepareFetch first and then execute custom logic.
- re-wrote fetch. named callbacks, removed nested conditionals, manage context idiomatically.
- re-wrote locking functions so that all actions (renew, release, obtain) are implemented in parallel form fire named events.
- eradicated 'isJSON' parameter.

model/settings.js
- deleted prototypeFetch.
- re-wrote fetch

TODO de-selected list items on gear click; after workspac close, menu options are incorrect
TODO disable isActive checkbox inside workspace
TODO more thoroughly test settings.js refactor

10 years agoissue #21757: get project status in right position.
John Rogelstad [Wed, 16 Oct 2013 23:53:36 +0000 (19:53 -0400)]
issue #21757: get project status in right position.

10 years agoissue #21757: First pass adding project type.
John Rogelstad [Wed, 16 Oct 2013 23:01:34 +0000 (19:01 -0400)]
issue #21757: First pass adding project type.

10 years agoa few more changes based on feedback
julesstp [Wed, 16 Oct 2013 22:30:09 +0000 (16:30 -0600)]
a few more changes based on feedback

10 years agoMerge pull request #948 from lynnaloo/master
Linda Nichols [Wed, 16 Oct 2013 18:26:50 +0000 (11:26 -0700)]
Merge pull request #948 from lynnaloo/master

update version

10 years agoupdate version
Linda Nichols [Wed, 16 Oct 2013 18:18:56 +0000 (18:18 +0000)]
update version

10 years agoIssue #21614: Added ViewBankAccounts to ORM
Linda Nichols [Wed, 16 Oct 2013 17:46:09 +0000 (17:46 +0000)]
Issue #21614: Added ViewBankAccounts to ORM

10 years agoIssue #21614: Added ViewBankAccounts to ORM
Linda Nichols [Wed, 16 Oct 2013 16:11:05 +0000 (16:11 +0000)]
Issue #21614: Added ViewBankAccounts to ORM

10 years agoMerge pull request #947 from jrogelstad/21739
Linda Nichols [Wed, 16 Oct 2013 16:01:48 +0000 (09:01 -0700)]
Merge pull request #947 from jrogelstad/21739

issue #21739: Add characteristics to project.

10 years agofetch/lock model rewrite is done
tjwebb [Wed, 16 Oct 2013 04:17:28 +0000 (00:17 -0400)]
fetch/lock model rewrite is done

10 years agoMerge branch 'master' of github.com:xtuple/xtuple into INCDT-Feature-21585
tjwebb [Wed, 16 Oct 2013 04:03:47 +0000 (00:03 -0400)]
Merge branch 'master' of github.com:xtuple/xtuple into INCDT-Feature-21585

10 years agoMerge branch 'billing' of github.com:xtuple/xtuple into INCDT-Feature-21585
tjwebb [Wed, 16 Oct 2013 03:44:12 +0000 (23:44 -0400)]
Merge branch 'billing' of github.com:xtuple/xtuple into INCDT-Feature-21585

10 years agoremoved isJSON; decorator almost complete; re-wrote model.fetch; re-wrote settings...
tjwebb [Wed, 16 Oct 2013 03:43:58 +0000 (23:43 -0400)]
removed isJSON; decorator almost complete; re-wrote model.fetch; re-wrote settings.fetch; created SimpleModelTable

10 years agoissue #21739: Add project toggle to char. roles.
John Rogelstad [Tue, 15 Oct 2013 23:54:08 +0000 (19:54 -0400)]
issue #21739: Add project toggle to char. roles.

10 years agoissue #21739: Add support for search on project characteristics.
John Rogelstad [Tue, 15 Oct 2013 23:27:20 +0000 (19:27 -0400)]
issue #21739: Add support for search on project characteristics.

10 years agoMerge pull request #945 from elipup/master
John Rogelstad [Tue, 15 Oct 2013 22:53:23 +0000 (15:53 -0700)]
Merge pull request #945 from elipup/master

Add common name to the certificate

10 years agoissue #21739: Add characteristics to project and task.
John Rogelstad [Tue, 15 Oct 2013 22:49:59 +0000 (18:49 -0400)]
issue #21739: Add characteristics to project and task.