merge xtuple/master

diff --cc enyo-client/application/source/widgets/parameter.js
index 5626e85,5626e85..9d0f382
--- 1/enyo-client/application/source/widgets/parameter.js
--- 2/enyo-client/application/source/widgets/parameter.js
+++ b/enyo-client/application/source/widgets/parameter.js
@@@ -567,7 -567,7 +567,45 @@@ trailing:true, white:true*
          defaultKind: "XV.DateWidget"}
      ]
    });
--
++/*
++  // ..........................................................
++  // PICK ORDERS LIST
++  //
++  enyo.kind({
++    name: "XV.PickOrdersListParameters",
++    kind: "XV.ParameterWidget",
++  //  characteristicsRole: 'isAccounts',
++    components: [
++      {kind: "onyx.GroupboxHeader", content: "_pickOrdersListItem".loc()},
++      {name: "isActive", attr: "isActive", label: "_showInactive".loc(), defaultKind: "XV.CheckboxWidget",
++        getParameter: function () {
++          var param;
++          if (!this.getValue()) {
++            param = {
++              attribute: this.getAttr(),
++              operator: '=',
++              value: true
++            };
++          }
++          return param;
++        }
++      },
++      {name: "number", label: "_number".loc(), attr: "number"},
++      {name: "name", label: "_name".loc(), attr: "name"},
++      {kind: "onyx.GroupboxHeader", content: "_contact".loc()},
++      {name: "primaryContact", label: "_primaryContact".loc(), attr: "primaryContact.name"},
++      {name: "primaryEmail", label: "_primaryEmail".loc(), attr: "primaryContact.primaryEmail"},
++      {kind: "onyx.GroupboxHeader", content: "_address".loc()},
++      {name: "phone", label: "_phone".loc(), attr: ["primaryContact.phone", "primaryContact.alternate", "primaryContact.fax"]},
++      {name: "street", label: "_street".loc(), attr: ["primaryContact.address.line1", "primaryContact.address.line2", "primaryContact.address.line3"]},
++      {name: "city", label: "_city".loc(), attr: "primaryContact.address.city"},
++      {name: "postalCode", label: "_postalCode".loc(), attr: "primaryContact.address.postalCode"},
++      {name: "state", label: "_state".loc(), attr: "primaryContact.address.state"},
++      {name: "country", label: "_country".loc(), attr: "primaryContact.address.country"},
++      {kind: "onyx.GroupboxHeader", content: "_userAccount".loc()},
++      {name: "owner", label: "_owner".loc(), attr: "owner", defaultKind: "XV.UserAccountWidget"}
++    ]
++  }); */
    // ..........................................................
    // PLANNER CODE
    //

diff --cc enyo-client/extensions/source/inventory/client/models/package.js
index eee543e,feaa703..6eb0e4f
--- 1/enyo-client/extensions/source/inventory/client/models/package.js
--- 2/enyo-client/extensions/source/inventory/client/models/package.js
+++ b/enyo-client/extensions/source/inventory/client/models/package.js
@@@ -1,5 -1,4 +1,5 @@@
  enyo.depends(
-       "pick_orders_list_item.js",
++      "pick_orders_list.js",
    "sales_order.js",
    "configure.js",
    "static.js"

diff --cc enyo-client/extensions/source/inventory/client/models/pick_orders_list.js
index 0000000,0000000..5a1bea1
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/enyo-client/extensions/source/inventory/client/models/pick_orders_list.js
@@@ -1,0 -1,0 +1,17 @@@
++  XM.PickOrdersList = XM.Document.extend({
++
++    recordType: "XM.PickOrdersList",
++
++    idAttribute: "id"
++
++  });
++
++  // ..........................................................
++  // COLLECTIONS
++  //
++
++  XM.PickOrdersListCollection = XM.Collection.extend({
++
++    model: XM.PickOrdersList
++
++  });    

diff --cc enyo-client/extensions/source/inventory/client/views/list.js
index 86b9ba2,baab5f6..5b09209
--- 1/enyo-client/extensions/source/inventory/client/views/list.js
--- 2/enyo-client/extensions/source/inventory/client/views/list.js
+++ b/enyo-client/extensions/source/inventory/client/views/list.js
@@@ -5,49 -5,6 +5,49 @@@ trailing:true white:true*
  
  (function () {
  
-     name: "XV.PickOrdersListItem",
 +  // ..........................................................
 +  // PICK ORDERS LIST ITEM
 +  //
 +
 +  enyo.kind({
-     label: "_pickOrdersListItem".loc(),
-     collection: "XM.PickOrdersListItemCollection",
++    name: "XV.PickOrdersList",
 +    kind: "XV.List",
-   XV.registerModelList("XM.SalesOrderRelation", "XV.SalesOrderLineListItem");
++    label: "_pickOrdersList".loc(),
++    collection: "XM.PickOrdersListCollection",
 +    query: {orderBy: [
 +                      {attribute: 'scheduledDate'}
 +    ]},
 +    components: [
 +      {kind: "XV.ListItem", components: [
 +                      {kind: "FittableColumns", components: [
 +                      {kind: "XV.ListColumn", classes: "first", components: [
 +                                              {kind: "FittableColumns", components: [
 +                                                      {kind: "XV.ListAttr", attr: "number", isKey: true, fit: true},
 +                              {kind: "XV.ListAttr", attr: "info", fit: true, classes: "right"}
 +                              ]},
 +                              {kind: "FittableColumns", components: [
 +                              {kind: "XV.ListAttr", attr: "type"},
 +                                                      {kind: "XV.ListAttr", attr: "info2", classes: "right"}
 +                              ]}
 +                                      ]},
 +                      {kind: "XV.ListColumn", classes: "second", components: [
 +                      {kind: "XV.ListAttr", attr: "scheduledDate"},
 +                                              {kind: "XV.ListAttr", attr: "totalQtyRemaining"}
 +                      ]},
 +                      {kind: "XV.ListColumn", classes: "second", components: [
 +                      {kind: "XV.ListAttr", attr: "comments"},
 +                                              {kind: "XV.ListAttr", attr: "notes"}
 +                                      ]},
 +                      {kind: "XV.ListColumn", classes: "last", components: [
 +                      {kind: "XV.ListAttr", attr: "assignedTo"}
 +                                      ]}
 +                      ]}  
 +                      ]}
 +    ]
 +  });
 +
++  XV.registerModelList("XM.SalesOrderRelation", "XV.SalesOrderLineList");
 +
    // ..........................................................
    // SALES ORDER
    //