Merge remote-tracking branch 'XTUPLE/4_5_x' into shipment_share

diff --git a/enyo-client/database/orm/models/invoice.json b/enyo-client/database/orm/models/invoice.json
index 4c7d750..497c10f 100644 (file)
--- a/enyo-client/database/orm/models/invoice.json
+++ b/enyo-client/database/orm/models/invoice.json
@@ -385,6 +385,15 @@
         "read": "MaintainMiscInvoices ViewMiscInvoices",
         "update": false,
         "delete": false
+      },
+      "personal": {
+        "create": false,
+        "read": "ViewPersonalCRMAccounts",
+        "update": false,
+        "delete": false,
+        "properties": [
+          "crmaccountUsers"
+        ]
       }
     },
     "properties": [
@@ -486,6 +495,14 @@
           "isNested": true,
           "required": true
         }
+      },
+      {
+        "name": "crmaccountUsers",
+        "toMany": {
+          "type": "ShareUsers",
+          "column": "obj_uuid",
+          "inverse": "uuid"
+        }
       }
     ],
     "isSystem": true

diff --git a/enyo-client/database/orm/models/sales_order.json b/enyo-client/database/orm/models/sales_order.json
index 466223c..76ddd4e 100644 (file)
--- a/enyo-client/database/orm/models/sales_order.json
+++ b/enyo-client/database/orm/models/sales_order.json
@@ -1765,6 +1765,15 @@
         "total": {
           "view": "MaintainSalesOrders ViewSalesOrders"
         }
+      },
+      "personal": {
+        "create": false,
+        "read": "ViewPersonalCRMAccounts",
+        "update": false,
+        "delete": false,
+        "properties": [
+          "crmaccountUsers"
+        ]
       }
     },
     "properties": [
@@ -1911,6 +1920,14 @@
           "type": "String",
           "column": "cohead_shiptocountry"
         }
+      },
+      {
+        "name": "crmaccountUsers",
+        "toMany": {
+          "type": "ShareUsers",
+          "column": "obj_uuid",
+          "inverse": "uuid"
+        }
       }
     ],
     "isSystem": true

diff --git a/enyo-client/database/source/manifest.js b/enyo-client/database/source/manifest.js
index 7c4f568..b160539 100644 (file)
--- a/enyo-client/database/source/manifest.js
+++ b/enyo-client/database/source/manifest.js
@@ -45,6 +45,7 @@
     "public/tables/prj.sql",
     "public/tables/prjtask.sql",
     "public/tables/quitem.sql",
+    "public/tables/shiphead.sql",
     "public/tables/shiptoinfo.sql",
     "public/tables/todoitem.sql",
     "public/tables/usrpref.sql",

diff --git a/enyo-client/database/source/public/tables/shiphead.sql b/enyo-client/database/source/public/tables/shiphead.sql
new file mode 100644 (file)
index 0000000..4cd93c6
--- /dev/null
+++ b/enyo-client/database/source/public/tables/shiphead.sql
@@ -0,0 +1,4 @@
+-- add uuid column here because there are views that need this
+select xt.add_column('shiphead','obj_uuid', 'uuid', 'default xt.uuid_generate_v4()', 'public');
+select xt.add_inheritance('shiphead', 'xt.obj');
+select xt.add_constraint('shiphead', 'shiphead_obj_uuid','unique(obj_uuid)', 'public');