Merge branch 'master' of github.com:xtuple/xtuple into 22029-cashreceipt-in-salesorder
authortjwebb <travis@traviswebb.com>
Mon, 20 Jan 2014 21:15:17 +0000 (16:15 -0500)
committertjwebb <travis@traviswebb.com>
Mon, 20 Jan 2014 21:15:17 +0000 (16:15 -0500)
commit985adb87e0bce928c1aeaa5c1be6c66821a47636
treee06372de7cf9e4f99e2519adef5c6e9d424f4bf9
parent6fb8bca0bee278712a29f48ccc3e42f99c4fb0d1
parent53d81d5e85a4c00b7d37947030222684be08e7a2
Merge branch 'master' of github.com:xtuple/xtuple into 22029-cashreceipt-in-salesorder

Conflicts:
lib/backbone-x/source/info.js
lib/backbone-x/source/model_mixin.js
enyo-client/application/source/models/sales_order_base.js
enyo-client/application/source/views/workspace.js
enyo-client/database/orm/models/sales_order.json
enyo-client/database/source/xm/javascript/sales_order.sql
enyo-client/extensions/source/billing/client/views/list.js
enyo-client/extensions/source/billing/database/source/manifest.js
lib/backbone-x/source/info.js
lib/backbone-x/source/model_mixin.js